From d7b61a623ccd069a4a48c1db94954883b6ec85e6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?IOhannes=20m=20zm=C3=B6lnig=20=28Debian/GNU=29?= Date: Mon, 30 Aug 2021 11:30:19 +0200 Subject: [PATCH] Refresh patches --- debian/patches/LV2-audioprocessor.patch | 24 ++++++++--------- debian/patches/cross.patch | 26 +++++++++---------- debian/patches/debian_buildcmake.patch | 16 +++++------- debian/patches/debian_fixed-defines.patch | 16 +++++------- debian/patches/debian_link_systemlibs.patch | 16 +++++------- debian/patches/debian_no-update-check.patch | 8 +++--- debian/patches/debian_python3.patch | 8 +++--- debian/patches/debian_system_modules.patch | 8 +++--- .../debian_unittests_globalpaths.patch | 18 +++++-------- debian/patches/debian_vst.patch | 16 +++++------- debian/patches/overridable_pkg-config.patch | 14 +++++----- 11 files changed, 70 insertions(+), 100 deletions(-) diff --git a/debian/patches/LV2-audioprocessor.patch b/debian/patches/LV2-audioprocessor.patch index 5dff9d02..eb8f2b43 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 27e4338..6b794fe 100644 ---- a/modules/juce_audio_processors/processors/juce_AudioProcessor.h -+++ b/modules/juce_audio_processors/processors/juce_AudioProcessor.h -@@ -926,6 +926,7 @@ public: +--- juce.orig/modules/juce_audio_processors/processors/juce_AudioProcessor.h ++++ juce/modules/juce_audio_processors/processors/juce_AudioProcessor.h +@@ -928,6 +928,7 @@ */ virtual void setNonRealtime (bool isNonRealtime) noexcept; @@ -23,7 +21,7 @@ index 27e4338..6b794fe 100644 //============================================================================== /** Creates the processor's GUI. -@@ -975,6 +976,7 @@ public: +@@ -977,6 +978,7 @@ This may call createEditor() internally to create the component. */ AudioProcessorEditor* createEditorIfNeeded(); @@ -31,19 +29,19 @@ index 27e4338..6b794fe 100644 //============================================================================== /** Returns the default number of steps for a parameter. -@@ -1116,6 +1118,11 @@ public: - /** This method is called when the layout of the audio processor changes. */ +@@ -1119,6 +1121,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); -@@ -1186,9 +1193,11 @@ public: + +@@ -1188,9 +1195,11 @@ virtual CurveData getResponseCurve (CurveData::Type /*curveType*/) const { return {}; } @@ -55,7 +53,7 @@ index 27e4338..6b794fe 100644 /** Flags to indicate the type of plugin context in which a processor is being used. */ enum WrapperType -@@ -1202,6 +1211,7 @@ public: +@@ -1204,6 +1213,7 @@ wrapperType_AAX, wrapperType_Standalone, wrapperType_Unity @@ -63,7 +61,7 @@ index 27e4338..6b794fe 100644 }; /** When loaded by a plugin wrapper, this flag will be set to indicate the type -@@ -1462,7 +1472,9 @@ private: +@@ -1464,7 +1474,9 @@ //============================================================================== Array listeners; diff --git a/debian/patches/cross.patch b/debian/patches/cross.patch index 8b1a5d71..3772fa7f 100644 --- a/debian/patches/cross.patch +++ b/debian/patches/cross.patch @@ -6,11 +6,9 @@ Subject: cross extras/Projucer/Builds/LinuxMakefile/Makefile | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) -diff --git a/extras/Projucer/Builds/LinuxMakefile/Makefile b/extras/Projucer/Builds/LinuxMakefile/Makefile -index 5bfbf1a..f43bc25 100644 ---- a/extras/Projucer/Builds/LinuxMakefile/Makefile -+++ b/extras/Projucer/Builds/LinuxMakefile/Makefile -@@ -19,6 +19,10 @@ ifndef AR +--- juce.orig/extras/Projucer/Builds/LinuxMakefile/Makefile ++++ juce/extras/Projucer/Builds/LinuxMakefile/Makefile +@@ -19,6 +19,10 @@ AR=ar endif @@ -21,39 +19,39 @@ index 5bfbf1a..f43bc25 100644 ifndef CONFIG CONFIG=Debug endif -@@ -35,13 +39,13 @@ ifeq ($(CONFIG),Debug) +@@ -35,13 +39,13 @@ TARGET_ARCH := endif -- JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DDEBUG=1" "-D_DEBUG=1" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x60007" "-DJUCE_MODULE_AVAILABLE_juce_build_tools=1" "-DJUCE_MODULE_AVAILABLE_juce_core=1" "-DJUCE_MODULE_AVAILABLE_juce_cryptography=1" "-DJUCE_MODULE_AVAILABLE_juce_data_structures=1" "-DJUCE_MODULE_AVAILABLE_juce_events=1" "-DJUCE_MODULE_AVAILABLE_juce_graphics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_extra=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_LOG_ASSERTIONS=1" "-DJUCE_USE_CURL=1" "-DJUCE_LOAD_CURL_SYMBOLS_LAZILY=1" "-DJUCE_ALLOW_STATIC_NULL_VARIABLES=0" "-DJUCE_STRICT_REFCOUNTEDPOINTER=1" "-DJUCE_WEB_BROWSER=0" "-DJUCE_STANDALONE_APPLICATION=1" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=6.0.7" "-DJUCE_APP_VERSION_HEX=0x60007" $(shell pkg-config --cflags freetype2) -pthread -I../../JuceLibraryCode -I../../../Build -I../../../../modules $(CPPFLAGS) -+ JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DDEBUG=1" "-D_DEBUG=1" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x60007" "-DJUCE_MODULE_AVAILABLE_juce_build_tools=1" "-DJUCE_MODULE_AVAILABLE_juce_core=1" "-DJUCE_MODULE_AVAILABLE_juce_cryptography=1" "-DJUCE_MODULE_AVAILABLE_juce_data_structures=1" "-DJUCE_MODULE_AVAILABLE_juce_events=1" "-DJUCE_MODULE_AVAILABLE_juce_graphics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_extra=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_LOG_ASSERTIONS=1" "-DJUCE_USE_CURL=1" "-DJUCE_LOAD_CURL_SYMBOLS_LAZILY=1" "-DJUCE_ALLOW_STATIC_NULL_VARIABLES=0" "-DJUCE_STRICT_REFCOUNTEDPOINTER=1" "-DJUCE_WEB_BROWSER=0" "-DJUCE_STANDALONE_APPLICATION=1" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=6.0.7" "-DJUCE_APP_VERSION_HEX=0x60007" $(shell $(PKG_CONFIG) --cflags freetype2) -pthread -I../../JuceLibraryCode -I../../../Build -I../../../../modules $(CPPFLAGS) +- JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DDEBUG=1" "-D_DEBUG=1" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x60100" "-DJUCE_MODULE_AVAILABLE_juce_build_tools=1" "-DJUCE_MODULE_AVAILABLE_juce_core=1" "-DJUCE_MODULE_AVAILABLE_juce_cryptography=1" "-DJUCE_MODULE_AVAILABLE_juce_data_structures=1" "-DJUCE_MODULE_AVAILABLE_juce_events=1" "-DJUCE_MODULE_AVAILABLE_juce_graphics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_extra=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_LOG_ASSERTIONS=1" "-DJUCE_USE_CURL=1" "-DJUCE_LOAD_CURL_SYMBOLS_LAZILY=1" "-DJUCE_ALLOW_STATIC_NULL_VARIABLES=0" "-DJUCE_STRICT_REFCOUNTEDPOINTER=1" "-DJUCE_WEB_BROWSER=0" "-DJUCE_STANDALONE_APPLICATION=1" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=6.1.0" "-DJUCE_APP_VERSION_HEX=0x60100" $(shell pkg-config --cflags freetype2) -pthread -I../../JuceLibraryCode -I../../../Build -I../../../../modules $(CPPFLAGS) ++ JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DDEBUG=1" "-D_DEBUG=1" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x60100" "-DJUCE_MODULE_AVAILABLE_juce_build_tools=1" "-DJUCE_MODULE_AVAILABLE_juce_core=1" "-DJUCE_MODULE_AVAILABLE_juce_cryptography=1" "-DJUCE_MODULE_AVAILABLE_juce_data_structures=1" "-DJUCE_MODULE_AVAILABLE_juce_events=1" "-DJUCE_MODULE_AVAILABLE_juce_graphics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_extra=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_LOG_ASSERTIONS=1" "-DJUCE_USE_CURL=1" "-DJUCE_LOAD_CURL_SYMBOLS_LAZILY=1" "-DJUCE_ALLOW_STATIC_NULL_VARIABLES=0" "-DJUCE_STRICT_REFCOUNTEDPOINTER=1" "-DJUCE_WEB_BROWSER=0" "-DJUCE_STANDALONE_APPLICATION=1" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=6.1.0" "-DJUCE_APP_VERSION_HEX=0x60100" $(shell $(PKG_CONFIG) --cflags freetype2) -pthread -I../../JuceLibraryCode -I../../../Build -I../../../../modules $(CPPFLAGS) JUCE_CPPFLAGS_APP := "-DJucePlugin_Build_VST=0" "-DJucePlugin_Build_VST3=0" "-DJucePlugin_Build_AU=0" "-DJucePlugin_Build_AUv3=0" "-DJucePlugin_Build_RTAS=0" "-DJucePlugin_Build_AAX=0" "-DJucePlugin_Build_Standalone=0" "-DJucePlugin_Build_Unity=0" JUCE_TARGET_APP := Projucer JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 $(CFLAGS) - JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++11 $(CXXFLAGS) + JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++14 $(CXXFLAGS) - JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) $(shell pkg-config --libs freetype2) -fvisibility=hidden -lrt -ldl -lpthread $(LDFLAGS) + JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) $(shell $(PKG_CONFIG) --libs freetype2) -fvisibility=hidden -lrt -ldl -lpthread $(LDFLAGS) CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR) endif -@@ -56,13 +60,13 @@ ifeq ($(CONFIG),Release) +@@ -56,13 +60,13 @@ TARGET_ARCH := endif -- JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x60007" "-DJUCE_MODULE_AVAILABLE_juce_build_tools=1" "-DJUCE_MODULE_AVAILABLE_juce_core=1" "-DJUCE_MODULE_AVAILABLE_juce_cryptography=1" "-DJUCE_MODULE_AVAILABLE_juce_data_structures=1" "-DJUCE_MODULE_AVAILABLE_juce_events=1" "-DJUCE_MODULE_AVAILABLE_juce_graphics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_extra=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_LOG_ASSERTIONS=1" "-DJUCE_USE_CURL=1" "-DJUCE_LOAD_CURL_SYMBOLS_LAZILY=1" "-DJUCE_ALLOW_STATIC_NULL_VARIABLES=0" "-DJUCE_STRICT_REFCOUNTEDPOINTER=1" "-DJUCE_WEB_BROWSER=0" "-DJUCE_STANDALONE_APPLICATION=1" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=6.0.7" "-DJUCE_APP_VERSION_HEX=0x60007" $(shell pkg-config --cflags freetype2) -pthread -I../../JuceLibraryCode -I../../../Build -I../../../../modules $(CPPFLAGS) -+ JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x60007" "-DJUCE_MODULE_AVAILABLE_juce_build_tools=1" "-DJUCE_MODULE_AVAILABLE_juce_core=1" "-DJUCE_MODULE_AVAILABLE_juce_cryptography=1" "-DJUCE_MODULE_AVAILABLE_juce_data_structures=1" "-DJUCE_MODULE_AVAILABLE_juce_events=1" "-DJUCE_MODULE_AVAILABLE_juce_graphics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_extra=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_LOG_ASSERTIONS=1" "-DJUCE_USE_CURL=1" "-DJUCE_LOAD_CURL_SYMBOLS_LAZILY=1" "-DJUCE_ALLOW_STATIC_NULL_VARIABLES=0" "-DJUCE_STRICT_REFCOUNTEDPOINTER=1" "-DJUCE_WEB_BROWSER=0" "-DJUCE_STANDALONE_APPLICATION=1" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=6.0.7" "-DJUCE_APP_VERSION_HEX=0x60007" $(shell $(PKG_CONFIG) --cflags freetype2) -pthread -I../../JuceLibraryCode -I../../../Build -I../../../../modules $(CPPFLAGS) +- JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x60100" "-DJUCE_MODULE_AVAILABLE_juce_build_tools=1" "-DJUCE_MODULE_AVAILABLE_juce_core=1" "-DJUCE_MODULE_AVAILABLE_juce_cryptography=1" "-DJUCE_MODULE_AVAILABLE_juce_data_structures=1" "-DJUCE_MODULE_AVAILABLE_juce_events=1" "-DJUCE_MODULE_AVAILABLE_juce_graphics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_extra=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_LOG_ASSERTIONS=1" "-DJUCE_USE_CURL=1" "-DJUCE_LOAD_CURL_SYMBOLS_LAZILY=1" "-DJUCE_ALLOW_STATIC_NULL_VARIABLES=0" "-DJUCE_STRICT_REFCOUNTEDPOINTER=1" "-DJUCE_WEB_BROWSER=0" "-DJUCE_STANDALONE_APPLICATION=1" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=6.1.0" "-DJUCE_APP_VERSION_HEX=0x60100" $(shell pkg-config --cflags freetype2) -pthread -I../../JuceLibraryCode -I../../../Build -I../../../../modules $(CPPFLAGS) ++ JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x60100" "-DJUCE_MODULE_AVAILABLE_juce_build_tools=1" "-DJUCE_MODULE_AVAILABLE_juce_core=1" "-DJUCE_MODULE_AVAILABLE_juce_cryptography=1" "-DJUCE_MODULE_AVAILABLE_juce_data_structures=1" "-DJUCE_MODULE_AVAILABLE_juce_events=1" "-DJUCE_MODULE_AVAILABLE_juce_graphics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_extra=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_LOG_ASSERTIONS=1" "-DJUCE_USE_CURL=1" "-DJUCE_LOAD_CURL_SYMBOLS_LAZILY=1" "-DJUCE_ALLOW_STATIC_NULL_VARIABLES=0" "-DJUCE_STRICT_REFCOUNTEDPOINTER=1" "-DJUCE_WEB_BROWSER=0" "-DJUCE_STANDALONE_APPLICATION=1" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=6.1.0" "-DJUCE_APP_VERSION_HEX=0x60100" $(shell $(PKG_CONFIG) --cflags freetype2) -pthread -I../../JuceLibraryCode -I../../../Build -I../../../../modules $(CPPFLAGS) JUCE_CPPFLAGS_APP := "-DJucePlugin_Build_VST=0" "-DJucePlugin_Build_VST3=0" "-DJucePlugin_Build_AU=0" "-DJucePlugin_Build_AUv3=0" "-DJucePlugin_Build_RTAS=0" "-DJucePlugin_Build_AAX=0" "-DJucePlugin_Build_Standalone=0" "-DJucePlugin_Build_Unity=0" JUCE_TARGET_APP := Projucer JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 $(CFLAGS) - JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++11 $(CXXFLAGS) + JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++14 $(CXXFLAGS) - JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) $(shell pkg-config --libs freetype2) -fvisibility=hidden -lrt -ldl -lpthread $(LDFLAGS) + JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) $(shell $(PKG_CONFIG) --libs freetype2) -fvisibility=hidden -lrt -ldl -lpthread $(LDFLAGS) CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR) endif -@@ -135,8 +139,8 @@ OBJECTS_APP := \ +@@ -132,8 +136,8 @@ all : $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) : $(OBJECTS_APP) $(RESOURCES) diff --git a/debian/patches/debian_buildcmake.patch b/debian/patches/debian_buildcmake.patch index a3810023..f6e33ab5 100644 --- a/debian/patches/debian_buildcmake.patch +++ b/debian/patches/debian_buildcmake.patch @@ -13,19 +13,17 @@ Last-Update: 2021-01-13 extras/Build/CMake/JUCEUtils.cmake | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/extras/Build/CMake/JUCEUtils.cmake b/extras/Build/CMake/JUCEUtils.cmake -index 4bf7206..ad7b7bb 100644 ---- a/extras/Build/CMake/JUCEUtils.cmake -+++ b/extras/Build/CMake/JUCEUtils.cmake -@@ -140,6 +140,7 @@ endfunction() - if(CMAKE_SYSTEM_NAME STREQUAL "Linux") +--- juce.orig/extras/Build/CMake/JUCEUtils.cmake ++++ juce/extras/Build/CMake/JUCEUtils.cmake +@@ -83,6 +83,7 @@ + if((CMAKE_SYSTEM_NAME STREQUAL "Linux") OR (CMAKE_SYSTEM_NAME MATCHES ".*BSD")) _juce_create_pkgconfig_target(JUCE_CURL_LINUX_DEPS libcurl) _juce_create_pkgconfig_target(JUCE_BROWSER_LINUX_DEPS webkit2gtk-4.0 gtk+-x11-3.0) + _juce_create_pkgconfig_target(JUCE_IMG_LINUX_DEPS libpng libjpeg) + elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + find_program(JUCE_XCRUN xcrun) - # If you really need to override the detected arch for some reason, - # you can configure the build with -DJUCE_LINUX_TARGET_ARCHITECTURE= -@@ -682,6 +683,8 @@ function(_juce_link_optional_libraries target) +@@ -225,6 +226,8 @@ if(needs_browser) target_link_libraries(${target} PRIVATE juce::pkgconfig_JUCE_BROWSER_LINUX_DEPS) endif() diff --git a/debian/patches/debian_fixed-defines.patch b/debian/patches/debian_fixed-defines.patch index de697363..d719ab77 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 6bea843..f8eef90 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 @@ -23,6 +23,30 @@ ============================================================================== */ @@ -54,11 +52,9 @@ index 6bea843..f8eef90 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 3612d62..df746d5 100644 ---- a/modules/juce_core/juce_core.h -+++ b/modules/juce_core/juce_core.h -@@ -64,6 +64,36 @@ +--- juce.orig/modules/juce_core/juce_core.h ++++ juce/modules/juce_core/juce_core.h +@@ -65,6 +65,36 @@ #include "system/juce_TargetPlatform.h" @@ -95,7 +91,7 @@ index 3612d62..df746d5 100644 //============================================================================== /** Config: JUCE_FORCE_DEBUG -@@ -123,7 +153,7 @@ +@@ -124,7 +154,7 @@ specify the path where your zlib headers live. */ #ifndef JUCE_INCLUDE_ZLIB_CODE diff --git a/debian/patches/debian_link_systemlibs.patch b/debian/patches/debian_link_systemlibs.patch index 0f4c5628..5cd2c135 100644 --- a/debian/patches/debian_link_systemlibs.patch +++ b/debian/patches/debian_link_systemlibs.patch @@ -14,11 +14,9 @@ Last-Update: 2019-08-21 .../Source/ProjectSaving/jucer_ProjectExporter.cpp | 33 ++++++++++++++++++++++ 2 files changed, 36 insertions(+) -diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h -index 86c33e7..dbbc959 100644 ---- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h -+++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h -@@ -647,6 +647,9 @@ private: +--- juce.orig/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h ++++ juce/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h +@@ -650,6 +650,9 @@ StringArray result (linuxLibs); auto libraries = StringArray::fromTokens (getExternalLibrariesString(), ";", "\"'"); @@ -28,11 +26,9 @@ index 86c33e7..dbbc959 100644 libraries.removeEmptyStrings(); for (auto& lib : libraries) -diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp -index 887ffe9..4c23af9 100644 ---- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp -+++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp -@@ -521,6 +521,39 @@ StringArray ProjectExporter::getLinuxPackages (PackageDependencyType type) const +--- juce.orig/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp ++++ juce/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp +@@ -522,6 +522,39 @@ if (isCurlEnabled (project) && ! isLoadCurlSymbolsLazilyEnabled (project)) packages.add ("libcurl"); diff --git a/debian/patches/debian_no-update-check.patch b/debian/patches/debian_no-update-check.patch index ddfc0ee4..e790b210 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 c63c28c..cd2c1cc 100644 ---- a/extras/Projucer/Source/Application/jucer_AutoUpdater.cpp -+++ b/extras/Projucer/Source/Application/jucer_AutoUpdater.cpp -@@ -41,6 +41,7 @@ LatestVersionCheckerAndUpdater::~LatestVersionCheckerAndUpdater() +--- juce.orig/extras/Projucer/Source/Application/jucer_AutoUpdater.cpp ++++ juce/extras/Projucer/Source/Application/jucer_AutoUpdater.cpp +@@ -41,6 +41,7 @@ void LatestVersionCheckerAndUpdater::checkForNewVersion (bool background) { diff --git a/debian/patches/debian_python3.patch b/debian/patches/debian_python3.patch index 986d3caf..5d47356a 100644 --- a/debian/patches/debian_python3.patch +++ b/debian/patches/debian_python3.patch @@ -8,11 +8,9 @@ Forwarded: no docs/doxygen/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/docs/doxygen/Makefile b/docs/doxygen/Makefile -index 82604fa..cb9df92 100644 ---- a/docs/doxygen/Makefile -+++ b/docs/doxygen/Makefile -@@ -8,7 +8,7 @@ doc/index.html: build/juce_modules.dox Doxyfile +--- juce.orig/docs/doxygen/Makefile ++++ juce/docs/doxygen/Makefile +@@ -8,7 +8,7 @@ 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 79c5bbe4..a54815bc 100644 --- a/debian/patches/debian_system_modules.patch +++ b/debian/patches/debian_system_modules.patch @@ -9,11 +9,9 @@ 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 9727c77..5c8e312 100644 ---- a/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp -+++ b/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp -@@ -362,7 +362,7 @@ static String getFallbackPathForOS (const Identifier& key, DependencyPathOS os) +--- juce.orig/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp ++++ juce/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp +@@ -362,7 +362,7 @@ } else if (key == Ids::defaultJuceModulePath) { diff --git a/debian/patches/debian_unittests_globalpaths.patch b/debian/patches/debian_unittests_globalpaths.patch index bf1caf63..75eeeeda 100644 --- a/debian/patches/debian_unittests_globalpaths.patch +++ b/debian/patches/debian_unittests_globalpaths.patch @@ -7,11 +7,9 @@ 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 973f741..6f7f70b 100644 ---- a/extras/UnitTestRunner/UnitTestRunner.jucer -+++ b/extras/UnitTestRunner/UnitTestRunner.jucer -@@ -124,26 +124,26 @@ +--- juce.orig/extras/UnitTestRunner/UnitTestRunner.jucer ++++ juce/extras/UnitTestRunner/UnitTestRunner.jucer +@@ -120,25 +120,24 @@ @@ -21,7 +19,6 @@ index 973f741..6f7f70b 100644 - - - -- - - - @@ -32,13 +29,15 @@ index 973f741..6f7f70b 100644 - - - +- +- + + + + + + -+ + + + @@ -49,10 +48,7 @@ index 973f741..6f7f70b 100644 + + + - -- -+ useGlobalPath="1"/> ++ + diff --git a/debian/patches/debian_vst.patch b/debian/patches/debian_vst.patch index 2b8c287a..2ad216e2 100644 --- a/debian/patches/debian_vst.patch +++ b/debian/patches/debian_vst.patch @@ -11,11 +11,9 @@ Last-Update: 2019-01-12 modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) -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 6c97aa2..1a26c77 100644 ---- a/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp -+++ b/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp -@@ -84,8 +84,7 @@ namespace Vst2 +--- juce.orig/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp ++++ juce/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp +@@ -84,8 +84,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. @@ -25,11 +23,9 @@ index 6c97aa2..1a26c77 100644 } JUCE_END_IGNORE_WARNINGS_MSVC -diff --git a/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp b/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp -index d3b19a2..3859bbb 100644 ---- a/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp -+++ b/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp -@@ -46,8 +46,8 @@ namespace Vst2 +--- juce.orig/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp ++++ juce/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp +@@ -46,8 +46,8 @@ // 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. diff --git a/debian/patches/overridable_pkg-config.patch b/debian/patches/overridable_pkg-config.patch index 22b446ea..cf61f588 100644 --- a/debian/patches/overridable_pkg-config.patch +++ b/debian/patches/overridable_pkg-config.patch @@ -13,11 +13,9 @@ Last-Update: 2020-03-16 .../Source/ProjectSaving/jucer_ProjectExport_Make.h | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) -diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h -index dbbc959..c1faa11 100644 ---- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h -+++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h -@@ -304,8 +304,8 @@ public: +--- juce.orig/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h ++++ juce/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h +@@ -305,8 +305,8 @@ if (! packages.isEmpty()) { @@ -28,7 +26,7 @@ index dbbc959..c1faa11 100644 for (auto& pkg : packages) out << " " << pkg; -@@ -558,7 +558,7 @@ private: +@@ -561,7 +561,7 @@ auto compilePackages = getCompilePackages(); if (compilePackages.size() > 0) @@ -37,7 +35,7 @@ index dbbc959..c1faa11 100644 return {}; } -@@ -568,7 +568,7 @@ private: +@@ -571,7 +571,7 @@ auto linkPackages = getLinkPackages(); if (linkPackages.size() > 0) @@ -46,7 +44,7 @@ index dbbc959..c1faa11 100644 return {}; } -@@ -938,6 +938,11 @@ private: +@@ -941,6 +941,11 @@ << "endif" << newLine << newLine; -- 2.30.2