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 (file)
index 2dadecc..0000000
--- a/debian/patches/0011-Don-t-fail-fatally-if-gui-cannot-connect-to-X-server.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From: kunitoki <kunitoki@gmail.com>
-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
- \r
- ::Display* XWindowSystem::displayUnref() noexcept\r
- {\r
--    jassert (display != nullptr);\r
-+    if (!display)\r
-+        return display;\r
-     jassert (displayCount.get() > 0);\r
- \r
-     if (--displayCount == 0)\r
-@@ -168,7 +169,7 @@ void XWindowSystem::initialiseXDisplay() noexcept
-     if (display == nullptr)\r
-     {\r
-         Logger::outputDebugString ("Failed to connect to the X Server.");\r
--        Process::terminate();\r
-+        return;\r
-     }\r
- \r
-     // Create a context to store user data associated with Windows we create\r
-@@ -223,6 +224,9 @@ void XWindowSystem::initialiseXDisplay() noexcept
- \r
- void XWindowSystem::destroyXDisplay() noexcept\r
- {\r
-+    if (!display)\r
-+        return;\r
-+\r
-     ScopedXLock xlock (display);\r
-     XDestroyWindow (display, juce_messageWindowHandle);\r
-     juce_messageWindowHandle = 0;\r

diff --git a/debian/patches/debian_gpl_variant.patch b/debian/patches/debian_gpl_variant.patch
deleted file mode 100644 (file)
index 4b341ea..0000000
--- a/debian/patches/debian_gpl_variant.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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
----
- 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\r
- \r
- #ifndef JUCER_ENABLE_GPL_MODE\r
-- #define JUCER_ENABLE_GPL_MODE 0\r
-+ #define JUCER_ENABLE_GPL_MODE 1\r
- #endif\r
- \r
- // END SECTION A\r

diff --git a/debian/patches/debian_no-usagedata.patch b/debian/patches/debian_no-usagedata.patch
deleted file mode 100644 (file)
index 6c49799..0000000
--- a/debian/patches/debian_no-usagedata.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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...
-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:
- \r
-             auto* controller = ProjucerApplication::getApp().licenseController.get();\r
- \r
--            if (controller != nullptr && controller->getState().applicationUsageDataState == LicenseState::ApplicationUsageData::disabled)\r
--                shareApplicationUsageDataToggle->setToggleState (false, dontSendNotification);\r
--            else\r
-+            if (controller != nullptr && controller->getState().applicationUsageDataState == LicenseState::ApplicationUsageData::enabled)\r
-                 shareApplicationUsageDataToggle->setToggleState (true, dontSendNotification);\r
-+            else\r
-+                shareApplicationUsageDataToggle->setToggleState (false, dontSendNotification);\r
- \r
-             addAndMakeVisible (shareApplicationUsageDataLabel);\r
-             shareApplicationUsageDataLabel.setFont (Font (14.0f));\r

diff --git a/debian/patches/series b/debian/patches/series
index 91be27dc2517ac2c909d1e5fec9c6cd851f38207..b59fac7b3005303542d6613f8483306e06cdf2f8 100644 (file)
--- 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