commit: 495432ac379ad2f72e6389f99fc253e14f85a360 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Jul 29 12:03:42 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Jul 29 12:42:39 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=495432ac
dev-qt/qtprintsupport: Revert CUPS support for accessible IPP printers See also: https://invent.kde.org/qt/backports-tracker/-/issues/2008 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-qt/qtprintsupport/Manifest | 1 + ...5-revert-cups-support-accessible-printers.patch | 42 ++++++++++++++++++++ .../qtprintsupport/qtprintsupport-5.15.5-r1.ebuild | 46 ++++++++++++++++++++++ 3 files changed, 89 insertions(+) diff --git a/dev-qt/qtprintsupport/Manifest b/dev-qt/qtprintsupport/Manifest index 9f98cfd5161e..9667a62512b5 100644 --- a/dev-qt/qtprintsupport/Manifest +++ b/dev-qt/qtprintsupport/Manifest @@ -1,3 +1,4 @@ DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 1399eb6f4c776d370e1837351a72b604440658a3a2d1bd0c725b9ef149b09d236347f5f4b37f652c33310048a0a7df54e24453b404dc45507fd4f7c5fdf144cd SHA512 c857fc746bacb047321cdb762f3c7c48ce2a0d24045a9e708edd38532568dbbc74e9e971425a72a3c2a5ca0662b3e6333831f6c1b7746525b99d46000b63111f DIST qtbase-5.15.5-gentoo-kde-1.tar.xz 520224 BLAKE2B 48807bc79cede557b114786ee072d8d94545f4ada3d96aa4fe04dbf79a356dc6c17d9299014ed70aa10296346c30c7512fb7d9f88ee4b301e9a54a241363be8b SHA512 ab9f27d506d7aa1a9339ba52d51daffb4c6f9abb5d858fd728ef2110528bc0f2ae101b4e2e7c344836b42e4aafa2c5a4ab5c5fa37465e692cce500c0f3347fa7 +DIST qtbase-5.15.5-gentoo-kde-2.tar.xz 526240 BLAKE2B 68ecca0805c2ea0b29b65706b0c03a3ead1d106e089f2a48a988035842d0cc8ac67d950cbc67ae8f8be860fd11443579d3e06bfe96a2e3161f94e07206d2815e SHA512 d877a2eb4cd05b712a7db6a943f955d3ced88f51efe3e29b2d6716fba4da08398dbd2ed580ca5b9bfbd92a5a20e34451e06a324274447d4b3692b25af4ff8ddf DIST qtbase-everywhere-opensource-src-5.15.5.tar.xz 50247388 BLAKE2B e9bbfe8e73e6f25ccadeef722818b5aeb82d1f136bec21fcbc3b26bf76044b38f25c7268010c648e1161e9b61013b8b775f17b9fdcfdd70402bdfbf70bf7f9d5 SHA512 ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87 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 new file mode 100644 index 000000000000..6df15e395eac --- /dev/null +++ b/dev-qt/qtprintsupport/files/qtprintsupport-5.15.5-revert-cups-support-accessible-printers.patch @@ -0,0 +1,42 @@ +From 742cc6db31bff8e506bfb8db699a843ce60627e4 Mon Sep 17 00:00:00 2001 +From: Volker Hilsheimer <volker.hilshei...@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.eftev...@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 + diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.15.5-r1.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.15.5-r1.ebuild new file mode 100644 index 000000000000..34caeb0c1d49 --- /dev/null +++ b/dev-qt/qtprintsupport/qtprintsupport-5.15.5-r1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +QT5_KDEPATCHSET_REV=2 +QT5_MODULE="qtbase" +VIRTUALX_REQUIRED="test" +inherit qt5-build + +DESCRIPTION="Printing support library for the Qt5 framework" + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +IUSE="cups gles2-only" + +RDEPEND=" + =dev-qt/qtcore-${QT5_PV}*:5= + =dev-qt/qtgui-${QT5_PV}*[gles2-only=] + =dev-qt/qtwidgets-${QT5_PV}*[gles2-only=] + cups? ( net-print/cups ) +" +DEPEND="${RDEPEND} + test? ( =dev-qt/qtnetwork-${QT5_PV}* ) +" + +QT5_TARGET_SUBDIRS=( + src/printsupport + src/plugins/printsupport +) + +QT5_GENTOO_CONFIG=( + cups +) + +PATCHES=( "${FILESDIR}/${P}-revert-cups-support-accessible-printers.patch" ) + +src_configure() { + local myconf=( + $(qt_use cups) + -opengl $(usex gles2-only es2 desktop) + ) + qt5-build_src_configure +}
