Refreshed patches (and removed those applied upstream)

diff --git a/debian/patches/debian_gpl_variant.patch b/debian/patches/debian_gpl_variant.patch
index 0d64e182d98bebe88118c1bb9b9348388926fe00..e1d876ad58e9103ce004832873bdfbcbc0459bf4 100644 (file)
--- a/debian/patches/debian_gpl_variant.patch
+++ b/debian/patches/debian_gpl_variant.patch
@@ -6,7 +6,7 @@ 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
-@@ -32,7 +32,7 @@
+@@ -31,7 +31,7 @@
  \r
  // BEGIN SECTION A\r
  \r

diff --git a/debian/patches/debian_no-update-check.patch b/debian/patches/debian_no-update-check.patch
index 14064af979a3c881ad82b6f4dc5df29f9b879b93..f974714d4366e989fc43ec231bcdf03cf7e45c32 100644 (file)
--- a/debian/patches/debian_no-update-check.patch
+++ b/debian/patches/debian_no-update-check.patch
@@ -8,7 +8,7 @@ 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
-@@ -611,6 +611,7 @@
+@@ -608,6 +608,7 @@
  \r
  void LatestVersionChecker::checkForNewVersion()\r
  {\r

diff --git a/debian/patches/debian_system_modules.patch b/debian/patches/debian_system_modules.patch
index f8e6e4ee641daac13d0974925fada40b5dacffb4..ced444a780ee4668f55d40ffebcd77c1256c704f 100644 (file)
--- a/debian/patches/debian_system_modules.patch
+++ b/debian/patches/debian_system_modules.patch
@@ -8,7 +8,7 @@ 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
-@@ -271,7 +271,7 @@
+@@ -274,7 +274,7 @@
          if (key == Ids::defaultJuceModulePath)\r
          {\r
              v = (os == TargetOS::windows ? "C:\\JUCE\\modules"\r

diff --git a/debian/patches/fix-spelling.patch b/debian/patches/fix-spelling.patch
deleted file mode 100644 (file)
index 54e7215..0000000
--- a/debian/patches/fix-spelling.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Description: fixed spelling mistakes
-Author: IOhannes m zmölnig
-Forwarded: https://github.com/WeAreROLI/JUCE/issues/302
-Last-Update: 2017-11-09
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- juce.orig/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h
-+++ juce/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h
-@@ -858,7 +858,7 @@
-                    "The number of the minimum version of the Android SDK that the app requires");\r
- \r
-         props.add (new TextPropertyComponent (androidExtraAssetsFolder.getPropertyAsValue(), "Extra Android Assets", 256, false),\r
--                   "A path to a folder (relative to the project folder) which conatins extra android assets.");\r
-+                   "A path to a folder (relative to the project folder) which contains extra android assets.");\r
-     }\r
- \r
-     //==============================================================================\r
---- juce.orig/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_CLion.h
-+++ juce/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_CLion.h
-@@ -129,7 +129,7 @@
-         String description;\r
- \r
-         description << "The " << getName() << " exporter produces a single CMakeLists.txt file with "\r
--                    << "multiple platform dependant sections, where the configuration for each section "\r
-+                    << "multiple platform dependent sections, where the configuration for each section "\r
-                     << "is inherited from other exporters added to this project." << newLine\r
-                     << newLine\r
-                     << "The exporters which provide the CLion configuration for the corresponding platform are:" << newLine\r
---- juce.orig/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h
-+++ juce/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h
-@@ -285,7 +285,7 @@
-         if (iOS)\r
-             props.add (new TextPropertyComponentWithEnablement (getAppGroupIdValue(), getAppGroupsEnabledValue(), "App Group ID", 256, false),\r
-                        "The App Group ID to be used for allowing multiple apps to access a shared resource folder. Multiple IDs can be "\r
--                       "added seperated by a semicolon.");\r
-+                       "added separated by a semicolon.");\r
- \r
-         props.add (new BooleanPropertyComponent (getSetting ("keepCustomXcodeSchemes"), "Keep custom Xcode schemes", "Enabled"),\r
-                    "Enable this to keep any Xcode schemes you have created for debugging or running, e.g. to launch a plug-in in"\r

diff --git a/debian/patches/fixed_iirfilter_reset.patch b/debian/patches/fixed_iirfilter_reset.patch
deleted file mode 100644 (file)
index b78e678..0000000
--- a/debian/patches/fixed_iirfilter_reset.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Fixed build error with IIR filter and SIMD registers
-Author: IOhannes m zmölnig
-Origin: upstream
-Bug: https://github.com/WeAreROLI/JUCE/issues/292
-Applied-Upstream: https://github.com/WeAreROLI/JUCE/commit/13d18e406c33724a9f8870c4602458fc6d94b750
-Last-Update: 2017-12-19
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- juce.orig/modules/juce_dsp/processors/juce_IIRFilter.h
-+++ juce/modules/juce_dsp/processors/juce_IIRFilter.h
-@@ -88,7 +88,7 @@
-             Note that this clears the processing state, but the type of filter and\r
-             its coefficients aren't changed.\r
-         */\r
--        void reset()            { reset ({}); }\r
-+        void reset()            { reset (SampleType {}); }\r
- \r
-         /** Resets the filter's processing pipeline to a specific value.\r
-             @see reset\r

diff --git a/debian/patches/reproducible-date.patch b/debian/patches/reproducible-date.patch
index 3655bd275148bb3a496244d1d26199a5fb6eb308..89a93df458cbe974ba8fcaf12e0f74a810bcb5b4 100644 (file)
--- a/debian/patches/reproducible-date.patch
+++ b/debian/patches/reproducible-date.patch
@@ -8,7 +8,7 @@ Last-Update: 2015-01-21
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- juce.orig/modules/juce_core/time/juce_Time.cpp
 +++ juce/modules/juce_core/time/juce_Time.cpp
-@@ -610,14 +610,20 @@
+@@ -608,14 +608,20 @@
      return 0;\r
  }\r
  \r
@@ -33,7 +33,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
                   getMonthNumberForCompileDate (dateTokens[0]),\r
 --- juce.orig/extras/Projucer/Source/Application/jucer_Application.cpp
 +++ juce/extras/Projucer/Source/Application/jucer_Application.cpp
-@@ -136,6 +136,9 @@
+@@ -137,6 +137,9 @@
      tooltipWindow.setMillisecondsBeforeTipAppears (1200);\r
  }\r
  \r
@@ -43,7 +43,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  bool ProjucerApplication::initialiseLogger (const char* filePrefix)\r
  {\r
      if (logger == nullptr)\r
-@@ -148,7 +151,7 @@
+@@ -149,7 +152,7 @@
  \r
          logger = FileLogger::createDateStampedLogger (folder, filePrefix, ".txt",\r
                                                        getApplicationName() + " " + getApplicationVersion()\r

diff --git a/debian/patches/series b/debian/patches/series
index b1d50520e92fea9a902666d75a5933f03750cb85..31adb158c57634cd2638424482fde05276b70367 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
-fix-spelling.patch
-fixed_iirfilter_reset.patch
 reproducible-date.patch
 debian_fixed-defines.patch
 debian_gpl_variant.patch