[neon/kde/print-manager/Neon/unstable] debian/patches: remove patch which no longer applies and is not upstream

Jonathan Riddell null at kde.org
Mon Jan 17 16:00:23 GMT 2022


Git commit 9ded3202832b560a67196b76109db7bce26af21c by Jonathan Riddell.
Committed on 17/01/2022 at 16:00.
Pushed by jriddell into branch 'Neon/unstable'.

remove patch which no longer applies and is not upstream

D  +0    -30   debian/patches/kubuntu_ignore_scp_dbus_failures.diff
M  +0    -1    debian/patches/series

https://invent.kde.org/neon/kde/print-manager/commit/9ded3202832b560a67196b76109db7bce26af21c

diff --git a/debian/patches/kubuntu_ignore_scp_dbus_failures.diff b/debian/patches/kubuntu_ignore_scp_dbus_failures.diff
deleted file mode 100644
index c49f6b1..0000000
--- a/debian/patches/kubuntu_ignore_scp_dbus_failures.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Date: Wed, 13 Apr 2016 12:03:41 +0200
-Subject: kubuntu_ignore_scp_dbus_failures
-
-====================================================================
-Index: print-manager/add-printer/DevicesModel.cpp
-===================================================================
---- print-manager.orig/add-printer/DevicesModel.cpp
-+++ print-manager/add-printer/DevicesModel.cpp
-@@ -339,7 +339,6 @@ void DevicesModel::getGroupedDevicesFail
- {
-     qWarning() << error <<  message;
-     groupedDevicesFallback();
--    emit errorMessage(i18n("Failed to group devices: '%1'", error.message()));
-     emit loaded();
- }
- 
-Index: print-manager/libkcups/SelectMakeModel.cpp
-===================================================================
---- print-manager.orig/libkcups/SelectMakeModel.cpp
-+++ print-manager/libkcups/SelectMakeModel.cpp
-@@ -240,7 +240,7 @@ void SelectMakeModel::getBestDriversFail
-     // Show the PPDs anyway
-     m_gotBestDrivers = true;
-     ui->messageWidget->setText(i18n("Failed to search for a recommended driver: '%1'", error.message()));
--    ui->messageWidget->animatedShow();
-+    //ui->messageWidget->animatedShow();
-     setModelData();
- }
- 
diff --git a/debian/patches/series b/debian/patches/series
index 4a1f8c8..1f451ea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-kubuntu_ignore_scp_dbus_failures.diff
 activate_password_dialog


More information about the Neon-commits mailing list