From 1caeda16f9ddfe0679195a4acd0b5733233c04a8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?IOhannes=20m=20zm=C3=B6lnig=20=28Debian/GNU=29?= Date: Thu, 16 Dec 2021 16:55:09 +0100 Subject: [PATCH] Refresh patches --- debian/patches/01-spelling-fixes.patch | 18 --------- debian/patches/03-system-rtaudio.patch | 54 ++++++++++++-------------- debian/patches/04-system-json.patch | 35 ++++++----------- debian/patches/series | 1 - 4 files changed, 37 insertions(+), 71 deletions(-) delete mode 100644 debian/patches/01-spelling-fixes.patch diff --git a/debian/patches/01-spelling-fixes.patch b/debian/patches/01-spelling-fixes.patch deleted file mode 100644 index bb6c599..0000000 --- a/debian/patches/01-spelling-fixes.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: Fix spelling errors -Author: IOhannes m zmölnig -Origin: Debian -Forwarded: no -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 -@@ -207,7 +207,7 @@ - errors = true; - - if (errors) -- v::gdAlert("Some files weren't loaded sucessfully."); -+ v::gdAlert("Some files weren't loaded successfully."); - } - - /* -------------------------------------------------------------------------- */ diff --git a/debian/patches/03-system-rtaudio.patch b/debian/patches/03-system-rtaudio.patch index 05d5931..b34f3cb 100644 --- a/debian/patches/03-system-rtaudio.patch +++ b/debian/patches/03-system-rtaudio.patch @@ -5,39 +5,24 @@ Forwarded: not-needed Last-Update: 2021-08-30 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- giada.orig/src/core/kernelAudio.cpp -+++ giada/src/core/kernelAudio.cpp -@@ -33,7 +33,7 @@ - #include "core/mixerHandler.h" - #include "core/model/model.h" - #include "core/recManager.h" --#include "deps/rtaudio/RtAudio.h" -+#include "rtaudio/RtAudio.h" - #include "glue/main.h" - #include "mixer.h" - #include "utils/log.h" ---- giada.orig/src/core/mixer.h -+++ giada/src/core/mixer.h -@@ -32,7 +32,7 @@ - #include "core/recorder.h" - #include "core/ringBuffer.h" - #include "core/types.h" --#include "deps/rtaudio/RtAudio.h" -+#include "rtaudio/RtAudio.h" - #include - - namespace giada::m --- giada.orig/src/glue/config.cpp +++ giada/src/glue/config.cpp -@@ -28,7 +28,7 @@ - #include "core/conf.h" - #include "core/const.h" - #include "core/kernelAudio.h" +@@ -32,7 +32,7 @@ + #include "core/kernelMidi.h" + #include "core/midiMapper.h" + #include "core/plugins/pluginManager.h" -#include "deps/rtaudio/RtAudio.h" +#include "rtaudio/RtAudio.h" - - namespace giada::c::config - { + #include "gui/dialogs/browser/browserDir.h" + #include "gui/dialogs/config.h" + #include "gui/dialogs/warnings.h" +@@ -328,4 +328,4 @@ + configWin->tabPlugins->rebuild(); + } + #endif +-} // namespace giada::c::config +\ No newline at end of file ++} // namespace giada::c::config --- giada.orig/src/gui/elems/config/tabAudio.cpp +++ giada/src/gui/elems/config/tabAudio.cpp @@ -27,7 +27,7 @@ @@ -60,3 +45,14 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ #include #include +--- giada.orig/src/core/kernelAudio.h ++++ giada/src/core/kernelAudio.h +@@ -28,7 +28,7 @@ + #define G_KERNELAUDIO_H + + #include "core/conf.h" +-#include "deps/rtaudio/RtAudio.h" ++#include "rtaudio/RtAudio.h" + #include + #include + #include diff --git a/debian/patches/04-system-json.patch b/debian/patches/04-system-json.patch index ce0f7af..b1eb141 100644 --- a/debian/patches/04-system-json.patch +++ b/debian/patches/04-system-json.patch @@ -5,21 +5,10 @@ Forwarded: no Last-Update: 2020-04-02 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- giada.orig/src/core/midiMapConf.cpp -+++ giada/src/core/midiMapConf.cpp -@@ -26,7 +26,7 @@ - - #include "midiMapConf.h" - #include "const.h" --#include "deps/json/single_include/nlohmann/json.hpp" -+#include "nlohmann/json.hpp" - #include "utils/fs.h" - #include "utils/log.h" - #include "utils/string.h" --- giada.orig/src/core/conf.cpp +++ giada/src/core/conf.cpp @@ -27,7 +27,7 @@ - #include "conf.h" + #include "core/conf.h" #include "core/const.h" #include "core/types.h" -#include "deps/json/single_include/nlohmann/json.hpp" @@ -27,17 +16,6 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ #include "utils/fs.h" #include "utils/log.h" #include ---- giada.orig/src/core/init.cpp -+++ giada/src/core/init.cpp -@@ -54,7 +54,7 @@ - #include "core/sequencer.h" - #include "core/wave.h" - #include "core/waveManager.h" --#include "deps/json/single_include/nlohmann/json.hpp" -+#include "nlohmann/json.hpp" - #include "glue/main.h" - #include "gui/dialogs/mainWindow.h" - #include "gui/dialogs/warnings.h" --- giada.orig/src/core/patch.cpp +++ giada/src/core/patch.cpp @@ -26,7 +26,7 @@ @@ -49,3 +27,14 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ #include "utils/log.h" #include "utils/math.h" #include +--- giada.orig/src/core/midiMapper.h ++++ giada/src/core/midiMapper.h +@@ -27,7 +27,7 @@ + #ifndef G_MIDIMAPPER_H + #define G_MIDIMAPPER_H + +-#include "deps/json/single_include/nlohmann/json.hpp" ++#include "nlohmann/json.hpp" + #include + #include + diff --git a/debian/patches/series b/debian/patches/series index cec1d96..d26eddc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -01-spelling-fixes.patch 02-geompp.patch 03-system-rtaudio.patch 04-system-json.patch -- 2.30.2