From: IOhannes m zmölnig Date: Fri, 11 Jan 2019 23:03:13 +0000 (+0100) Subject: Refreshed patches X-Git-Tag: archive/raspbian/5.4.5_ds0-1+rpi1~1^2~44 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b9a7dc754e8f06e4b0d57b842d5675e28b7b39d3;p=juce.git Refreshed patches --- diff --git a/debian/patches/0010-Backported-fix-for-crash-when-saving-global-search-p.patch b/debian/patches/0010-Backported-fix-for-crash-when-saving-global-search-p.patch deleted file mode 100644 index 9f352a48..00000000 --- a/debian/patches/0010-Backported-fix-for-crash-when-saving-global-search-p.patch +++ /dev/null @@ -1,53 +0,0 @@ -From: =?utf-8?q?IOhannes_m_zm=C3=B6lnig?= -Date: Fri, 26 Oct 2018 22:12:13 +0200 -Subject: Backported fix for crash when saving global-search-path from cmdline - ---- - extras/Projucer/Source/Application/jucer_CommandLine.cpp | 8 +++++--- - extras/Projucer/Source/Settings/jucer_StoredSettings.cpp | 3 +++ - 2 files changed, 8 insertions(+), 3 deletions(-) - -diff --git a/extras/Projucer/Source/Application/jucer_CommandLine.cpp b/extras/Projucer/Source/Application/jucer_CommandLine.cpp -index 4dfe6cf..227895e 100644 ---- a/extras/Projucer/Source/Application/jucer_CommandLine.cpp -+++ b/extras/Projucer/Source/Application/jucer_CommandLine.cpp -@@ -733,6 +733,8 @@ namespace - - auto settingsFile = userAppData.getChildFile ("Projucer").getChildFile ("Projucer.settings"); - std::unique_ptr xml (XmlDocument::parse (settingsFile)); -+ if (xml == nullptr) -+ throw CommandLineError ("Settings file not valid!"); - auto settingsTree = ValueTree::fromXml (*xml); - - if (! settingsTree.isValid()) -@@ -742,13 +744,13 @@ namespace - if (isThisOS (args[1])) - { - childToSet = settingsTree.getChildWithProperty (Ids::name, "PROJECT_DEFAULT_SETTINGS") -- .getChildWithName ("PROJECT_DEFAULT_SETTINGS"); -+ .getOrCreateChildWithName ("PROJECT_DEFAULT_SETTINGS", nullptr); - } - else - { - childToSet = settingsTree.getChildWithProperty (Ids::name, "FALLBACK_PATHS") -- .getChildWithName ("FALLBACK_PATHS") -- .getChildWithName (args[1] + String ("Fallback")); -+ .getOrCreateChildWithName ("FALLBACK_PATHS", nullptr) -+ .getOrCreateChildWithName (args[1] + String("Fallback"), nullptr); - } - - if (! childToSet.isValid()) -diff --git a/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp b/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp -index 5138b18..6d8b25a 100644 ---- a/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp -+++ b/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp -@@ -47,6 +47,9 @@ StoredSettings::StoredSettings() - { - updateOldProjectSettingsFiles(); - reload(); -+ changed (true); -+ flush(); -+ - checkJUCEPaths(); - - projectDefaults.addListener (this); diff --git a/debian/patches/LV2-audioprocessor.patch b/debian/patches/LV2-audioprocessor.patch index ce896bd1..fe918281 100644 --- a/debian/patches/LV2-audioprocessor.patch +++ b/debian/patches/LV2-audioprocessor.patch @@ -11,11 +11,9 @@ Reviewed-by: IOhannes m zmölnig .../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: +--- juce.orig/modules/juce_audio_processors/processors/juce_AudioProcessor.h ++++ juce/modules/juce_audio_processors/processors/juce_AudioProcessor.h +@@ -927,6 +927,7 @@ */ virtual void setNonRealtime (bool isNonRealtime) noexcept; @@ -23,7 +21,7 @@ index 201f3b3..772f636 100644 //============================================================================== /** Creates the processor's GUI. -@@ -973,6 +974,7 @@ public: +@@ -973,6 +974,7 @@ This may call createEditor() internally to create the component. */ AudioProcessorEditor* createEditorIfNeeded(); @@ -31,21 +29,21 @@ index 201f3b3..772f636 100644 //============================================================================== /** This must return the correct value immediately after the object has been -@@ -1296,6 +1298,11 @@ public: - /** This method is called when the layout of the audio processor changes. */ +@@ -1310,6 +1312,11 @@ 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 @@ public: - const AudioChannelSet& mainOutputLayout, - bool idForAudioSuite) const; + +@@ -1379,9 +1386,11 @@ + + virtual CurveData getResponseCurve (CurveData::Type /*curveType*/) const { return {}; } + #if ! JUCE_AUDIOPROCESSOR_NO_GUI //============================================================================== @@ -55,15 +53,15 @@ index 201f3b3..772f636 100644 /** Flags to indicate the type of plugin context in which a processor is being used. */ enum WrapperType -@@ -1352,6 +1361,7 @@ public: - wrapperType_AudioUnitv3, - wrapperType_RTAS, +@@ -1395,6 +1404,7 @@ wrapperType_AAX, -+ wrapperType_LV2, - wrapperType_Standalone + wrapperType_Standalone, + wrapperType_Unity ++ , wrapperType_LV2 }; -@@ -1601,7 +1611,9 @@ private: + /** When loaded by a plugin wrapper, this flag will be set to indicate the type +@@ -1648,7 +1658,9 @@ //============================================================================== Array listeners; diff --git a/debian/patches/debian_fixed-defines.patch b/debian/patches/debian_fixed-defines.patch index 1dc17ab6..7486e104 100644 --- a/debian/patches/debian_fixed-defines.patch +++ b/debian/patches/debian_fixed-defines.patch @@ -11,10 +11,8 @@ Forwarded: not-needed 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 +--- 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 @@ ============================================================================== */ @@ -46,7 +44,7 @@ index ca388ee..93afc22 100644 // The following checks should cause a compile error if you've forgotten to // define all your plugin settings properly.. -@@ -39,6 +63,7 @@ +@@ -40,6 +64,7 @@ #endif #define JUCE_CHECKSETTINGMACROS_H @@ -54,11 +52,9 @@ index ca388ee..93afc22 100644 #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 @@ +--- juce.orig/modules/juce_core/juce_core.h ++++ juce/modules/juce_core/juce_core.h +@@ -64,6 +64,36 @@ #include "system/juce_TargetPlatform.h" @@ -95,7 +91,7 @@ index 0c49510..7eee397 100644 //============================================================================== /** Config: JUCE_FORCE_DEBUG -@@ -124,7 +154,7 @@ +@@ -123,7 +153,7 @@ specify the path where your zlib headers live. */ #ifndef JUCE_INCLUDE_ZLIB_CODE diff --git a/debian/patches/debian_gpl_variant.patch b/debian/patches/debian_gpl_variant.patch index 35ec7e77..22499ffe 100644 --- a/debian/patches/debian_gpl_variant.patch +++ b/debian/patches/debian_gpl_variant.patch @@ -7,16 +7,14 @@ Forwarded: not-needed 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 @@ - +--- juce.orig/extras/Projucer/JuceLibraryCode/AppConfig.h ++++ juce/extras/Projucer/JuceLibraryCode/AppConfig.h +@@ -32,7 +32,7 @@ // BEGIN SECTION A --#define JUCER_ENABLE_GPL_MODE 0 -+#define JUCER_ENABLE_GPL_MODE 1 + #ifndef JUCER_ENABLE_GPL_MODE +- #define JUCER_ENABLE_GPL_MODE 0 ++ #define JUCER_ENABLE_GPL_MODE 1 + #endif // END SECTION A - diff --git a/debian/patches/debian_no-update-check.patch b/debian/patches/debian_no-update-check.patch index 5bacdabe..952282b5 100644 --- a/debian/patches/debian_no-update-check.patch +++ b/debian/patches/debian_no-update-check.patch @@ -9,11 +9,9 @@ Forwarded: not-needed 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 +--- juce.orig/extras/Projucer/Source/Application/jucer_AutoUpdater.cpp ++++ juce/extras/Projucer/Source/Application/jucer_AutoUpdater.cpp +@@ -617,6 +617,7 @@ void LatestVersionChecker::checkForNewVersion() { diff --git a/debian/patches/debian_no-usagedata.patch b/debian/patches/debian_no-usagedata.patch index ac299ba3..c3ae4901 100644 --- a/debian/patches/debian_no-usagedata.patch +++ b/debian/patches/debian_no-usagedata.patch @@ -8,11 +8,9 @@ Forwarded: no .../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: +--- juce.orig/extras/Projucer/Source/Application/Windows/jucer_ApplicationUsageDataWindowComponent.h ++++ juce/extras/Projucer/Source/Application/Windows/jucer_ApplicationUsageDataWindowComponent.h +@@ -69,10 +69,10 @@ auto* controller = ProjucerApplication::getApp().licenseController.get(); diff --git a/debian/patches/debian_system_modules.patch b/debian/patches/debian_system_modules.patch index 8e39e28c..fa516758 100644 --- a/debian/patches/debian_system_modules.patch +++ b/debian/patches/debian_system_modules.patch @@ -9,16 +9,14 @@ Forwarded: not-needed 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" -- : "~/JUCE/modules"); -+ : "/usr/share/juce/modules"); - } - else if (key == Ids::defaultUserModulePath) - { +--- juce.orig/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp ++++ juce/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp +@@ -389,7 +389,7 @@ + } + else if (key == Ids::defaultJuceModulePath) + { +- return (os == TargetOS::windows ? "C:\\JUCE\\modules" : "~/JUCE/modules"); ++ return (os == TargetOS::windows ? "C:\\JUCE\\modules" : "/usr/share/juce/modules"); + } + else if (key == Ids::defaultUserModulePath) + { diff --git a/debian/patches/debian_unittests_globalpaths.patch b/debian/patches/debian_unittests_globalpaths.patch index 4352b6fb..73f9cfb1 100644 --- a/debian/patches/debian_unittests_globalpaths.patch +++ b/debian/patches/debian_unittests_globalpaths.patch @@ -7,10 +7,8 @@ Forwarded: not-needed 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 +--- juce.orig/extras/UnitTestRunner/UnitTestRunner.jucer ++++ juce/extras/UnitTestRunner/UnitTestRunner.jucer @@ -96,26 +96,26 @@ @@ -55,5 +53,5 @@ index 3665976..197e7b7 100644 + useGlobalPath="1"/> + - + diff --git a/debian/patches/series b/debian/patches/series index 94152030..7e16e095 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,4 +7,3 @@ debian_no-usagedata.patch debian_system_modules.patch debian_python3.patch debian_unittests_globalpaths.patch -0010-Backported-fix-for-crash-when-saving-global-search-p.patch