From: Jaromír Mikeš Date: Tue, 15 Aug 2017 02:47:29 +0000 (+0200) Subject: Patches refreshed. X-Git-Tag: archive/raspbian/0.15.4+ds1-1+rpi1^2~93 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=714804801a96fd187b1f82c0b5cdd05790ba0cde;p=giada.git Patches refreshed. --- diff --git a/debian/patches/02-rtmidi-pkgconfig.patch b/debian/patches/02-rtmidi-pkgconfig.patch index e841c31..9ee972c 100644 --- a/debian/patches/02-rtmidi-pkgconfig.patch +++ b/debian/patches/02-rtmidi-pkgconfig.patch @@ -6,10 +6,10 @@ Index: giada/Makefile.am =================================================================== --- giada.orig/Makefile.am +++ giada/Makefile.am -@@ -282,9 +282,9 @@ giada_SOURCES += src/deps/rtaudio-mod/Rt - # -Wno-error=misleading-indentation: don't stop on JUCE warnings on GCC6 +@@ -283,9 +283,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=misleading-indentation -Wno-error=unused-function + 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 \ @@ -18,7 +18,7 @@ Index: giada/Makefile.am -lfreetype endif -@@ -367,7 +367,7 @@ src/deps/juce/modules/juce_gui_extra/juc +@@ -372,7 +372,7 @@ src/deps/juce/modules/juce_gui_extra/juc endif giada_tests_LDADD = -ljansson -lsndfile -lsamplerate -lfltk -lXext -lX11 -lXft \ diff --git a/debian/patches/04-catch.patch b/debian/patches/04-catch.patch index dc19d89..4ce2654 100644 --- a/debian/patches/04-catch.patch +++ b/debian/patches/04-catch.patch @@ -75,7 +75,8 @@ Index: giada/tests/wave.cpp =================================================================== --- giada.orig/tests/wave.cpp +++ giada/tests/wave.cpp -@@ -1,5 +1,5 @@ +@@ -1,6 +1,6 @@ + #include #include "../src/core/wave.h" -#include "catch/single_include/catch.hpp" +#include