Refresh patches with 'gbp pq'
authorIOhannes m zmölnig <zmoelnig@umlautS.umlaeute.mur.at>
Wed, 13 Jan 2021 12:48:22 +0000 (13:48 +0100)
committerIOhannes m zmölnig <zmoelnig@umlautS.umlaeute.mur.at>
Wed, 13 Jan 2021 12:48:22 +0000 (13:48 +0100)
debian/patches/LV2-audioprocessor.patch
debian/patches/cross.patch
debian/patches/debian_buildcmake.patch
debian/patches/debian_fixed-defines.patch
debian/patches/debian_link_systemlibs.patch
debian/patches/debian_no-update-check.patch
debian/patches/debian_python3.patch
debian/patches/debian_system_modules.patch
debian/patches/debian_unittests_globalpaths.patch
debian/patches/debian_vst.patch
debian/patches/overridable_pkg-config.patch

index c7a2f0255b9262933bf0cac25f2347facc2b6e14..59607b853eb44feb300f48d5bf9059db74399eeb 100644 (file)
@@ -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
-@@ -926,6 +926,7 @@
+diff --git a/modules/juce_audio_processors/processors/juce_AudioProcessor.h b/modules/juce_audio_processors/processors/juce_AudioProcessor.h
+index 02c3de1..b202fa0 100644
+--- a/modules/juce_audio_processors/processors/juce_AudioProcessor.h
++++ b/modules/juce_audio_processors/processors/juce_AudioProcessor.h
+@@ -926,6 +926,7 @@ public:
      */\r
      virtual void setNonRealtime (bool isNonRealtime) noexcept;\r
  \r
@@ -21,7 +23,7 @@ Reviewed-by: IOhannes m zmölnig
      //==============================================================================\r
      /** Creates the processor's GUI.\r
  \r
-@@ -975,6 +976,7 @@
+@@ -975,6 +976,7 @@ public:
          This may call createEditor() internally to create the component.\r
      */\r
      AudioProcessorEditor* createEditorIfNeeded();\r
@@ -29,19 +31,19 @@ Reviewed-by: IOhannes m zmölnig
  \r
      //==============================================================================\r
      /** Returns the default number of steps for a parameter.\r
-@@ -1117,6 +1119,11 @@
+@@ -1116,6 +1118,11 @@ public:
+     /** This method is called when the layout of the audio processor changes. */\r
      virtual void processorLayoutsChanged();\r
  \r
-     //==============================================================================\r
++    //==============================================================================\r
 +    /** LV2 specific calls, saving/restore as string. */\r
 +    virtual String getStateInformationString () { return String(); }\r
 +    virtual void setStateInformationString (const String&) {}\r
 +\r
-+    //==============================================================================\r
+     //==============================================================================\r
      /** Adds a listener that will be called when an aspect of this processor changes. */\r
      virtual void addListener (AudioProcessorListener* newListener);\r
\r
-@@ -1186,9 +1193,11 @@
+@@ -1186,9 +1193,11 @@ public:
  \r
      virtual CurveData getResponseCurve (CurveData::Type /*curveType*/) const      { return {}; }\r
  \r
@@ -53,7 +55,7 @@ Reviewed-by: IOhannes m zmölnig
  \r
      /** Flags to indicate the type of plugin context in which a processor is being used. */\r
      enum WrapperType\r
-@@ -1202,6 +1211,7 @@
+@@ -1202,6 +1211,7 @@ public:
          wrapperType_AAX,\r
          wrapperType_Standalone,\r
          wrapperType_Unity\r
