From: IOhannes m zmölnig Date: Thu, 8 Feb 2018 19:13:03 +0000 (+0100) Subject: Refreshed patches (and removed those applied upstream) X-Git-Tag: archive/raspbian/5.4.5_ds0-1+rpi1~1^2~117 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d9049d1735c297971c85fde058187a0540686210;p=juce.git Refreshed patches (and removed those applied upstream) --- diff --git a/debian/patches/debian_gpl_variant.patch b/debian/patches/debian_gpl_variant.patch index 0d64e182..e1d876ad 100644 --- 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 @@ // BEGIN SECTION A diff --git a/debian/patches/debian_no-update-check.patch b/debian/patches/debian_no-update-check.patch index 14064af9..f974714d 100644 --- 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 @@ void LatestVersionChecker::checkForNewVersion() { diff --git a/debian/patches/debian_system_modules.patch b/debian/patches/debian_system_modules.patch index f8e6e4ee..ced444a7 100644 --- 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) { v = (os == TargetOS::windows ? "C:\\JUCE\\modules" diff --git a/debian/patches/fix-spelling.patch b/debian/patches/fix-spelling.patch deleted file mode 100644 index 54e72151..00000000 --- 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"); - - props.add (new TextPropertyComponent (androidExtraAssetsFolder.getPropertyAsValue(), "Extra Android Assets", 256, false), -- "A path to a folder (relative to the project folder) which conatins extra android assets."); -+ "A path to a folder (relative to the project folder) which contains extra android assets."); - } - - //============================================================================== ---- 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; - - description << "The " << getName() << " exporter produces a single CMakeLists.txt file with " -- << "multiple platform dependant sections, where the configuration for each section " -+ << "multiple platform dependent sections, where the configuration for each section " - << "is inherited from other exporters added to this project." << newLine - << newLine - << "The exporters which provide the CLion configuration for the corresponding platform are:" << newLine ---- 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) - props.add (new TextPropertyComponentWithEnablement (getAppGroupIdValue(), getAppGroupsEnabledValue(), "App Group ID", 256, false), - "The App Group ID to be used for allowing multiple apps to access a shared resource folder. Multiple IDs can be " -- "added seperated by a semicolon."); -+ "added separated by a semicolon."); - - props.add (new BooleanPropertyComponent (getSetting ("keepCustomXcodeSchemes"), "Keep custom Xcode schemes", "Enabled"), - "Enable this to keep any Xcode schemes you have created for debugging or running, e.g. to launch a plug-in in" diff --git a/debian/patches/fixed_iirfilter_reset.patch b/debian/patches/fixed_iirfilter_reset.patch deleted file mode 100644 index b78e6784..00000000 --- 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 - its coefficients aren't changed. - */ -- void reset() { reset ({}); } -+ void reset() { reset (SampleType {}); } - - /** Resets the filter's processing pipeline to a specific value. - @see reset diff --git a/debian/patches/reproducible-date.patch b/debian/patches/reproducible-date.patch index 3655bd27..89a93df4 100644 --- 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; } @@ -33,7 +33,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ getMonthNumberForCompileDate (dateTokens[0]), --- 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); } @@ -43,7 +43,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ bool ProjucerApplication::initialiseLogger (const char* filePrefix) { if (logger == nullptr) -@@ -148,7 +151,7 @@ +@@ -149,7 +152,7 @@ logger = FileLogger::createDateStampedLogger (folder, filePrefix, ".txt", getApplicationName() + " " + getApplicationVersion() diff --git a/debian/patches/series b/debian/patches/series index b1d50520..31adb158 100644 --- 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