Fixed patch-headers in preparation of 'gbp pq'
authorIOhannes m zmölnig <zmoelnig@umlautS.umlaeute.mur.at>
Fri, 26 Oct 2018 19:50:47 +0000 (21:50 +0200)
committerIOhannes m zmölnig <zmoelnig@umlautS.umlaeute.mur.at>
Fri, 26 Oct 2018 20:03:13 +0000 (22:03 +0200)
debian/patches/LV2-audioprocessor.patch
debian/patches/debian_fixed-defines.patch
debian/patches/debian_gpl_variant.patch
debian/patches/debian_no-update-check.patch
debian/patches/debian_no-usagedata.patch
debian/patches/debian_python3.patch
debian/patches/debian_system_modules.patch
debian/patches/debian_unittests_globalpaths.patch
debian/patches/jack-client-name.patch

index 576460475bfaee3f105bb11ba81e9001514de0cc..ce896bd13eb51036aaf35b8e22ee87c8df1f3bd4 100644 (file)
@@ -1,13 +1,21 @@
-Description: LV2 fixes for autiodprocessor
-Author: Filipe Coelho <falkTX>
+From: Filipe Coelho <falkTX>
+Date: Sat, 10 Feb 2018 00:00:00 +0100
+Subject: LV2 fixes for autiodprocessor
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
 Origin: https://github.com/DISTRHO/juce/tree/9f6cdc3659df13169285464ee1d13ef14357f833
 Reviewed-by: IOhannes m zmölnig
-Last-Update: 2018-02-10
 ---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- juce.orig/modules/juce_audio_processors/processors/juce_AudioProcessor.h
-+++ juce/modules/juce_audio_processors/processors/juce_AudioProcessor.h
-@@ -927,6 +927,7 @@
+ .../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:
      */\r
      virtual void setNonRealtime (bool isNonRealtime) noexcept;\r
  \r
@@ -15,7 +23,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
      //==============================================================================\r
      /** Creates the processor's GUI.\r
  \r
-@@ -973,6 +974,7 @@
+@@ -973,6 +974,7 @@ public:
          This may call createEditor() internally to create the component.\r
      */\r
      AudioProcessorEditor* createEditorIfNeeded();\r
@@ -23,19 +31,19 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  \r
      //==============================================================================\r
      /** This must return the correct value immediately after the object has been\r
-@@ -1297,6 +1299,11 @@
+@@ -1296,6 +1298,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
-@@ -1338,9 +1345,11 @@
+@@ -1338,9 +1345,11 @@ public:
                                                    const AudioChannelSet& mainOutputLayout,\r
                                                    bool idForAudioSuite) const;\r
  \r
@@ -47,7 +55,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  \r
      /** Flags to indicate the type of plugin context in which a processor is being used. */\r
      enum WrapperType\r
-@@ -1352,6 +1361,7 @@
+@@ -1352,6 +1361,7 @@ public:
          wrapperType_AudioUnitv3,\r
          wrapperType_RTAS,\r
          wrapperType_AAX,\r
@@ -55,7 +63,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
          wrapperType_Standalone\r
      };\r
  \r
-@@ -1601,7 +1611,9 @@
+@@ -1601,7 +1611,9 @@ private:
  \r
      //==============================================================================\r
      Array<AudioProcessorListener*> listeners;\r
index 9589e35ba73a4b3e65baa75930560c8aab285169..1dc17ab6e9dd440e7e37606784aee17edfcc0f75 100644 (file)
@@ -1,14 +1,63 @@
-Description: clamp a few defines to fixed values
+From: =?utf-8?q?IOhannes_m_zm=C3=B6lnig?= <umlaeute@debian.org>
+Date: Sun, 11 Feb 2018 00:00:00 +0100
+Subject: clamp a few defines to fixed values
+
  on Debian we only ever allow using the system provided libraries
  (zlib, flac, oggvorbis,...)
-Author: IOhannes m zmölnig
 Origin: Debian
 Forwarded: not-needed
-Last-Update: 2018-02-11
 ---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- juce.orig/modules/juce_core/juce_core.h
