From: IOhannes m zmölnig Date: Thu, 6 Feb 2020 08:55:00 +0000 (+0100) Subject: Drop patches applied upstream X-Git-Tag: archive/raspbian/5.4.6_ds0-1+rpi1^2~19 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2729bb404694aad90ff24b39ceadb10a23656688;p=juce.git Drop patches applied upstream --- diff --git a/debian/patches/jack-client-name.patch b/debian/patches/jack-client-name.patch deleted file mode 100644 index d40af5db..00000000 --- a/debian/patches/jack-client-name.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: =?utf-8?q?IOhannes_m_zm=C3=B6lnig?= -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 . - -Bug: https://github.com/WeAreROLI/JUCE/issues/331 -Forwarded: https://github.com/WeAreROLI/JUCE/pull/351 ---- - 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 - - //============================================================================== - #ifndef JUCE_JACK_CLIENT_NAME -- #define JUCE_JACK_CLIENT_NAME "JUCEJack" -+ #ifdef JucePlugin_Name -+ # define JUCE_JACK_CLIENT_NAME JucePlugin_Name -+ #else -+ # define JUCE_JACK_CLIENT_NAME "JUCEJack" -+ #endif - #endif - - struct JackPortIterator diff --git a/debian/patches/series b/debian/patches/series index 78e70087..a5cbb7a7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -jack-client-name.patch LV2-audioprocessor.patch debian_fixed-defines.patch debian_gpl_variant.patch @@ -9,4 +8,3 @@ debian_python3.patch debian_unittests_globalpaths.patch debian_vst.patch debian_link_systemlibs.patch -spelling.patch diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch deleted file mode 100644 index 332205c0..00000000 --- a/debian/patches/spelling.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Debian Multimedia Maintainers -Date: Wed, 23 Oct 2019 09:44:36 +0200 -Subject: fixed spelling mistakes - -Forwarded: no -Last-Update: 2019-01-12 - -Last-Update: 2019-01-12 ---- - extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h -index 1764dca..2a031f9 100644 ---- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h -+++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h -@@ -470,7 +470,7 @@ public: - - props.add (new TextPropertyComponent (subprojectsValue, "Xcode Subprojects", 8192, true), - "Paths to Xcode projects that should be added to the build (one per line). " -- "The names of the required build products can be specified after a colon, comma seperated, " -+ "The names of the required build products can be specified after a colon, comma separated, " - "e.g. \"path/to/MySubProject.xcodeproj: MySubProject, OtherTarget\". " - "If no build products are specified, all build products associated with a subproject will be added."); -