From 496936ff0f7db69d1f7317341230acb866e3c330 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 29 Jul 2022 21:08:17 +0100 Subject: gentoo auto-resync : 29:07:2022 - 21:08:17 --- dev-qt/Manifest.gz | Bin 10388 -> 10391 bytes dev-qt/qtprintsupport/Manifest | 3 ++ ...5-revert-cups-support-accessible-printers.patch | 42 ++++++++++++++++ .../qtprintsupport/qtprintsupport-5.15.5-r1.ebuild | 46 ++++++++++++++++++ dev-qt/qtwayland/Manifest | 2 + dev-qt/qtwayland/qtwayland-5.15.5-r1.ebuild | 54 +++++++++++++++++++++ 6 files changed, 147 insertions(+) create mode 100644 dev-qt/qtprintsupport/files/qtprintsupport-5.15.5-revert-cups-support-accessible-printers.patch create mode 100644 dev-qt/qtprintsupport/qtprintsupport-5.15.5-r1.ebuild create mode 100644 dev-qt/qtwayland/qtwayland-5.15.5-r1.ebuild (limited to 'dev-qt') diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz index 36973c9952e7..770b438fa205 100644 Binary files a/dev-qt/Manifest.gz and b/dev-qt/Manifest.gz differ diff --git a/dev-qt/qtprintsupport/Manifest b/dev-qt/qtprintsupport/Manifest index a029821b1474..a9f6a7d2f4c2 100644 --- a/dev-qt/qtprintsupport/Manifest +++ b/dev-qt/qtprintsupport/Manifest @@ -1,5 +1,8 @@ +AUX qtprintsupport-5.15.5-revert-cups-support-accessible-printers.patch 1760 BLAKE2B a6b4ed143edd639376f362c41c636d8fc9924aa9a2c93584039ef5b994ae53e2eff7eb0703bf8e0bce19300e7b873098fee7235ddf2f691764f33830712b4f03 SHA512 32216a87f120af2f689c2257ce1c77db2e26017ece16df04b06454c82888b9ceb800e7d4e91eb5b4ab7de127436906f3ce8c76eaee6407f779670380026745d0 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 +EBUILD qtprintsupport-5.15.5-r1.ebuild 917 BLAKE2B 6cf411ae6bbbeac93eaef52ba6c5703313318ec049b50dd989efe160ae4baf208f611b8ef4b57f82c13ca2e5de17dbd97f4cc951c2e7c0791f937d63218e5d8d SHA512 df5b1da13b0d9564fb9ea69d5d2a6a953386c3da8874ed7a9551beb7d80e483a2d1dc5f2749863ff75f102692b816cbfc2e6dadfe5f70e48460745bbf69db83c EBUILD qtprintsupport-5.15.5.ebuild 833 BLAKE2B f83d54fd48a8828d6bd34815915042ef61b5070fd754582efe8fe71a3c86f6753624743c6c526e1bb61ebce8d75cac812e3691f42d33c9b99ad748d6658fce3a SHA512 ce6bec40b14228bf13ef9e6c2793cbe7f8022287d1f911dc60f5609e46093df1b0ae711a8202b6fb541ec3cc6d2172288d1ad56a7b966ffbbc61ed3c1b4b3cb7 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e 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 +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 +(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 +} diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest index 9cfda3c5da4b..9b3d1d67666a 100644 --- a/dev-qt/qtwayland/Manifest +++ b/dev-qt/qtwayland/Manifest @@ -1,6 +1,8 @@ AUX qtwayland-5.15.2-QTBUG-90037-QTBUG-91264.patch 4691 BLAKE2B d817e7715759dfd6a6efc13b3b8e7742406b3af7cdf8602e134121b8d6e97e857dc82bb71e32c0ad04a04fc8f20443475bd5a251ab6eb0c83412a75201865561 SHA512 82ac704e0a57a0e6272676c329e29116a7ab4186c94a1e81fe4f503bf332b20b699930d86ff22e9a83e72be856a5711230f264a6d10991fd070601ab4e4fd67c AUX qtwayland-5.15.3-clang.patch 405 BLAKE2B 914a7448f590cfd6e83ca32352070644bbb6c07bd794d6f86ff6346d4697f6734d4c61469f20fa27517cf14f4742df946dba1f20ac242ea50d8e712733e3c099 SHA512 41da7708a596eabbbf58baa2d081c6a870fd49ac5b284c094e7e3230df201ae29627de1470bc3a80aff3dd30166b51bf9fce53e3d6fda0f18b97452fda3cd467 DIST qtwayland-5.15.5-gentoo-kde-1.tar.xz 32076 BLAKE2B e42d847deaef08271eb2f3211db7496bb1d3e1da976cf242f2129775c0401eb834fd7c94b35ac58d601eb28e770c3b6bedaf4135e5ad97f43e0adee5054214aa SHA512 277c3612de892f21058bac3ef9c2b3584aa43850e1f6dab0c43989a952e30656c6069d1f7d07b0f1df7d1ec2ab1893a0ba1c4c6fecc6f56c101333832bdd483c +DIST qtwayland-5.15.5-gentoo-kde-2.tar.xz 35492 BLAKE2B 91334609155e4bd227d76e5972422b400ab4b6196389a1b6b4c271994287851bc3b624ae761ece1418037735784edf7740ed5337ef6972bf708c598c202b7e86 SHA512 2663b59c7647e8a7d5f64905be114fc1b248cd8e10c2eba6bddc25b74fbbc5216e8264f41f50b6368819664921e27dfe96d4c1556c0e56f8c3c2c0ed75a72080 DIST qtwayland-everywhere-opensource-src-5.15.5.tar.xz 567384 BLAKE2B 01ce4d546bda7bf332f8cc4f86a5e8bfb1be0ef60336ee3cae58266a25d51cf00fef3e6c4204f0179abc2ef748f88bd3a20f89f36da74d5d15c70ae7b4975186 SHA512 828dceb7bc54ce610a73f110f0aca332a90cf95df4a3bc971bd21c4e878366cb8d2248e609b73ce4d381579a143843c87a62f23dcc95767e522874e53a1b0327 +EBUILD qtwayland-5.15.5-r1.ebuild 1153 BLAKE2B 7e5ff059f7f96da0c7c5302a8e57255d50cb7e07291d5fb9f00cc5a0c58fe223de899dd7da6132bc8a9ce6018080fa867fdae9b629fc0830b4794c3eb5699c3b SHA512 20235ece58cc1aaace573ecdd0212c65108ea54b37c692143e759eb0e1a250eccc1c45d33a3d9518befd72db5eef375965e3d804d7a1920ba6c7efae83b82432 EBUILD qtwayland-5.15.5.ebuild 1147 BLAKE2B cb388d4b724850c2ac83f161f5546d12f9bebf2193c73f3252abe1afb9de5ee8d277b84dd539a159191c50e011c42bf643a76a0ccd2950b815edef36f1f45245 SHA512 55e53e006bb1d8f138e7c9ffe40eda9b670a0d82f22b64d6867db3285ea84846c205df1a3c3516c1636cfa20a825338ce16aa1c1cce753e93730ade702f32f80 MISC metadata.xml 584 BLAKE2B ad42909b120209835e121a29de558d338bae4348eb55e69a94e8ac8b54f26564df0a750839bef9418ae8056a0d24f234615247a610b8287f5b0fbffbc60193f2 SHA512 86fd81d63b19fc6e95bdcb92e9da9b03861248a4e78e9de36aca6996e61644ab8bce7a60ca22ee7ad86fefc9b407a1fd0136240b8fdfa3c40a149444ab1dcbe2 diff --git a/dev-qt/qtwayland/qtwayland-5.15.5-r1.ebuild b/dev-qt/qtwayland/qtwayland-5.15.5-r1.ebuild new file mode 100644 index 000000000000..82916bcd104b --- /dev/null +++ b/dev-qt/qtwayland/qtwayland-5.15.5-r1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +QT5_KDEPATCHSET_REV=2 +inherit qt5-build + +DESCRIPTION="Wayland platform plugin for Qt" +SLOT=5/${QT5_PV} # bug 815646 + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +IUSE="vulkan X" + +DEPEND=" + dev-libs/wayland + =dev-qt/qtcore-${QT5_PV}*:5= + =dev-qt/qtdeclarative-${QT5_PV}*:5= + =dev-qt/qtgui-${QT5_PV}*:5=[egl,libinput,vulkan=,X?] + media-libs/libglvnd + vulkan? ( dev-util/vulkan-headers ) + X? ( + =dev-qt/qtgui-${QT5_PV}*[-gles2-only] + x11-libs/libX11 + x11-libs/libXcomposite + ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + dev-util/wayland-scanner +" + +PATCHES=( + "${FILESDIR}/${PN}-5.15.2-QTBUG-90037-QTBUG-91264.patch" # upstream pending + "${FILESDIR}/${PN}-5.15.3-clang.patch" +) + +src_configure() { + local myqmakeargs=( + -- + $(qt_use vulkan feature-wayland-vulkan-server-buffer) + $(qt_use X feature-xcomposite-egl) + $(qt_use X feature-xcomposite-glx) + ) + qt5-build_src_configure +} + +src_install() { + qt5-build_src_install + rm "${D}${QT5_BINDIR}"/qtwaylandscanner || die +} -- cgit v1.2.3