-+++ juce/modules/juce_core/juce_core.h
+ .../utility/juce_CheckSettingMacros.h              | 25 +++++++++++++++++
+ 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
+@@ -24,6 +24,30 @@
+   ==============================================================================\r
+ */\r
\r
++/* Debian specific overrides */\r
++#if JucePlugin_Build_LV2 && ! defined (JucePlugin_LV2URI)\r
++# warning JUCE/Debian using default LV2URI\r
++# define JucePlugin_LV2URI               JucePlugin_Name\r
++#endif\r
++\r
++#if JucePlugin_Build_AU\r
++# warning JUCE/Debian disabled AU support\r
++# undef JucePlugin_Build_AU\r
++# define JucePlugin_Build_AU 0\r
++#endif\r
++\r
++#if JucePlugin_Build_RTAS\r
++# warning JUCE/Debian disabled RTAS support\r
++# undef JucePlugin_Build_RTAS\r
++# define JucePlugin_Build_RTAS 0\r
++#endif\r
++\r
++#if JucePlugin_Build_AAX\r
++# warning JUCE/Debian disabled AAX support\r
++# undef JucePlugin_Build_AAX\r
++# define JucePlugin_Build_AAX 0\r
++#endif\r
++\r
+ // The following checks should cause a compile error if you've forgotten to\r
+ // define all your plugin settings properly..\r
\r
+@@ -39,6 +63,7 @@
+ #endif\r
+ #define JUCE_CHECKSETTINGMACROS_H\r
\r
++\r
+ #ifndef JucePlugin_IsSynth\r
+  #error "You need to define the JucePlugin_IsSynth value!"\r
+ #endif\r
+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 @@
  \r
  #include "system/juce_TargetPlatform.h"\r
@@ -55,44 +104,3 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  #endif\r
  \r
  #ifndef JUCE_ZLIB_INCLUDE_PATH\r
---- 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 @@
-   ==============================================================================\r
- */\r
\r
-+/* Debian specific overrides */\r
-+#if JucePlugin_Build_LV2 && ! defined (JucePlugin_LV2URI)\r
-+# warning JUCE/Debian using default LV2URI\r
-+# define JucePlugin_LV2URI               JucePlugin_Name\r
-+#endif\r
-+\r
-+#if JucePlugin_Build_AU\r
-+# warning JUCE/Debian disabled AU support\r
-+# undef JucePlugin_Build_AU\r
-+# define JucePlugin_Build_AU 0\r
-+#endif\r
-+\r
-+#if JucePlugin_Build_RTAS\r
-+# warning JUCE/Debian disabled RTAS support\r
-+# undef JucePlugin_Build_RTAS\r
-+# define JucePlugin_Build_RTAS 0\r
-+#endif\r
-+\r
-+#if JucePlugin_Build_AAX\r
-+# warning JUCE/Debian disabled AAX support\r
-+# undef JucePlugin_Build_AAX\r
-+# define JucePlugin_Build_AAX 0\r
-+#endif\r
-+\r
- // The following checks should cause a compile error if you've forgotten to\r
- // define all your plugin settings properly..\r
\r
-@@ -39,6 +63,7 @@
- #endif\r
- #define JUCE_CHECKSETTINGMACROS_H\r
\r
-+\r
- #ifndef JucePlugin_IsSynth\r
-  #error "You need to define the JucePlugin_IsSynth value!"\r
- #endif\r
index e1d876ad58e9103ce004832873bdfbcbc0459bf4..35ec7e772f66455afc5b448091a18a13ece1c920 100644 (file)
@@ -1,11 +1,16 @@
-Description: Build GPL-3 variant of Projucer
-Author: IOhannes m zmölnig
+From: =?utf-8?q?IOhannes_m_zm=C3=B6lnig?= <umlaeute@debian.org>
+Date: Thu, 9 Nov 2017 00:00:00 +0100
+Subject: Build GPL-3 variant of Projucer
+
 Forwarded: not-needed
-Last-Update: 2017-11-09
 ---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- juce.orig/extras/Projucer/JuceLibraryCode/AppConfig.h
-+++ juce/extras/Projucer/JuceLibraryCode/AppConfig.h
+ 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 @@
  \r
  // BEGIN SECTION A\r
index faa9a4ba8881783269b79ed87639e82d378c3e43..5bacdabe61d0e2895dc0b7c805ef765b04736c9d 100644 (file)
@@ -1,14 +1,19 @@
-Description: prevent Projucer from checking for updates
+From: =?utf-8?q?IOhannes_m_zm=C3=B6lnig?= <umlaeute@debian.org>
+Date: Thu, 9 Nov 2017 00:00:00 +0100
+Subject: prevent Projucer from checking for updates
+
  The check-for-updates only makes sense for user-installed Projucer, not for
  the Debian packaged version.
-Author: IOhannes m zmölnig
 Forwarded: not-needed
-Last-Update: 2017-11-09
 ---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- juce.orig/extras/Projucer/Source/Application/jucer_AutoUpdater.cpp
