From 28bce28f70efdd0658f64f99287b13f279e110c7 Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Fri, 18 Nov 2022 17:47:39 -0600 Subject: [PATCH] Remove reverse-applicable patch. --- debian/changelog | 1 + .../fix-bluetooth-saving-settings.patch | 27 ------------------- debian/patches/series | 1 - 3 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 debian/patches/fix-bluetooth-saving-settings.patch diff --git a/debian/changelog b/debian/changelog index a905218..21bbe19 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ lxqt-session (1.2.0-0ubuntu1) UNRELEASED; urgency=medium * Bump Standards-version to 4.6.1, no changes needed. * Lubuntuify the package slightly, to make debhelper happy. * Bump build dependencies in debian/control. + * Remove reverse-applicable patch. -- Simon Quigley Fri, 18 Nov 2022 17:42:07 -0600 diff --git a/debian/patches/fix-bluetooth-saving-settings.patch b/debian/patches/fix-bluetooth-saving-settings.patch deleted file mode 100644 index 91c41e7..0000000 --- a/debian/patches/fix-bluetooth-saving-settings.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 9d63aba3cdb88dafb837fe3e94ada3047de7ec0c Mon Sep 17 00:00:00 2001 -From: Chih-Hsuan Yen -Date: Sun, 29 May 2022 20:22:08 +0800 -Subject: [PATCH] Reload mouse & touchpad settings when devices are reconnected - -Fixes https://github.com/lxqt/lxqt/issues/2245 ---- - lxqt-session/src/sessionapplication.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/lxqt-session/src/sessionapplication.cpp b/lxqt-session/src/sessionapplication.cpp -index 86a7ff1b..97c80974 100644 ---- a/lxqt-session/src/sessionapplication.cpp -+++ b/lxqt-session/src/sessionapplication.cpp -@@ -91,10 +91,11 @@ bool SessionApplication::startup() - // but with such a little probablity we can live... - LXQt::Settings settings(configName); - loadKeyboardSettings(settings); -+ QProcess::startDetached(QStringLiteral("lxqt-config-input"), QStringList(QStringLiteral("--load-touchpad"))); - }); - connect(dev_notifier, &UdevNotifier::deviceAdded, this, [this, dev_timer] (QString device) - { -- qCWarning(SESSION) << QStringLiteral("Session '%1', new input device '%2', keyboard setting will be (optionaly) reloaded...").arg(configName,device); -+ qCWarning(SESSION) << QStringLiteral("Session '%1', new input device '%2', keyboard, mouse and touchpad settings will be (optionaly) reloaded...").arg(configName,device); - dev_timer->start(); - }); - // Detect display connection: diff --git a/debian/patches/series b/debian/patches/series index 687af45..0ed5a23 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ ensure-necessary-paths-are-pulled-from.patch -fix-bluetooth-saving-settings.patch