@@ -61,7 +63,7 @@ Reviewed-by: IOhannes m zmölnig
      };\r
  \r
      /** When loaded by a plugin wrapper, this flag will be set to indicate the type\r
-@@ -1462,7 +1472,9 @@
+@@ -1462,7 +1472,9 @@ private:
  \r
      //==============================================================================\r
      Array<AudioProcessorListener*> listeners;\r
index 27f7f216eda9df671078681f6615455e5fe9f701..2a05cf53881fa85a075575217461d7664409b7d3 100644 (file)
@@ -6,9 +6,11 @@ Subject: cross
  extras/Projucer/Builds/LinuxMakefile/Makefile | 16 ++++++++++------
  1 file changed, 10 insertions(+), 6 deletions(-)
 
---- juce.orig/extras/Projucer/Builds/LinuxMakefile/Makefile
-+++ juce/extras/Projucer/Builds/LinuxMakefile/Makefile
-@@ -19,6 +19,10 @@
+diff --git a/extras/Projucer/Builds/LinuxMakefile/Makefile b/extras/Projucer/Builds/LinuxMakefile/Makefile
+index 00638ef..e4d8cfe 100644
+--- a/extras/Projucer/Builds/LinuxMakefile/Makefile
++++ b/extras/Projucer/Builds/LinuxMakefile/Makefile
+@@ -19,6 +19,10 @@ ifndef AR
    AR=ar
  endif
  
@@ -19,7 +21,7 @@ Subject: cross
  ifndef CONFIG
    CONFIG=Debug
  endif
-@@ -35,13 +39,13 @@
+@@ -35,13 +39,13 @@ ifeq ($(CONFIG),Debug)
      TARGET_ARCH := 
    endif
  
@@ -35,7 +37,7 @@ Subject: cross
  
    CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR)
  endif
-@@ -56,13 +60,13 @@
+@@ -56,13 +60,13 @@ ifeq ($(CONFIG),Release)
      TARGET_ARCH := 
    endif
  
@@ -51,7 +53,7 @@ Subject: cross
  
    CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR)
  endif
-@@ -135,8 +139,8 @@
+@@ -135,8 +139,8 @@ OBJECTS_APP := \
  all : $(JUCE_OUTDIR)/$(JUCE_TARGET_APP)
  
  $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) : $(OBJECTS_APP) $(RESOURCES)
index 31de9f048b06c993632ef6f59e009b41a0e33fe0..a36fc07409d22daaab6c58087b8e6195698ad64e 100644 (file)
@@ -1,15 +1,23 @@
-Description: link applications against libpng/libjpeg
- since we have stripped libpng & libjpeg, we need to explicitely link against
- the system provided libraries
-Author: IOhannes m zmölnig
+From: Debian Multimedia Maintainers <debian-multimedia@lists.debian.org>
+Date: Wed, 13 Jan 2021 13:47:55 +0100
+Subject: link applications against libpng/libjpeg
+
 Origin: Debian
 Forwarded: not-needed
 Last-Update: 2021-01-13
+
+since we have stripped libpng & libjpeg, we need to explicitely link against
+the system provided libraries
+Last-Update: 2021-01-13
 ---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- juce.orig/extras/Build/CMake/JUCEUtils.cmake
-+++ juce/extras/Build/CMake/JUCEUtils.cmake
-@@ -140,6 +140,7 @@
+ 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 73a450e..d5dbab8 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_create_pkgconfig_target(JUCE_CURL_LINUX_DEPS libcurl)
      _juce_create_pkgconfig_target(JUCE_BROWSER_LINUX_DEPS webkit2gtk-4.0 gtk+-x11-3.0)
@@ -17,7 +25,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
      # If you really need to override the detected arch for some reason,
      # you can configure the build with -DJUCE_LINUX_TARGET_ARCHITECTURE=<custom arch>
-@@ -682,6 +683,8 @@
+@@ -682,6 +683,8 @@ function(_juce_link_optional_libraries target)
          if(needs_browser)
              target_link_libraries(${target} PRIVATE juce::pkgconfig_JUCE_BROWSER_LINUX_DEPS)
          endif()
index 56359b39cbe1ee7c3b9dedb2705313d9c939fe7d..56a4f3475c756a7b3467077469643dc057651f52 100644 (file)
@@ -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 6bea843..f8eef90 100644
+--- a/modules/juce_audio_plugin_client/utility/juce_CheckSettingMacros.h
++++ b/modules/juce_audio_plugin_client/utility/juce_CheckSettingMacros.h
 @@ -23,6 +23,30 @@
    ==============================================================================\r
  */\r
@@ -52,8 +54,10 @@ Forwarded: not-needed
  #ifndef JucePlugin_IsSynth\r
   #error "You need to define the JucePlugin_IsSynth value!"\r
  #endif\r
