From: IOhannes m zmölnig Date: Wed, 13 Jan 2021 09:57:13 +0000 (+0100) Subject: Drop useless patches X-Git-Tag: archive/raspbian/6.1.5_ds0-1+rpi1^2~95 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8ccd8e2c6fcc80516e06eb48a33927dc74c30d8c;p=juce.git Drop useless patches --- diff --git a/debian/patches/0011-Don-t-fail-fatally-if-gui-cannot-connect-to-X-server.patch b/debian/patches/0011-Don-t-fail-fatally-if-gui-cannot-connect-to-X-server.patch deleted file mode 100644 index 2dadeccf..00000000 --- a/debian/patches/0011-Don-t-fail-fatally-if-gui-cannot-connect-to-X-server.patch +++ /dev/null @@ -1,49 +0,0 @@ -From: kunitoki -Date: Mon, 16 Mar 2020 13:01:47 +0100 -Subject: Don't fail fatally if gui cannot connect to X server -MIME-Version: 1.0 -Content-Type: text/plain; charset="utf-8" -Content-Transfer-Encoding: 8bit - -Bug: https://github.com/WeAreROLI/JUCE/issues/422 - -This is a slight modification of https://github.com/WeAreROLI/JUCE/issues/422 by -IOhannes m zmölnig, using early exits rather than longish if-clauses (mainly to -minimize the diff). ---- - modules/juce_gui_basics/native/juce_linux_X11.cpp | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/modules/juce_gui_basics/native/juce_linux_X11.cpp b/modules/juce_gui_basics/native/juce_linux_X11.cpp -index a2ceb67..7d67541 100644 ---- a/modules/juce_gui_basics/native/juce_linux_X11.cpp -+++ b/modules/juce_gui_basics/native/juce_linux_X11.cpp -@@ -149,7 +149,8 @@ XWindowSystem::~XWindowSystem() noexcept - - ::Display* XWindowSystem::displayUnref() noexcept - { -- jassert (display != nullptr); -+ if (!display) -+ return display; - jassert (displayCount.get() > 0); - - if (--displayCount == 0) -@@ -168,7 +169,7 @@ void XWindowSystem::initialiseXDisplay() noexcept - if (display == nullptr) - { - Logger::outputDebugString ("Failed to connect to the X Server."); -- Process::terminate(); -+ return; - } - - // Create a context to store user data associated with Windows we create -@@ -223,6 +224,9 @@ void XWindowSystem::initialiseXDisplay() noexcept - - void XWindowSystem::destroyXDisplay() noexcept - { -+ if (!display) -+ return; -+ - ScopedXLock xlock (display); - XDestroyWindow (display, juce_messageWindowHandle); - juce_messageWindowHandle = 0; diff --git a/debian/patches/debian_gpl_variant.patch b/debian/patches/debian_gpl_variant.patch deleted file mode 100644 index 4b341ea7..00000000 --- a/debian/patches/debian_gpl_variant.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: =?utf-8?q?IOhannes_m_zm=C3=B6lnig?= -Date: Thu, 9 Nov 2017 00:00:00 +0100 -Subject: Build GPL-3 variant of Projucer - -Forwarded: not-needed ---- - 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 cb5a324..8d54ae2 100644 ---- a/extras/Projucer/JuceLibraryCode/AppConfig.h -+++ b/extras/Projucer/JuceLibraryCode/AppConfig.h -@@ -32,7 +32,7 @@ - // BEGIN SECTION A - - #ifndef JUCER_ENABLE_GPL_MODE -- #define JUCER_ENABLE_GPL_MODE 0 -+ #define JUCER_ENABLE_GPL_MODE 1 - #endif - - // END SECTION A diff --git a/debian/patches/debian_no-usagedata.patch b/debian/patches/debian_no-usagedata.patch deleted file mode 100644 index 6c497998..00000000 --- a/debian/patches/debian_no-usagedata.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: =?utf-8?q?IOhannes_m_zm=C3=B6lnig?= -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... -Forwarded: no ---- - .../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 c9a06df..6a48b68 100644 ---- a/extras/Projucer/Source/Application/Windows/jucer_ApplicationUsageDataWindowComponent.h -+++ b/extras/Projucer/Source/Application/Windows/jucer_ApplicationUsageDataWindowComponent.h -@@ -69,10 +69,10 @@ public: - - auto* controller = ProjucerApplication::getApp().licenseController.get(); - -- if (controller != nullptr && controller->getState().applicationUsageDataState == LicenseState::ApplicationUsageData::disabled) -- shareApplicationUsageDataToggle->setToggleState (false, dontSendNotification); -- else -+ if (controller != nullptr && controller->getState().applicationUsageDataState == LicenseState::ApplicationUsageData::enabled) - shareApplicationUsageDataToggle->setToggleState (true, dontSendNotification); -+ else -+ shareApplicationUsageDataToggle->setToggleState (false, dontSendNotification); - - addAndMakeVisible (shareApplicationUsageDataLabel); - shareApplicationUsageDataLabel.setFont (Font (14.0f)); diff --git a/debian/patches/series b/debian/patches/series index 91be27dc..b59fac7b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,13 +1,10 @@ LV2-audioprocessor.patch debian_fixed-defines.patch -debian_gpl_variant.patch debian_no-update-check.patch -debian_no-usagedata.patch debian_system_modules.patch debian_python3.patch debian_unittests_globalpaths.patch debian_vst.patch debian_link_systemlibs.patch -0011-Don-t-fail-fatally-if-gui-cannot-connect-to-X-server.patch cross.patch overridable_pkg-config.patch