Patches refreshed.

diff --git a/debian/patches/02-rtmidi-pkgconfig.patch b/debian/patches/02-rtmidi-pkgconfig.patch
index e841c3184af28e6b43f324265d667364dca4d343..9ee972c4acdc394887be4ff228fca48a49a18693 100644 (file)
--- 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 dc19d897b942945780da93b21464c595b35629b8..4ce2654ff89eaf657a23bcabe7bf384dfe62b30d 100644 (file)
--- 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 <memory>
  #include "../src/core/wave.h"
 -#include "catch/single_include/catch.hpp"
 +#include <catch.hpp>