---- 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 1f6ea80..f0b2ae7 100644
+--- a/modules/juce_core/juce_core.h
++++ b/modules/juce_core/juce_core.h
 @@ -64,6 +64,36 @@
  \r
  #include "system/juce_TargetPlatform.h"\r
index 604acaaabd236b740b4e5e97a8707759ac1ad1ca..25c81fcad04c87818f6927e6eecf2f479bce9a6f 100644 (file)
@@ -10,12 +10,15 @@ since the Debian package has removed 3rd-party libraries (jpeg, png, flag,
 ogg/vorbis), we must use against the system libraries.
 Last-Update: 2019-08-21
 ---
- .../ProjectSaving/jucer_ProjectExport_Make.h       | 36 ++++++++++++++++++++++
- 1 file changed, 36 insertions(+)
+ .../ProjectSaving/jucer_ProjectExport_Make.h       |  3 ++
+ .../Source/ProjectSaving/jucer_ProjectExporter.cpp | 33 ++++++++++++++++++++++
+ 2 files changed, 36 insertions(+)
 
---- juce.orig/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h
-+++ juce/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h
-@@ -647,6 +647,9 @@
+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:
          StringArray result (linuxLibs);\r
  \r
          auto libraries = StringArray::fromTokens (getExternalLibrariesString(), ";", "\"'");\r
@@ -25,9 +28,11 @@ Last-Update: 2019-08-21
          libraries.removeEmptyStrings();\r
  \r
          for (auto& lib : libraries)\r
---- juce.orig/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp
-+++ juce/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp
-@@ -520,6 +520,39 @@
+diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp
+index 544073a..9f23f36 100644
+--- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp
++++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp
+@@ -520,6 +520,39 @@ StringArray ProjectExporter::getLinuxPackages (PackageDependencyType type) const
      if (isCurlEnabled (project) && ! isLoadCurlSymbolsLazilyEnabled (project))\r
          packages.add ("libcurl");\r
  \r
index e790b210be1fa9aa6fe06f0422c369cb7a530d92..30dcc7fde2d42ef73a47aaab8924d1bba5a1b1dd 100644 (file)
@@ -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
-@@ -41,6 +41,7 @@
+diff --git a/extras/Projucer/Source/Application/jucer_AutoUpdater.cpp b/extras/Projucer/Source/Application/jucer_AutoUpdater.cpp
+index d172010..10439f1 100644
+--- a/extras/Projucer/Source/Application/jucer_AutoUpdater.cpp
++++ b/extras/Projucer/Source/Application/jucer_AutoUpdater.cpp
+@@ -41,6 +41,7 @@ LatestVersionCheckerAndUpdater::~LatestVersionCheckerAndUpdater()
  \r
  void LatestVersionCheckerAndUpdater::checkForNewVersion (bool background)\r
  {\r
index 5d47356a0db317f7578e316fdaac23c59f2e7eba..986d3caf50fc83cc5b538f2fd6779cf2b53875b0 100644 (file)
@@ -8,9 +8,11 @@ Forwarded: no
  docs/doxygen/Makefile | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
---- juce.orig/docs/doxygen/Makefile
-+++ juce/docs/doxygen/Makefile
-@@ -8,7 +8,7 @@
+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
        doxygen
  
  build/juce_modules.dox: process_source_files.py $(SOURCE_FILES)
index a54815bc54877241b5bb37fc10015e5ebe812f67..79c5bbe48b03e55614985e35d42ca2c635387cf1 100644 (file)
@@ -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
-@@ -362,7 +362,7 @@
+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)
      }\r
      else if (key == Ids::defaultJuceModulePath)\r
      {\r
index 614809cb7c64c93da83a3b7eef269939719b9316..bf1caf63b59171f078d754f3acfb27d94a9975e4 100644 (file)
@@ -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 973f741..6f7f70b 100644
+--- a/extras/UnitTestRunner/UnitTestRunner.jucer
++++ b/extras/UnitTestRunner/UnitTestRunner.jucer
 @@ -124,26 +124,26 @@
      </VS2019>\r
    </EXPORTFORMATS>\r
index 843dcec6e89420c42a78e9c16fc2d3bd79906d2e..61ca17fc065e60584c5bb9505fa17c6edb4f47f5 100644 (file)
@@ -7,13 +7,15 @@ Last-Update: 2019-01-12
 backprted from the original JUCE-5.3.1 header
 Last-Update: 2019-01-12
 ---
- modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp          | 4 +---
- .../juce_audio_processors/format_types/juce_VSTPluginFormat.cpp    | 7 ++++---
- 2 files changed, 5 insertions(+), 6 deletions(-)
+ modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp         | 3 +--
+ .../juce_audio_processors/format_types/juce_VSTPluginFormat.cpp   | 8 +++++---
+ 2 files changed, 6 insertions(+), 5 deletions(-)
 
---- 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 @@
+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
  // field in the Projucer. The VST2 SDK can be obtained from the\r
  // vstsdk3610_11_06_2018_build_37 (or older) VST3 SDK or JUCE version 5.3.2. You\r
  // also need a VST2 license from Steinberg to distribute VST2 plug-ins.\r
@@ -23,9 +25,11 @@ Last-Update: 2019-01-12
  }\r
  \r
  JUCE_END_IGNORE_WARNINGS_MSVC\r
