gentoo auto-resync : 10:12:2022 - 15:20:44

2 files changed, 0 insertions, 43 deletions

diff --git a/dev-qt/qtprintsupport/Manifest b/dev-qt/qtprintsupport/Manifest
index 4f0a055e813e..c0e428605754 100644
--- a/dev-qt/qtprintsupport/Manifest
+++ b/dev-qt/qtprintsupport/Manifest
@@ -1,4 +1,3 @@
-AUX qtprintsupport-5.15.5-revert-cups-support-accessible-printers.patch 1760 BLAKE2B a6b4ed143edd639376f362c41c636d8fc9924aa9a2c93584039ef5b994ae53e2eff7eb0703bf8e0bce19300e7b873098fee7235ddf2f691764f33830712b4f03 SHA512 32216a87f120af2f689c2257ce1c77db2e26017ece16df04b06454c82888b9ceb800e7d4e91eb5b4ab7de127436906f3ce8c76eaee6407f779670380026745d0
 DIST qtbase-5.15-gentoo-patchset-2.tar.xz 3844 BLAKE2B 6dcb69398cf8a6b1be737e8c7bf1041529c4e704ca892cef10ba3bc5ce435c903607b64e981cf8aa12c785b3e423aa1d52bce1f67ec1bd8dbb1421dfb6f62700 SHA512 b7fd7e17bcab2f9803c7bfc0473082ee4640299c23ce8da943ef80ed181e880ebc9157bcebde28077e80e6f907aa14a59c42416b3e32f49baebd54fbe5a37497
 DIST qtbase-5.15.7-gentoo-kde-1.tar.xz 798056 BLAKE2B 3c7fefa65ab6de25c2c82261ad0f1371e32acd4bd4b3303f20a5ebf36d19690df94290d102c65e4941a6c51a5d5f2db0253bafca5ac85cf480f7434405cb2671 SHA512 20ab17220489009c98d7f783a02614507e157974c7cb16f47d50d3954ccd1cd065562effc393df6e07c9ba6ad8ccd4e6b3f0bf5b5b890183b8631b8b570bf064
 DIST qtbase-everywhere-opensource-src-5.15.7.tar.xz 50260196 BLAKE2B 69029a910af0e3bfe742b5870334406e03274b0677ef47f9c7c10f730ff031bae49bd21a686497215505b19a183ca395c275d8afefaaa903125297f8e693bb4d SHA512 316de71fba1d5dd91354155dcd0f77e1ce2a798f8296a8699a795ea5e86ad10b6e233299775a92e23328290f3e041240585947e89ee7bd39eb464c5f0ffec343
diff --git a/dev-qt/qtprintsupport/files/qtprintsupport-5.15.5-revert-cups-support-accessible-printers.patch b/dev-qt/qtprintsupport/files/qtprintsupport-5.15.5-revert-cups-support-accessible-printers.patch
deleted file mode 100644
index 6df15e395eac..000000000000
--- a/dev-qt/qtprintsupport/files/qtprintsupport-5.15.5-revert-cups-support-accessible-printers.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 742cc6db31bff8e506bfb8db699a843ce60627e4 Mon Sep 17 00:00:00 2001
-From: Volker Hilsheimer <volker.hilsheimer@qt.io>
-Date: Thu, 28 Jul 2022 16:31:18 +0200
-Subject: [PATCH] Revert "CUPS: Add support for accessible IPP printers"
-
-This reverts commit 2f5f276b4a2a19b9f2669b84f28ce8e970aaa39f,
-after which valid printers are no longer listed anymore.
-
-Fixes: QTBUG-105242
-Pick-to: 6.2 6.3 6.4 5.15
-Change-Id: I6a388acff2a8033ad1052319edcf7e41a2f72c8f
-Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
-(cherry-picked from commit f387bb55d4060c6bfac0cd6da736c80dd9a47066)
-
-* asturmlechner 2022-07-28: This actually reverts commit
-  8d2c1e277f984bd4d2b98a4d58f23e578b677fd8 from kde/5.15 branch.
----
- src/plugins/printsupport/cups/qcupsprintersupport.cpp | 7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/src/plugins/printsupport/cups/qcupsprintersupport.cpp b/src/plugins/printsupport/cups/qcupsprintersupport.cpp
-index 1131d43f64..42a7a821f2 100644
---- a/src/plugins/printsupport/cups/qcupsprintersupport.cpp
-+++ b/src/plugins/printsupport/cups/qcupsprintersupport.cpp
-@@ -165,12 +165,9 @@ QStringList QCupsPrinterSupport::availablePrintDeviceIds() const
-     list.reserve(count);
-     for (int i = 0; i < count; ++i) {
-         QString printerId = QString::fromLocal8Bit(dests[i].name);
--        if (dests[i].instance) {
-+        if (dests[i].instance)
-             printerId += QLatin1Char('/') + QString::fromLocal8Bit(dests[i].instance);
--            list.append(printerId);
--        } else if (cupsGetOption("printer-uri-supported", dests[i].num_options, dests[i].options)) {
--            list.append(printerId);
--        }
-+        list.append(printerId);
-     }
-     cupsFreeDests(count, dests);
-     return list;
--- 
-GitLab
-