From cf9a1094523036152d596b094ed16c5a737077d9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?IOhannes=20m=20zm=C3=B6lnig?= Date: Fri, 26 Oct 2018 21:50:47 +0200 Subject: [PATCH] Fixed patch-headers in preparation of 'gbp pq' --- debian/patches/LV2-audioprocessor.patch | 38 ++++--- debian/patches/debian_fixed-defines.patch | 102 ++++++++++-------- debian/patches/debian_gpl_variant.patch | 17 +-- debian/patches/debian_no-update-check.patch | 19 ++-- debian/patches/debian_no-usagedata.patch | 19 ++-- debian/patches/debian_python3.patch | 19 ++-- debian/patches/debian_system_modules.patch | 19 ++-- .../debian_unittests_globalpaths.patch | 17 +-- debian/patches/jack-client-name.patch | 20 ++-- 9 files changed, 161 insertions(+), 109 deletions(-) diff --git a/debian/patches/LV2-audioprocessor.patch b/debian/patches/LV2-audioprocessor.patch index 57646047..ce896bd1 100644 --- a/debian/patches/LV2-audioprocessor.patch +++ b/debian/patches/LV2-audioprocessor.patch @@ -1,13 +1,21 @@ -Description: LV2 fixes for autiodprocessor -Author: Filipe Coelho +From: Filipe Coelho +Date: Sat, 10 Feb 2018 00:00:00 +0100 +Subject: LV2 fixes for autiodprocessor +MIME-Version: 1.0 +Content-Type: text/plain; charset="utf-8" +Content-Transfer-Encoding: 8bit + Origin: https://github.com/DISTRHO/juce/tree/9f6cdc3659df13169285464ee1d13ef14357f833 Reviewed-by: IOhannes m zmölnig -Last-Update: 2018-02-10 --- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- juce.orig/modules/juce_audio_processors/processors/juce_AudioProcessor.h -+++ juce/modules/juce_audio_processors/processors/juce_AudioProcessor.h -@@ -927,6 +927,7 @@ + .../juce_audio_processors/processors/juce_AudioProcessor.h | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/modules/juce_audio_processors/processors/juce_AudioProcessor.h b/modules/juce_audio_processors/processors/juce_AudioProcessor.h +index 201f3b3..772f636 100644 +--- a/modules/juce_audio_processors/processors/juce_AudioProcessor.h ++++ b/modules/juce_audio_processors/processors/juce_AudioProcessor.h +@@ -927,6 +927,7 @@ public: */ virtual void setNonRealtime (bool isNonRealtime) noexcept; @@ -15,7 +23,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ //============================================================================== /** Creates the processor's GUI. -@@ -973,6 +974,7 @@ +@@ -973,6 +974,7 @@ public: This may call createEditor() internally to create the component. */ AudioProcessorEditor* createEditorIfNeeded(); @@ -23,19 +31,19 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ //============================================================================== /** This must return the correct value immediately after the object has been -@@ -1297,6 +1299,11 @@ +@@ -1296,6 +1298,11 @@ public: + /** This method is called when the layout of the audio processor changes. */ virtual void processorLayoutsChanged(); - //============================================================================== ++ //============================================================================== + /** LV2 specific calls, saving/restore as string. */ + virtual String getStateInformationString () { return String(); } + virtual void setStateInformationString (const String&) {} + -+ //============================================================================== + //============================================================================== /** Adds a listener that will be called when an aspect of this processor changes. */ virtual void addListener (AudioProcessorListener* newListener); - -@@ -1338,9 +1345,11 @@ +@@ -1338,9 +1345,11 @@ public: const AudioChannelSet& mainOutputLayout, bool idForAudioSuite) const; @@ -47,7 +55,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ /** Flags to indicate the type of plugin context in which a processor is being used. */ enum WrapperType -@@ -1352,6 +1361,7 @@ +@@ -1352,6 +1361,7 @@ public: wrapperType_AudioUnitv3, wrapperType_RTAS, wrapperType_AAX, @@ -55,7 +63,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ wrapperType_Standalone }; -@@ -1601,7 +1611,9 @@ +@@ -1601,7 +1611,9 @@ private: //============================================================================== Array listeners; diff --git a/debian/patches/debian_fixed-defines.patch b/debian/patches/debian_fixed-defines.patch index 9589e35b..1dc17ab6 100644 --- a/debian/patches/debian_fixed-defines.patch +++ b/debian/patches/debian_fixed-defines.patch @@ -1,14 +1,63 @@ -Description: clamp a few defines to fixed values +From: =?utf-8?q?IOhannes_m_zm=C3=B6lnig?= +Date: Sun, 11 Feb 2018 00:00:00 +0100 +Subject: clamp a few defines to fixed values + on Debian we only ever allow using the system provided libraries (zlib, flac, oggvorbis,...) -Author: IOhannes m zmölnig Origin: Debian Forwarded: not-needed -Last-Update: 2018-02-11 --- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- juce.orig/modules/juce_core/juce_core.h -+++ juce/modules/juce_core/juce_core.h + .../utility/juce_CheckSettingMacros.h | 25 +++++++++++++++++ + modules/juce_core/juce_core.h | 32 +++++++++++++++++++++- + 2 files changed, 56 insertions(+), 1 deletion(-) + +diff --git a/modules/juce_audio_plugin_client/utility/juce_CheckSettingMacros.h b/modules/juce_audio_plugin_client/utility/juce_CheckSettingMacros.h +index ca388ee..93afc22 100644 +--- a/modules/juce_audio_plugin_client/utility/juce_CheckSettingMacros.h ++++ b/modules/juce_audio_plugin_client/utility/juce_CheckSettingMacros.h +@@ -24,6 +24,30 @@ + ============================================================================== + */ + ++/* Debian specific overrides */ ++#if JucePlugin_Build_LV2 && ! defined (JucePlugin_LV2URI) ++# warning JUCE/Debian using default LV2URI ++# define JucePlugin_LV2URI JucePlugin_Name ++#endif ++ ++#if JucePlugin_Build_AU ++# warning JUCE/Debian disabled AU support ++# undef JucePlugin_Build_AU ++# define JucePlugin_Build_AU 0 ++#endif ++ ++#if JucePlugin_Build_RTAS ++# warning JUCE/Debian disabled RTAS support ++# undef JucePlugin_Build_RTAS ++# define JucePlugin_Build_RTAS 0 ++#endif ++ ++#if JucePlugin_Build_AAX ++# warning JUCE/Debian disabled AAX support ++# undef JucePlugin_Build_AAX ++# define JucePlugin_Build_AAX 0 ++#endif ++ + // The following checks should cause a compile error if you've forgotten to + // define all your plugin settings properly.. + +@@ -39,6 +63,7 @@ + #endif + #define JUCE_CHECKSETTINGMACROS_H + ++ + #ifndef JucePlugin_IsSynth + #error "You need to define the JucePlugin_IsSynth value!" + #endif +diff --git a/modules/juce_core/juce_core.h b/modules/juce_core/juce_core.h +index 0c49510..7eee397 100644 +--- a/modules/juce_core/juce_core.h ++++ b/modules/juce_core/juce_core.h @@ -65,6 +65,36 @@ #include "system/juce_TargetPlatform.h" @@ -55,44 +104,3 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ #endif #ifndef JUCE_ZLIB_INCLUDE_PATH ---- juce.orig/modules/juce_audio_plugin_client/utility/juce_CheckSettingMacros.h -+++ juce/modules/juce_audio_plugin_client/utility/juce_CheckSettingMacros.h -@@ -24,6 +24,30 @@ - ============================================================================== - */ - -+/* Debian specific overrides */ -+#if JucePlugin_Build_LV2 && ! defined (JucePlugin_LV2URI) -+# warning JUCE/Debian using default LV2URI -+# define JucePlugin_LV2URI JucePlugin_Name -+#endif -+ -+#if JucePlugin_Build_AU -+# warning JUCE/Debian disabled AU support -+# undef JucePlugin_Build_AU -+# define JucePlugin_Build_AU 0 -+#endif -+ -+#if JucePlugin_Build_RTAS -+# warning JUCE/Debian disabled RTAS support -+# undef JucePlugin_Build_RTAS -+# define JucePlugin_Build_RTAS 0 -+#endif -+ -+#if JucePlugin_Build_AAX -+# warning JUCE/Debian disabled AAX support -+# undef JucePlugin_Build_AAX -+# define JucePlugin_Build_AAX 0 -+#endif -+ - // The following checks should cause a compile error if you've forgotten to - // define all your plugin settings properly.. - -@@ -39,6 +63,7 @@ - #endif - #define JUCE_CHECKSETTINGMACROS_H - -+ - #ifndef JucePlugin_IsSynth - #error "You need to define the JucePlugin_IsSynth value!" - #endif diff --git a/debian/patches/debian_gpl_variant.patch b/debian/patches/debian_gpl_variant.patch index e1d876ad..35ec7e77 100644 --- a/debian/patches/debian_gpl_variant.patch +++ b/debian/patches/debian_gpl_variant.patch @@ -1,11 +1,16 @@ -Description: Build GPL-3 variant of Projucer -Author: IOhannes m zmölnig +From: =?utf-8?q?IOhannes_m_zm=C3=B6lnig?= +Date: Thu, 9 Nov 2017 00:00:00 +0100 +Subject: Build GPL-3 variant of Projucer + Forwarded: not-needed -Last-Update: 2017-11-09 --- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- juce.orig/extras/Projucer/JuceLibraryCode/AppConfig.h -+++ juce/extras/Projucer/JuceLibraryCode/AppConfig.h + extras/Projucer/JuceLibraryCode/AppConfig.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/extras/Projucer/JuceLibraryCode/AppConfig.h b/extras/Projucer/JuceLibraryCode/AppConfig.h +index 1846127..8147f2a 100644 +--- a/extras/Projucer/JuceLibraryCode/AppConfig.h ++++ b/extras/Projucer/JuceLibraryCode/AppConfig.h @@ -31,7 +31,7 @@ // BEGIN SECTION A diff --git a/debian/patches/debian_no-update-check.patch b/debian/patches/debian_no-update-check.patch index faa9a4ba..5bacdabe 100644 --- a/debian/patches/debian_no-update-check.patch +++ b/debian/patches/debian_no-update-check.patch @@ -1,14 +1,19 @@ -Description: prevent Projucer from checking for updates +From: =?utf-8?q?IOhannes_m_zm=C3=B6lnig?= +Date: Thu, 9 Nov 2017 00:00:00 +0100 +Subject: prevent Projucer from checking for updates + The check-for-updates only makes sense for user-installed Projucer, not for the Debian packaged version. -Author: IOhannes m zmölnig Forwarded: not-needed -Last-Update: 2017-11-09 --- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- juce.orig/extras/Projucer/Source/Application/jucer_AutoUpdater.cpp -+++ juce/extras/Projucer/Source/Application/jucer_AutoUpdater.cpp -@@ -617,6 +617,7 @@ + extras/Projucer/Source/Application/jucer_AutoUpdater.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/extras/Projucer/Source/Application/jucer_AutoUpdater.cpp b/extras/Projucer/Source/Application/jucer_AutoUpdater.cpp +index 1d40604..01c1711 100644 +--- a/extras/Projucer/Source/Application/jucer_AutoUpdater.cpp ++++ b/extras/Projucer/Source/Application/jucer_AutoUpdater.cpp +@@ -617,6 +617,7 @@ URL LatestVersionChecker::getLatestVersionURL (String& headers) const void LatestVersionChecker::checkForNewVersion() { diff --git a/debian/patches/debian_no-usagedata.patch b/debian/patches/debian_no-usagedata.patch index 19be7be0..ac299ba3 100644 --- a/debian/patches/debian_no-usagedata.patch +++ b/debian/patches/debian_no-usagedata.patch @@ -1,13 +1,18 @@ -Description: default to not-sending usage-data to ROLI +From: =?utf-8?q?IOhannes_m_zm=C3=B6lnig?= +Date: Mon, 26 Mar 2018 00:00:00 +0200 +Subject: default to not-sending usage-data to ROLI + we prefer to have privacy enabled by default... -Author: IOhannes m zmölnig Forwarded: no -Last-Update: 2018-03-26 --- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- juce.orig/extras/Projucer/Source/Application/Windows/jucer_ApplicationUsageDataWindowComponent.h -+++ juce/extras/Projucer/Source/Application/Windows/jucer_ApplicationUsageDataWindowComponent.h -@@ -69,10 +69,10 @@ + .../Application/Windows/jucer_ApplicationUsageDataWindowComponent.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/extras/Projucer/Source/Application/Windows/jucer_ApplicationUsageDataWindowComponent.h b/extras/Projucer/Source/Application/Windows/jucer_ApplicationUsageDataWindowComponent.h +index 15ccb5b..bb22983 100644 +--- a/extras/Projucer/Source/Application/Windows/jucer_ApplicationUsageDataWindowComponent.h ++++ b/extras/Projucer/Source/Application/Windows/jucer_ApplicationUsageDataWindowComponent.h +@@ -69,10 +69,10 @@ public: auto* controller = ProjucerApplication::getApp().licenseController.get(); diff --git a/debian/patches/debian_python3.patch b/debian/patches/debian_python3.patch index 2b8ed890..126659c8 100644 --- a/debian/patches/debian_python3.patch +++ b/debian/patches/debian_python3.patch @@ -1,13 +1,18 @@ -Description: use Python3 rather than Python2 +From: =?utf-8?q?IOhannes_m_zm=C3=B6lnig?= +Date: Sat, 10 Feb 2018 00:00:00 +0100 +Subject: use Python3 rather than Python2 + for building the documentation -Author: IOhannes m zmölnig Forwarded: no -Last-Update: 2018-02-10 --- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- juce.orig/doxygen/Makefile -+++ juce/doxygen/Makefile -@@ -9,7 +9,7 @@ + doxygen/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/doxygen/Makefile b/doxygen/Makefile +index 5b17c37..77e4ad2 100644 +--- a/doxygen/Makefile ++++ b/doxygen/Makefile +@@ -9,7 +9,7 @@ doc/index.html: build/juce_modules.dox Doxyfile build/juce_modules.dox: process_source_files.py $(SOURCE_FILES) rm -rf build diff --git a/debian/patches/debian_system_modules.patch b/debian/patches/debian_system_modules.patch index 5dd2b227..8e39e28c 100644 --- a/debian/patches/debian_system_modules.patch +++ b/debian/patches/debian_system_modules.patch @@ -1,14 +1,19 @@ -Description: default JUCE-module path for Projucer +From: =?utf-8?q?IOhannes_m_zm=C3=B6lnig?= +Date: Tue, 19 Dec 2017 00:00:00 +0100 +Subject: default JUCE-module path for Projucer + On Debian we have the module-sources installed in /usr/share/juce/modules and should use those if possible. -Author: IOhannes m zmölnig Forwarded: not-needed -Last-Update: 2017-12-19 --- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- juce.orig/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp -+++ juce/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp -@@ -311,7 +311,7 @@ + extras/Projucer/Source/Settings/jucer_StoredSettings.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp b/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp +index 10744c9..5138b18 100644 +--- a/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp ++++ b/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp +@@ -311,7 +311,7 @@ Value StoredSettings::getFallbackPathForOS (const Identifier& key, DependencyPat else if (key == Ids::defaultJuceModulePath) { v = (os == TargetOS::windows ? "C:\\JUCE\\modules" diff --git a/debian/patches/debian_unittests_globalpaths.patch b/debian/patches/debian_unittests_globalpaths.patch index 7732e007..4352b6fb 100644 --- a/debian/patches/debian_unittests_globalpaths.patch +++ b/debian/patches/debian_unittests_globalpaths.patch @@ -1,11 +1,16 @@ -Description: Use global paths for JUCE modules in UnitTests -Author: IOhannes m zmölnig +From: =?utf-8?q?IOhannes_m_zm=C3=B6lnig?= +Date: Wed, 11 Apr 2018 00:00:00 +0200 +Subject: Use global paths for JUCE modules in UnitTests + Forwarded: not-needed -Last-Update: 2018-04-11 --- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- juce.orig/extras/UnitTestRunner/UnitTestRunner.jucer -+++ juce/extras/UnitTestRunner/UnitTestRunner.jucer + extras/UnitTestRunner/UnitTestRunner.jucer | 38 +++++++++++++++--------------- + 1 file changed, 19 insertions(+), 19 deletions(-) + +diff --git a/extras/UnitTestRunner/UnitTestRunner.jucer b/extras/UnitTestRunner/UnitTestRunner.jucer +index 3665976..197e7b7 100644 +--- a/extras/UnitTestRunner/UnitTestRunner.jucer ++++ b/extras/UnitTestRunner/UnitTestRunner.jucer @@ -96,26 +96,26 @@ diff --git a/debian/patches/jack-client-name.patch b/debian/patches/jack-client-name.patch index 63ded137..d40af5db 100644 --- a/debian/patches/jack-client-name.patch +++ b/debian/patches/jack-client-name.patch @@ -1,15 +1,21 @@ -Description: meaningful default JACK client name +From: =?utf-8?q?IOhannes_m_zm=C3=B6lnig?= +Date: Thu, 12 Apr 2018 00:00:00 +0200 +Subject: meaningful default JACK client name + rather than "JUCEJack" for all jack standalone apps, use the . -Author: IOhannes m zmölnig + Bug: https://github.com/WeAreROLI/JUCE/issues/331 Forwarded: https://github.com/WeAreROLI/JUCE/pull/351 -Last-Update: 2018-04-12 --- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- juce.orig/modules/juce_audio_devices/native/juce_linux_JackAudio.cpp -+++ juce/modules/juce_audio_devices/native/juce_linux_JackAudio.cpp -@@ -105,7 +105,11 @@ + modules/juce_audio_devices/native/juce_linux_JackAudio.cpp | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/modules/juce_audio_devices/native/juce_linux_JackAudio.cpp b/modules/juce_audio_devices/native/juce_linux_JackAudio.cpp +index 35302a3..7031e1d 100644 +--- a/modules/juce_audio_devices/native/juce_linux_JackAudio.cpp ++++ b/modules/juce_audio_devices/native/juce_linux_JackAudio.cpp +@@ -105,7 +105,11 @@ namespace //============================================================================== #ifndef JUCE_JACK_CLIENT_NAME -- 2.30.2