[SCM] giada/master: Patches removed/updated.

[mira-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 158874c85bfcb7bf08d50ffc6dc0b4177c3555b6
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Tue Jan 16 23:14:07 2018 +0100

    Patches removed/updated.

diff --git a/debian/patches/02-rtmidi-pkgconfig.patch b/debian/patches/02-rtmidi-pkgconfig.patch
index 4f7885f..68e8961 100644
--- a/debian/patches/02-rtmidi-pkgconfig.patch
+++ b/debian/patches/02-rtmidi-pkgconfig.patch
@@ -1,53 +1,49 @@
-From: James Cowgill <jcowgill at debian.org>
-Date: Wed, 25 Oct 2017 14:25:50 +0200
-Subject: build with new rtmidi lib.
-
----
- Makefile.am  | 6 +++---
- configure.ac | 8 +-------
- 2 files changed, 4 insertions(+), 10 deletions(-)
-
-Index: giada/Makefile.am
-===================================================================
---- giada.orig/Makefile.am
-+++ giada/Makefile.am
-@@ -293,9 +293,9 @@ if LINUX
- giada_SOURCES += src/deps/rtaudio-mod/RtAudio.h src/deps/rtaudio-mod/RtAudio.cpp
- # -Wno-error=unused-function: don't stop on JUCE's unused functions
- giada_CXXFLAGS += -Wno-error=unused-function
--giada_CPPFLAGS += -D__LINUX_ALSA__ -D__LINUX_PULSE__ -D__UNIX_JACK__
-+giada_CPPFLAGS += $(RTMIDI_CFLAGS)
- giada_LDADD = -lsndfile -lfltk -lXext -lX11 -lXft -lXpm -lm -ljack -lasound \
--  -lpthread -ldl -lpulse-simple -lpulse -lsamplerate -lrtmidi -ljansson \
-+  -lpthread -ldl -lpulse-simple -lpulse -lsamplerate $(RTMIDI_LIBS) -ljansson \
-   -lfreetype
- endif
- 
-@@ -383,7 +383,7 @@ src/deps/juce/modules/juce_gui_extra/juc
- endif
- 
- giada_tests_LDADD = -ljansson -lsndfile -lsamplerate -lfltk -lXext -lX11 -lXft \
--  -lXpm -lm -ljack -lasound -lpthread -ldl -lpulse-simple -lpulse -lrtmidi \
-+  -lXpm -lm -ljack -lasound -lpthread -ldl -lpulse-simple -lpulse $(RTMIDI_LIBS) \
-   -lfreetype
- 
- giada_tests_CXXFLAGS = -std=c++11
-Index: giada/configure.ac
-===================================================================
---- giada.orig/configure.ac
-+++ giada/configure.ac
-@@ -118,13 +118,7 @@ AC_CHECK_HEADER(
- )
- AC_LANG_POP
- 
--AC_LANG_PUSH([C++])
--AC_CHECK_HEADER(
--	[rtmidi/RtMidi.h],
--	[],
--	[AC_MSG_ERROR([library 'rtMidi' not found!])]
--)
--AC_LANG_POP
-+PKG_CHECK_MODULES([RTMIDI], [rtmidi])
- 
- AC_LANG_PUSH([C++])
- AC_CHECK_HEADER(
+From: James Cowgill <jcowgill at debian.org>
+Date: Wed, 25 Oct 2017 14:25:50 +0200
+Subject: build with new rtmidi lib.
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -70,13 +70,13 @@ endif
+ if LINUX
+ 
+ # Add preprocessor flags to enable ALSA, Pulse and JACK in RtAudio.
+-cppFlags += -D__LINUX_ALSA__ -D__LINUX_PULSE__ -D__UNIX_JACK__
++cppFlags += $(RTMIDI_CFLAGS)
+ 
+ # Don't stop on JUCE's unused functions.
+ cxxFlags += -Wno-error=unused-function
+ 
+ ldAdd += -lsndfile -lfltk -lXext -lX11 -lXft -lXpm -lm -ljack -lasound \
+-  -lpthread -ldl -lpulse-simple -lpulse -lsamplerate -lrtmidi -ljansson \
++  -lpthread -ldl -lpulse-simple -lpulse -lsamplerate $(RTMIDI_LIBS) -ljansson \
+   -lfreetype
+ 
+ endif
+--- a/configure.ac
++++ b/configure.ac
+@@ -118,23 +118,7 @@ AC_CHECK_HEADER(
+ )
+ AC_LANG_POP
+ 
+-if test "x$os" = "xosx"; then
+-	AC_LANG_PUSH([C++])
+-	AC_CHECK_HEADER(
+-		[RtMidi.h],
+-		[],
+-		[AC_MSG_ERROR([library 'rtMidi' not found!])]
+-	)
+-	AC_LANG_POP
+-else
+-	AC_LANG_PUSH([C++])
+-	AC_CHECK_HEADER(
+-		[rtmidi/RtMidi.h],
+-		[],
+-		[AC_MSG_ERROR([library 'rtMidi' not found!])]
+-	)
+-	AC_LANG_POP
+-fi
++PKG_CHECK_MODULES([RTMIDI], [rtmidi])
+ 
+ 
+ AC_LANG_PUSH([C++])
diff --git a/debian/patches/03-gcc7.patch b/debian/patches/03-gcc7.patch
deleted file mode 100644
index dd073a8..0000000
--- a/debian/patches/03-gcc7.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fixed g++-7 build errors
-Author: IOhannes m zmölnig
-Forwarded: no
-Last-Update: 2017-10-30
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- giada.orig/src/gui/elems/mainWindow/mainTimer.cpp
-+++ giada/src/gui/elems/mainWindow/mainTimer.cpp
-@@ -60,7 +60,7 @@
- 
- 	resizable(nullptr);   // don't resize any widget
- 
--	char buf[6]; snprintf(buf, 6, "%f", clock::getBpm());
-+	char buf[320]; snprintf(buf, 320, "%f", clock::getBpm());
- 	bpm->copy_label(buf);
- 
- 	bpm->callback(cb_bpm, (void*)this);
diff --git a/debian/patches/series b/debian/patches/series
index c8a9a4e..a09bfd0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 01-rtaudio5.patch
 02-rtmidi-pkgconfig.patch
-03-gcc7.patch
 04-catch.patch

-- 
giada packaging