-+++ juce/extras/Projucer/Source/Application/jucer_AutoUpdater.cpp
-@@ -617,6 +617,7 @@
+ 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
  \r
  void LatestVersionChecker::checkForNewVersion()\r
  {\r
index 19be7be0c45f2a1f861701c495b96a78061f252b..ac299ba30caff60083d7beb041496e0116484099 100644 (file)
@@ -1,13 +1,18 @@
-Description: default to not-sending usage-data to ROLI
+From: =?utf-8?q?IOhannes_m_zm=C3=B6lnig?= <umlaeute@debian.org>
+Date: Mon, 26 Mar 2018 00:00:00 +0200
+Subject: default to not-sending usage-data to ROLI
+
  we prefer to have privacy enabled by default...
-Author: IOhannes m zmölnig
 Forwarded: no
-Last-Update: 2018-03-26
 ---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- juce.orig/extras/Projucer/Source/Application/Windows/jucer_ApplicationUsageDataWindowComponent.h
-+++ juce/extras/Projucer/Source/Application/Windows/jucer_ApplicationUsageDataWindowComponent.h
-@@ -69,10 +69,10 @@
+ .../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:
  \r
              auto* controller = ProjucerApplication::getApp().licenseController.get();\r
  \r
index 2b8ed8901df01710f8bc460ed7487471eb78ccd0..126659c8c2034100aee6ced74dd41a8614abc352 100644 (file)
@@ -1,13 +1,18 @@
-Description: use Python3 rather than Python2
+From: =?utf-8?q?IOhannes_m_zm=C3=B6lnig?= <umlaeute@debian.org>
+Date: Sat, 10 Feb 2018 00:00:00 +0100
+Subject: use Python3 rather than Python2
+
  for building the documentation
-Author: IOhannes m zmölnig
 Forwarded: no
-Last-Update: 2018-02-10
 ---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- juce.orig/doxygen/Makefile
-+++ juce/doxygen/Makefile
-@@ -9,7 +9,7 @@
+ 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
  
  build/juce_modules.dox: process_source_files.py $(SOURCE_FILES)
        rm -rf build
index 5dd2b22723327b369a574adfc458acee3d33819f..8e39e28cf3d464a5d28438488ac54ecb4feeb163 100644 (file)
@@ -1,14 +1,19 @@
-Description: default JUCE-module path for Projucer
+From: =?utf-8?q?IOhannes_m_zm=C3=B6lnig?= <umlaeute@debian.org>
+Date: Tue, 19 Dec 2017 00:00:00 +0100
+Subject: default JUCE-module path for Projucer
+
  On Debian we have the module-sources installed in /usr/share/juce/modules
  and should use those if possible.
-Author: IOhannes m zmölnig
 Forwarded: not-needed
-Last-Update: 2017-12-19
 ---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- juce.orig/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp
-+++ juce/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp
-@@ -311,7 +311,7 @@
+ 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)\r
          {\r
              v = (os == TargetOS::windows ? "C:\\JUCE\\modules"\r
index 7732e0075b139a7c6d75aa87b00ded59801f9596..4352b6fb334467379e3c66d64fc8a8d7fb25c810 100644 (file)
@@ -1,11 +1,16 @@
-Description: Use global paths for JUCE modules in UnitTests
-Author: IOhannes m zmölnig
+From: =?utf-8?q?IOhannes_m_zm=C3=B6lnig?= <umlaeute@debian.org>
+Date: Wed, 11 Apr 2018 00:00:00 +0200
+Subject: Use global paths for JUCE modules in UnitTests
+
 Forwarded: not-needed
-Last-Update: 2018-04-11
 ---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- juce.orig/extras/UnitTestRunner/UnitTestRunner.jucer
-+++ juce/extras/UnitTestRunner/UnitTestRunner.jucer
+ 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
 @@ -96,26 +96,26 @@
      </VS2017>\r
    </EXPORTFORMATS>\r
index 63ded1375aa2ac7bbc2e3e56056410ebce084f8c..d40af5db90e92c957ae0727ed7b51944373d94e5 100644 (file)
@@ -1,15 +1,21 @@
-Description: meaningful default JACK client name
+From: =?utf-8?q?IOhannes_m_zm=C3=B6lnig?= <umlaeute@debian.org>
+Date: Thu, 12 Apr 2018 00:00:00 +0200
+Subject: meaningful default JACK client name
+
  rather than "JUCEJack" for all jack standalone apps,
  use the <JucePlugin_Name>.
-Author: IOhannes m zmölnig
+
 Bug: https://github.com/WeAreROLI/JUCE/issues/331
 Forwarded: https://github.com/WeAreROLI/JUCE/pull/351
-Last-Update: 2018-04-12
 ---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- 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 @@
+ 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
  \r
  //==============================================================================\r
  #ifndef JUCE_JACK_CLIENT_NAME\r