From f45548064e6accf481cd5c7272d4f8cb199b17bc Mon Sep 17 00:00:00 2001 From: =?utf8?q?IOhannes=20m=20zm=C3=B6lnig?= Date: Mon, 16 Mar 2020 12:52:07 +0100 Subject: [PATCH] Refresh patches using 'gbp pq' --- debian/patches/LV2-audioprocessor.patch | 24 ++++++++++--------- debian/patches/debian_fixed-defines.patch | 12 ++++++---- debian/patches/debian_gpl_variant.patch | 6 +++-- debian/patches/debian_link_systemlibs.patch | 10 ++++---- debian/patches/debian_no-update-check.patch | 8 ++++--- debian/patches/debian_no-usagedata.patch | 8 ++++--- debian/patches/debian_python3.patch | 8 ++++--- debian/patches/debian_system_modules.patch | 8 ++++--- .../debian_unittests_globalpaths.patch | 6 +++-- debian/patches/debian_vst.patch | 20 +++++++++------- 10 files changed, 67 insertions(+), 43 deletions(-) diff --git a/debian/patches/LV2-audioprocessor.patch b/debian/patches/LV2-audioprocessor.patch index ea5b32de..b3205be7 100644 --- a/debian/patches/LV2-audioprocessor.patch +++ b/debian/patches/LV2-audioprocessor.patch @@ -11,9 +11,11 @@ Reviewed-by: IOhannes m zmölnig .../juce_audio_processors/processors/juce_AudioProcessor.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) ---- juce.orig/modules/juce_audio_processors/processors/juce_AudioProcessor.h -+++ juce/modules/juce_audio_processors/processors/juce_AudioProcessor.h -@@ -927,6 +927,7 @@ +diff --git a/modules/juce_audio_processors/processors/juce_AudioProcessor.h b/modules/juce_audio_processors/processors/juce_AudioProcessor.h +index 836b09c..c3909a7 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; @@ -21,7 +23,7 @@ Reviewed-by: IOhannes m zmölnig //============================================================================== /** Creates the processor's GUI. -@@ -976,6 +977,7 @@ +@@ -976,6 +977,7 @@ public: This may call createEditor() internally to create the component. */ AudioProcessorEditor* createEditorIfNeeded(); @@ -29,19 +31,19 @@ Reviewed-by: IOhannes m zmölnig //============================================================================== /** Returns the default number of steps for a parameter. -@@ -1118,6 +1120,11 @@ +@@ -1117,6 +1119,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); - -@@ -1187,9 +1194,11 @@ +@@ -1187,9 +1194,11 @@ public: virtual CurveData getResponseCurve (CurveData::Type /*curveType*/) const { return {}; } @@ -53,7 +55,7 @@ Reviewed-by: IOhannes m zmölnig /** Flags to indicate the type of plugin context in which a processor is being used. */ enum WrapperType -@@ -1203,6 +1212,7 @@ +@@ -1203,6 +1212,7 @@ public: wrapperType_AAX, wrapperType_Standalone, wrapperType_Unity @@ -61,7 +63,7 @@ Reviewed-by: IOhannes m zmölnig }; /** When loaded by a plugin wrapper, this flag will be set to indicate the type -@@ -1463,7 +1473,9 @@ +@@ -1463,7 +1473,9 @@ private: //============================================================================== Array listeners; diff --git a/debian/patches/debian_fixed-defines.patch b/debian/patches/debian_fixed-defines.patch index 7486e104..2f00702f 100644 --- a/debian/patches/debian_fixed-defines.patch +++ b/debian/patches/debian_fixed-defines.patch @@ -11,8 +11,10 @@ Forwarded: not-needed modules/juce_core/juce_core.h | 32 +++++++++++++++++++++- 2 files changed, 56 insertions(+), 1 deletion(-) ---- juce.orig/modules/juce_audio_plugin_client/utility/juce_CheckSettingMacros.h -+++ juce/modules/juce_audio_plugin_client/utility/juce_CheckSettingMacros.h +diff --git a/modules/juce_audio_plugin_client/utility/juce_CheckSettingMacros.h b/modules/juce_audio_plugin_client/utility/juce_CheckSettingMacros.h +index b5278b1..4c0a9ba 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 @@ ============================================================================== */ @@ -52,8 +54,10 @@ Forwarded: not-needed #ifndef JucePlugin_IsSynth #error "You need to define the JucePlugin_IsSynth value!" #endif ---- juce.orig/modules/juce_core/juce_core.h -+++ juce/modules/juce_core/juce_core.h +diff --git a/modules/juce_core/juce_core.h b/modules/juce_core/juce_core.h +index 62d0dfa..c66ded1 100644 +--- a/modules/juce_core/juce_core.h ++++ b/modules/juce_core/juce_core.h @@ -64,6 +64,36 @@ #include "system/juce_TargetPlatform.h" diff --git a/debian/patches/debian_gpl_variant.patch b/debian/patches/debian_gpl_variant.patch index 22499ffe..4b341ea7 100644 --- a/debian/patches/debian_gpl_variant.patch +++ b/debian/patches/debian_gpl_variant.patch @@ -7,8 +7,10 @@ Forwarded: not-needed extras/Projucer/JuceLibraryCode/AppConfig.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---- juce.orig/extras/Projucer/JuceLibraryCode/AppConfig.h -+++ juce/extras/Projucer/JuceLibraryCode/AppConfig.h +diff --git a/extras/Projucer/JuceLibraryCode/AppConfig.h b/extras/Projucer/JuceLibraryCode/AppConfig.h +index cb5a324..8d54ae2 100644 +--- a/extras/Projucer/JuceLibraryCode/AppConfig.h ++++ b/extras/Projucer/JuceLibraryCode/AppConfig.h @@ -32,7 +32,7 @@ // BEGIN SECTION A diff --git a/debian/patches/debian_link_systemlibs.patch b/debian/patches/debian_link_systemlibs.patch index 3b791cee..4b59edc2 100644 --- a/debian/patches/debian_link_systemlibs.patch +++ b/debian/patches/debian_link_systemlibs.patch @@ -13,9 +13,11 @@ Last-Update: 2019-08-21 .../ProjectSaving/jucer_ProjectExport_Make.h | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) ---- juce.orig/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h -+++ juce/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h -@@ -464,6 +464,39 @@ +diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h +index 515c50e..2752788 100644 +--- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h ++++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h +@@ -464,6 +464,39 @@ private: if (isCurlEnabled() && ! isLoadCurlSymbolsLazilyEnabled()) packages.add ("libcurl"); @@ -55,7 +57,7 @@ Last-Update: 2019-08-21 packages.removeDuplicates (false); return packages; -@@ -563,6 +596,9 @@ +@@ -563,6 +596,9 @@ private: StringArray result (linuxLibs); auto libraries = StringArray::fromTokens (getExternalLibrariesString(), ";", "\"'"); diff --git a/debian/patches/debian_no-update-check.patch b/debian/patches/debian_no-update-check.patch index 3cf23572..e4ff1799 100644 --- a/debian/patches/debian_no-update-check.patch +++ b/debian/patches/debian_no-update-check.patch @@ -9,9 +9,11 @@ Forwarded: not-needed extras/Projucer/Source/Application/jucer_AutoUpdater.cpp | 1 + 1 file changed, 1 insertion(+) ---- juce.orig/extras/Projucer/Source/Application/jucer_AutoUpdater.cpp -+++ juce/extras/Projucer/Source/Application/jucer_AutoUpdater.cpp -@@ -42,6 +42,7 @@ +diff --git a/extras/Projucer/Source/Application/jucer_AutoUpdater.cpp b/extras/Projucer/Source/Application/jucer_AutoUpdater.cpp +index 94e8eb7..e49a2f6 100644 +--- a/extras/Projucer/Source/Application/jucer_AutoUpdater.cpp ++++ b/extras/Projucer/Source/Application/jucer_AutoUpdater.cpp +@@ -42,6 +42,7 @@ LatestVersionCheckerAndUpdater::~LatestVersionCheckerAndUpdater() void LatestVersionCheckerAndUpdater::checkForNewVersion (bool showAlerts) { diff --git a/debian/patches/debian_no-usagedata.patch b/debian/patches/debian_no-usagedata.patch index c3ae4901..6c497998 100644 --- a/debian/patches/debian_no-usagedata.patch +++ b/debian/patches/debian_no-usagedata.patch @@ -8,9 +8,11 @@ Forwarded: no .../Application/Windows/jucer_ApplicationUsageDataWindowComponent.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---- juce.orig/extras/Projucer/Source/Application/Windows/jucer_ApplicationUsageDataWindowComponent.h -+++ juce/extras/Projucer/Source/Application/Windows/jucer_ApplicationUsageDataWindowComponent.h -@@ -69,10 +69,10 @@ +diff --git a/extras/Projucer/Source/Application/Windows/jucer_ApplicationUsageDataWindowComponent.h b/extras/Projucer/Source/Application/Windows/jucer_ApplicationUsageDataWindowComponent.h +index c9a06df..6a48b68 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 3136281d..ad562133 100644 --- a/debian/patches/debian_python3.patch +++ b/debian/patches/debian_python3.patch @@ -8,9 +8,11 @@ Forwarded: no doxygen/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---- juce.orig/doxygen/Makefile -+++ juce/doxygen/Makefile -@@ -8,7 +8,7 @@ +diff --git a/doxygen/Makefile b/doxygen/Makefile +index d4f5d3e..157ec0e 100644 +--- a/doxygen/Makefile ++++ b/doxygen/Makefile +@@ -8,7 +8,7 @@ doc/index.html: build/juce_modules.dox Doxyfile doxygen build/juce_modules.dox: process_source_files.py $(SOURCE_FILES) diff --git a/debian/patches/debian_system_modules.patch b/debian/patches/debian_system_modules.patch index 38bfb382..67e41594 100644 --- a/debian/patches/debian_system_modules.patch +++ b/debian/patches/debian_system_modules.patch @@ -9,9 +9,11 @@ Forwarded: not-needed extras/Projucer/Source/Settings/jucer_StoredSettings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---- juce.orig/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp -+++ juce/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp -@@ -385,7 +385,7 @@ +diff --git a/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp b/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp +index 74f751e..8348409 100644 +--- a/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp ++++ b/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp +@@ -385,7 +385,7 @@ static String getFallbackPathForOS (const Identifier& key, DependencyPathOS os) } else if (key == Ids::defaultJuceModulePath) { diff --git a/debian/patches/debian_unittests_globalpaths.patch b/debian/patches/debian_unittests_globalpaths.patch index fb6094d2..8279189e 100644 --- a/debian/patches/debian_unittests_globalpaths.patch +++ b/debian/patches/debian_unittests_globalpaths.patch @@ -7,8 +7,10 @@ Forwarded: not-needed extras/UnitTestRunner/UnitTestRunner.jucer | 38 +++++++++++++++--------------- 1 file changed, 19 insertions(+), 19 deletions(-) ---- juce.orig/extras/UnitTestRunner/UnitTestRunner.jucer -+++ juce/extras/UnitTestRunner/UnitTestRunner.jucer +diff --git a/extras/UnitTestRunner/UnitTestRunner.jucer b/extras/UnitTestRunner/UnitTestRunner.jucer +index 4e3f3af..c88af7a 100644 +--- a/extras/UnitTestRunner/UnitTestRunner.jucer ++++ b/extras/UnitTestRunner/UnitTestRunner.jucer @@ -123,26 +123,26 @@ diff --git a/debian/patches/debian_vst.patch b/debian/patches/debian_vst.patch index 11eb4401..ba910084 100644 --- a/debian/patches/debian_vst.patch +++ b/debian/patches/debian_vst.patch @@ -11,9 +11,11 @@ Last-Update: 2019-01-12 .../juce_audio_processors/format_types/juce_VSTPluginFormat.cpp | 7 ++++--- 2 files changed, 5 insertions(+), 6 deletions(-) ---- juce.orig/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp -+++ juce/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp -@@ -101,8 +101,7 @@ +diff --git a/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp b/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp +index 7f63093..b1208b4 100644 +--- a/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp ++++ b/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp +@@ -101,8 +101,7 @@ namespace Vst2 // field in the Projucer. The VST2 SDK can be obtained from the // vstsdk3610_11_06_2018_build_37 (or older) VST3 SDK or JUCE version 5.3.2. You // also need a VST2 license from Steinberg to distribute VST2 plug-ins. @@ -23,7 +25,7 @@ Last-Update: 2019-01-12 } using namespace juce; -@@ -124,7 +123,6 @@ +@@ -124,7 +123,6 @@ using namespace juce; #pragma pack (push, 8) #endif @@ -31,8 +33,10 @@ Last-Update: 2019-01-12 #include "../utility/juce_IncludeModuleHeaders.h" #include "../utility/juce_FakeMouseMoveGenerator.h" ---- juce.orig/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp -+++ juce/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp +diff --git a/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp b/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp +index bdc935f..8ddc9f2 100644 +--- a/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp ++++ b/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp @@ -49,7 +49,6 @@ #endif @@ -41,7 +45,7 @@ Last-Update: 2019-01-12 namespace Vst2 { -@@ -58,8 +57,7 @@ +@@ -58,8 +57,7 @@ namespace Vst2 // paths or use the "VST (Legacy) SDK Folder" field in the Projucer. The VST2 // SDK can be obtained from the vstsdk3610_11_06_2018_build_37 (or older) VST3 // SDK or JUCE version 5.3.2. @@ -51,7 +55,7 @@ Last-Update: 2019-01-12 } #include "juce_VSTCommon.h" -@@ -81,6 +79,9 @@ +@@ -81,6 +79,9 @@ namespace Vst2 #include "juce_VSTMidiEventList.h" -- 2.30.2