Refresh patches

diff --git a/debian/patches/01-spelling-fixes.patch b/debian/patches/01-spelling-fixes.patch
index 1690c574e085292c83173431b6dc52961d890c7a..3da8d5392ebf0f7709158d10344416d83f2bd2ad 100644 (file)
--- a/debian/patches/01-spelling-fixes.patch
+++ b/debian/patches/01-spelling-fixes.patch
@@ -7,7 +7,7 @@ Last-Update: 2020-04-02
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- giada.orig/src/glue/channel.cpp
 +++ giada/src/glue/channel.cpp
-@@ -154,7 +154,7 @@
+@@ -235,7 +235,7 @@
                        errors = true;
  
        if (errors)

diff --git a/debian/patches/02-rtmidi-pkgconfig.patch b/debian/patches/02-rtmidi-pkgconfig.patch
index 8e45175d9d686107a98f8e963fe2e124c6ab0693..7d27c1b6b3f4d06fa9d344fff18bb97668fbc496 100644 (file)
--- a/debian/patches/02-rtmidi-pkgconfig.patch
+++ b/debian/patches/02-rtmidi-pkgconfig.patch
@@ -7,11 +7,9 @@ Subject: build with new rtmidi lib.
  configure.ac | 18 +-----------------
  2 files changed, 5 insertions(+), 20 deletions(-)
 
-Index: giada/Makefile.am
-===================================================================
 --- giada.orig/Makefile.am
 +++ giada/Makefile.am
-@@ -385,9 +385,10 @@ cppFlags += \
+@@ -386,9 +386,10 @@
        -D__WINDOWS_ASIO__                           \
        -D__WINDOWS_WASAPI__                         \
        -D__WINDOWS_DS__
@@ -23,7 +21,7 @@ Index: giada/Makefile.am
        -lsetupapi -limm32 -lglu32 -lshell32 -lversion \
        -lopengl32 -loleaut32 -lshlwapi -lcomdlg32 -lflac -lvorbis -logg -lvorbisenc \
        -lole32 -lwinmm -lksuser -lmfplat -lmfuuid -lwmcodecdspuuid
-@@ -401,9 +402,10 @@ if LINUX
+@@ -402,9 +403,10 @@
  
  # Add preprocessor flags to enable ALSA, Pulse and JACK in RtAudio.
  cppFlags += -D__LINUX_ALSA__ -D__LINUX_PULSE__ -D__UNIX_JACK__
@@ -35,7 +33,7 @@ Index: giada/Makefile.am
        -lfreetype -lfontconfig -lXrender -lXfixes -lXcursor -lXinerama
  
  endif
-@@ -412,9 +414,10 @@ if FREEBSD
+@@ -413,9 +415,10 @@
  
  # Add preprocessor flags to enable ALSA, Pulse and JACK in RtAudio.
  cppFlags += -D__LINUX_PULSE__ -D__UNIX_JACK__
@@ -47,7 +45,7 @@ Index: giada/Makefile.am
        -lfreetype
  
  endif
-@@ -427,9 +430,9 @@ sourcesExtra += src/utils/cocoa.mm src/u
+@@ -428,9 +431,9 @@
  cppFlags += -D__MACOSX_CORE__
  
  # -ObjC++: Juce requires to build some Objective C code
@@ -59,11 +57,9 @@ Index: giada/Makefile.am
        -lFLAC -logg -lvorbis -lvorbisenc -lopus
  
  ldFlags += -framework CoreAudio -framework Cocoa -framework Carbon \
-Index: giada/configure.ac
-===================================================================
 --- giada.orig/configure.ac
 +++ giada/configure.ac
-@@ -123,23 +123,7 @@ AC_CHECK_HEADER(
+@@ -123,23 +123,7 @@
  )
  AC_LANG_POP
  

diff --git a/debian/patches/04-system-json.patch b/debian/patches/04-system-json.patch
index 074c3b0be96e11290c5441216131135d1d63c765..526b914365f0515675d717b2f21d7a9df75acd52 100644 (file)
--- a/debian/patches/04-system-json.patch
+++ b/debian/patches/04-system-json.patch
@@ -10,7 +10,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 @@ -30,7 +30,7 @@
  #include <string>
  #include <cstring>
- #include <dirent.h>
+ #include <filesystem>
 -#include "deps/json/single_include/nlohmann/json.hpp"
 +#include "nlohmann/json.hpp"
  #include "utils/string.h"
@@ -27,13 +27,6 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  #include "utils/fs.h"
  #include "utils/log.h"
  #include "core/const.h"
-@@ -314,4 +314,4 @@
-     ofs << j;
-       return true;
- }
--}}}; // giada::m::conf::
-\ No newline at end of file
-+}}}; // giada::m::conf::
 --- giada.orig/src/core/init.cpp
 +++ giada/src/core/init.cpp
 @@ -35,7 +35,7 @@