From a0d6c518720ce9fcdeb685b438fbd3e037379445 Mon Sep 17 00:00:00 2001 From: =?utf8?q?IOhannes=20m=20zm=C3=B6lnig?= Date: Tue, 20 Aug 2019 11:55:42 +0200 Subject: [PATCH] Refresh patches --- debian/patches/LV2-audioprocessor.patch | 10 +++++----- debian/patches/debian_no-update-check.patch | 10 +++++----- debian/patches/debian_python3.patch | 10 ++++------ debian/patches/debian_system_modules.patch | 2 +- debian/patches/debian_unittests_globalpaths.patch | 4 ++-- debian/patches/debian_vst.patch | 10 +++++----- debian/patches/jack-client-name.patch | 8 +++----- debian/patches/spelling.patch | 2 +- 8 files changed, 26 insertions(+), 30 deletions(-) diff --git a/debian/patches/LV2-audioprocessor.patch b/debian/patches/LV2-audioprocessor.patch index fe918281..e8cf7b34 100644 --- a/debian/patches/LV2-audioprocessor.patch +++ b/debian/patches/LV2-audioprocessor.patch @@ -28,8 +28,8 @@ Reviewed-by: IOhannes m zmölnig + #endif //============================================================================== - /** This must return the correct value immediately after the object has been -@@ -1310,6 +1312,11 @@ + /** Returns the default number of steps for a parameter. +@@ -1108,6 +1110,11 @@ virtual void processorLayoutsChanged(); //============================================================================== @@ -41,7 +41,7 @@ Reviewed-by: IOhannes m zmölnig /** Adds a listener that will be called when an aspect of this processor changes. */ virtual void addListener (AudioProcessorListener* newListener); -@@ -1379,9 +1386,11 @@ +@@ -1177,9 +1184,11 @@ virtual CurveData getResponseCurve (CurveData::Type /*curveType*/) const { return {}; } @@ -53,7 +53,7 @@ Reviewed-by: IOhannes m zmölnig /** Flags to indicate the type of plugin context in which a processor is being used. */ enum WrapperType -@@ -1395,6 +1404,7 @@ +@@ -1193,6 +1202,7 @@ wrapperType_AAX, wrapperType_Standalone, wrapperType_Unity @@ -61,7 +61,7 @@ Reviewed-by: IOhannes m zmölnig }; /** When loaded by a plugin wrapper, this flag will be set to indicate the type -@@ -1648,7 +1658,9 @@ +@@ -1453,7 +1463,9 @@ //============================================================================== Array listeners; diff --git a/debian/patches/debian_no-update-check.patch b/debian/patches/debian_no-update-check.patch index 952282b5..3cf23572 100644 --- a/debian/patches/debian_no-update-check.patch +++ b/debian/patches/debian_no-update-check.patch @@ -11,11 +11,11 @@ Forwarded: not-needed --- juce.orig/extras/Projucer/Source/Application/jucer_AutoUpdater.cpp +++ juce/extras/Projucer/Source/Application/jucer_AutoUpdater.cpp -@@ -617,6 +617,7 @@ +@@ -42,6 +42,7 @@ - void LatestVersionChecker::checkForNewVersion() + void LatestVersionCheckerAndUpdater::checkForNewVersion (bool showAlerts) { -+ return; // on Debian we don't check for updates - hasAttemptedToReadWebsite = true; - ++ return; // DONT check for new versions on Debian + if (! isThreadRunning()) { + showAlertWindows = showAlerts; diff --git a/debian/patches/debian_python3.patch b/debian/patches/debian_python3.patch index 126659c8..3136281d 100644 --- a/debian/patches/debian_python3.patch +++ b/debian/patches/debian_python3.patch @@ -8,14 +8,12 @@ Forwarded: no 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 +--- juce.orig/doxygen/Makefile ++++ juce/doxygen/Makefile +@@ -8,7 +8,7 @@ + doxygen build/juce_modules.dox: process_source_files.py $(SOURCE_FILES) - rm -rf build - python $< ../modules build + python3 $< ../modules build diff --git a/debian/patches/debian_system_modules.patch b/debian/patches/debian_system_modules.patch index fa516758..38bfb382 100644 --- a/debian/patches/debian_system_modules.patch +++ b/debian/patches/debian_system_modules.patch @@ -11,7 +11,7 @@ Forwarded: not-needed --- juce.orig/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp +++ juce/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp -@@ -389,7 +389,7 @@ +@@ -385,7 +385,7 @@ } else if (key == Ids::defaultJuceModulePath) { diff --git a/debian/patches/debian_unittests_globalpaths.patch b/debian/patches/debian_unittests_globalpaths.patch index 73f9cfb1..fb6094d2 100644 --- a/debian/patches/debian_unittests_globalpaths.patch +++ b/debian/patches/debian_unittests_globalpaths.patch @@ -9,8 +9,8 @@ Forwarded: not-needed --- juce.orig/extras/UnitTestRunner/UnitTestRunner.jucer +++ juce/extras/UnitTestRunner/UnitTestRunner.jucer -@@ -96,26 +96,26 @@ - +@@ -123,26 +123,26 @@ + - diff --git a/debian/patches/debian_vst.patch b/debian/patches/debian_vst.patch index 2d451316..2ff02c5e 100644 --- a/debian/patches/debian_vst.patch +++ b/debian/patches/debian_vst.patch @@ -6,7 +6,7 @@ Last-Update: 2019-01-12 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- juce.orig/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp +++ juce/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp -@@ -92,8 +92,7 @@ +@@ -101,8 +101,7 @@ // 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. @@ -16,7 +16,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ } using namespace juce; -@@ -111,7 +110,6 @@ +@@ -124,7 +123,6 @@ #pragma pack (push, 8) #endif @@ -26,7 +26,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ #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 -@@ -37,7 +37,6 @@ +@@ -49,7 +49,6 @@ #endif #define VST_FORCE_DEPRECATED 0 @@ -34,7 +34,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ namespace Vst2 { -@@ -46,8 +45,7 @@ +@@ -58,8 +57,7 @@ // 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. @@ -44,7 +44,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ } #include "juce_VSTCommon.h" -@@ -59,6 +57,9 @@ +@@ -81,6 +79,9 @@ #include "juce_VSTMidiEventList.h" diff --git a/debian/patches/jack-client-name.patch b/debian/patches/jack-client-name.patch index d40af5db..ab7c4164 100644 --- a/debian/patches/jack-client-name.patch +++ b/debian/patches/jack-client-name.patch @@ -11,11 +11,9 @@ Forwarded: https://github.com/WeAreROLI/JUCE/pull/351 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 +--- 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 @@ //============================================================================== #ifndef JUCE_JACK_CLIENT_NAME diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch index 2a5b98a7..ba5f005c 100644 --- a/debian/patches/spelling.patch +++ b/debian/patches/spelling.patch @@ -6,7 +6,7 @@ Last-Update: 2019-01-12 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- juce.orig/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h +++ juce/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h -@@ -323,7 +323,7 @@ +@@ -453,7 +453,7 @@ props.add (new TextPropertyComponent (subprojectsValue, "Xcode Subprojects", 8192, true), "Paths to Xcode projects that should be added to the build (one per line). " -- 2.30.2