---- 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 @@
+diff --git a/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp b/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp
+index 23d7ae1..ede5539 100644
+--- a/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp
++++ b/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp
+@@ -37,7 +37,6 @@ JUCE_BEGIN_IGNORE_WARNINGS_GCC_LIKE ("-Wzero-as-null-pointer-constant")
  JUCE_BEGIN_IGNORE_WARNINGS_MSVC (4996)\r
  \r
  #define VST_FORCE_DEPRECATED 0\r
@@ -33,7 +37,7 @@ Last-Update: 2019-01-12
  \r
  namespace Vst2\r
  {\r
-@@ -46,8 +45,8 @@
+@@ -46,8 +45,8 @@ namespace Vst2
  // paths or use the "VST (Legacy) SDK Folder" field in the Projucer. The VST2\r
  // SDK can be obtained from the vstsdk3610_11_06_2018_build_37 (or older) VST3\r
  // SDK or JUCE version 5.3.2.\r
@@ -44,7 +48,7 @@ Last-Update: 2019-01-12
  }\r
  \r
  #include "juce_VSTCommon.h"\r
-@@ -59,6 +58,9 @@
+@@ -59,6 +58,9 @@ JUCE_BEGIN_IGNORE_WARNINGS_MSVC (4355)
  \r
  #include "juce_VSTMidiEventList.h"\r
  \r
index 3815a2bdb8d620e9bcca0074d6ff07c38dedcbcc..22b446ea5e62a3631c53f2f55d6d6fb31df2e684 100644 (file)
@@ -13,9 +13,11 @@ Last-Update: 2020-03-16
  .../Source/ProjectSaving/jucer_ProjectExport_Make.h         | 13 +++++++++----
  1 file changed, 9 insertions(+), 4 deletions(-)
 
---- juce.orig/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h
-+++ juce/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h
-@@ -304,8 +304,8 @@
+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:
  \r
              if (! packages.isEmpty())\r
              {\r
@@ -26,7 +28,7 @@ Last-Update: 2020-03-16
  \r
                  for (auto& pkg : packages)\r
                      out << " " << pkg;\r
-@@ -558,7 +558,7 @@
+@@ -558,7 +558,7 @@ private:
          auto compilePackages = getCompilePackages();\r
  \r
          if (compilePackages.size() > 0)\r
@@ -35,7 +37,7 @@ Last-Update: 2020-03-16
  \r
          return {};\r
      }\r
-@@ -568,7 +568,7 @@
+@@ -568,7 +568,7 @@ private:
          auto linkPackages = getLinkPackages();\r
  \r
          if (linkPackages.size() > 0)\r
@@ -44,7 +46,7 @@ Last-Update: 2020-03-16
  \r
          return {};\r
      }\r
-@@ -938,6 +938,11 @@
+@@ -938,6 +938,11 @@ private:
              << "endif"         << newLine\r
              << newLine;\r
  \r