gentoo auto-resync : 19:11:2024 - 03:03:00

3 files changed, 102 insertions, 0 deletions

diff --git a/kde-plasma/print-manager/Manifest b/kde-plasma/print-manager/Manifest
index 1b59eeb258d3..7fc3474de49d 100644
--- a/kde-plasma/print-manager/Manifest
+++ b/kde-plasma/print-manager/Manifest
@@ -1,5 +1,7 @@
+AUX print-manager-6.2.3-fix-abort-in-kcm-add-printer.patch 1069 BLAKE2B b1269c81f58812426bc34eba2cdfdc6af2137c1b8878e6d6d3bb3fd9609612d408d3a285658448f59395a1e8076a952ee9c99a66716a24346aead7aa67b15234 SHA512 c2c9348c07d52a8b4d7df140dd77bbfeebe34f150c25c01ac0877e0da91331206a5cd6426047513f71e7cee42831d55bef18b99ed01815c79ecd997b46537ba0
 DIST print-manager-6.1.5.tar.xz 371292 BLAKE2B 140f63488f381dde409d673fac692197163efa200866311c0bb346e9dd57a57780dc3dd1a47fb950793b6bd5512e3d82ed2bae47e9476e1ece20e7dc0079b928 SHA512 0c83c5fdbd73ad47cde287ed2f3d89c735a44cce4c2d753201258183491bc9612091802bf639445a775f0b2ed7f485d7bc94d98904fb40ca11e23affbd046ceb
 DIST print-manager-6.2.3.tar.xz 375000 BLAKE2B dc1419fb7c7cc26a1f5c91c4587d5014efdd963a4fee309f4104123ba4b35c222ac8912d4f184a96e2c3d3b9d4dbf14d2f9ad8e1b26b57738f6e92b9e81c53aa SHA512 3bd0e91cc9f1094c2cd2052d2eaf4bf1c3cc16d096dd5b1317dcc80b012dff39123e20acb8028b54f77f75d14695f3214b081ae7ed76c2ec87feb7e93ef8c202
 EBUILD print-manager-6.1.5.ebuild 1947 BLAKE2B 185325908a2529f7ad83fbe13d15a882593823c8b93b63fa17e045c2e6b6faeb7b1fc12c8ec8d5288ee42a14f02b172ca6a2b1e53cfa690eaa5a5368a94eab96 SHA512 4159866d249602a2d105843957bb5313584621013b570ceaabda88c2160ddaecef545343d7c43ac55909c8b6622dbe9375d5686914ecd58b1c6a099ffd0ced67
+EBUILD print-manager-6.2.3-r1.ebuild 2016 BLAKE2B cf05fd971734c15e80fec57905659c9cdef84ee258dff2ac58a8cdecefea859634725265f84f180e2b1f90031f36aab98187f797dfd96b7f6d81aeb3d237d6cf SHA512 c6f1429bc1795ea76cdab6817a972425610365a4f32f0b1068f55edd21b84fcf805cdb5c5fee878b545a5d00bd3f06913a31cbb0dcb48748c4b0fe7ffed4852a
 EBUILD print-manager-6.2.3.ebuild 1949 BLAKE2B ee830cd3973add1eb2daea5dc681820ebd4f5dfe17ccebfcc15889b3b7261ca12343d39a7272de22a40f64aa0a89289f6fd77e9ace300e230db66635edd51d26 SHA512 9226bbcf5fe337a2fc8e670090292fb667bceda20e2fab65b222658054755892c454903b4812ee12aa99a4c54490c5ce301c5954d5a8c4d5363b266f48e823a9
 MISC metadata.xml 452 BLAKE2B c24b456647acd7c47efb46ef742082dd5da3a66a8686baa785172e2747113f1e1147bbb82e58db1bb312dca882352bf46b5eb1cd5cbf76fff8cc15af01b3a7f7 SHA512 9ce3f10533c3251d5b8490620b2c3d53ee79482f45d1bf74d2426487e166d613ba8eb388618e14943e6a36c9c3675dc549b573c926445ab918559ac9064055a0
diff --git a/kde-plasma/print-manager/files/print-manager-6.2.3-fix-abort-in-kcm-add-printer.patch b/kde-plasma/print-manager/files/print-manager-6.2.3-fix-abort-in-kcm-add-printer.patch
new file mode 100644
index 000000000000..29eb1d1c9c24
--- /dev/null
+++ b/kde-plasma/print-manager/files/print-manager-6.2.3-fix-abort-in-kcm-add-printer.patch
@@ -0,0 +1,30 @@
+From 2440d1b96b7af95259867b22ba8b4ba677ef0ade Mon Sep 17 00:00:00 2001
+From: Kai Uwe Broulik <kde@privat.broulik.de>
+Date: Fri, 8 Nov 2024 17:43:07 +0000
+Subject: [PATCH] DevicesModel: Register QList of QStringList to DBus
+
+Avoids an abort when adding a new printer from kcmshell.
+
+
+(cherry picked from commit c80a5a0d5e59049c2007264a41228fcfbaeda58b)
+
+Co-authored-by: Kai Uwe Broulik <kde@privat.broulik.de>
+---
+ src/libkcups/DevicesModel.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/libkcups/DevicesModel.cpp b/src/libkcups/DevicesModel.cpp
+index 3ffc90673..8498a719e 100644
+--- a/src/libkcups/DevicesModel.cpp
++++ b/src/libkcups/DevicesModel.cpp
+@@ -45,6 +45,7 @@ DevicesModel::DevicesModel(QObject *parent)
+ 
+     qDBusRegisterMetaType<MapSS>();
+     qDBusRegisterMetaType<MapSMapSS>();
++    qDBusRegisterMetaType<QList<QStringList>>();
+ 
+     // Adds the other device which is meant for manual URI input
+     insertDevice(QLatin1String("other"), QString(), i18nc("@item", "Manual Config"), QString(), QLatin1String("other"), QString());
+-- 
+GitLab
+
diff --git a/kde-plasma/print-manager/print-manager-6.2.3-r1.ebuild b/kde-plasma/print-manager/print-manager-6.2.3-r1.ebuild
new file mode 100644
index 000000000000..e47067d3d100
--- /dev/null
+++ b/kde-plasma/print-manager/print-manager-6.2.3-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=6.6.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=6.7.2
+inherit ecm plasma.kde.org
+
+DESCRIPTION="Manage CUPS print jobs and printers in Plasma"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+gtk"
+
+DEPEND="
+	>=dev-qt/qt5compat-${QTMIN}:6
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-plasma/libplasma-${PVCUT}:6
+	>=net-print/cups-2.4
+"
+RDEPEND="${DEPEND}
+	!<kde-plasma/print-manager-23.08.5-r100:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:6
+	gtk? ( app-admin/system-config-printer )
+"
+BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6"
+
+PATCHES=( "${FILESDIR}/${P}-fix-abort-in-kcm-add-printer.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt6=ON # not packaged
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] && ! use gtk ; then
+		ewarn "By switching off \"gtk\" USE flag, you have chosen to do without"
+		ewarn "an important, though optional, runtime dependency:"
+		ewarn
+		ewarn "app-admin/system-config-printer"
+		ewarn
+		ewarn "${PN} will work nevertheless, but is going to be less comfortable"
+		ewarn "and will show the following error status during runtime:"
+		ewarn
+		ewarn "\"Failed to group devices: 'The name org.fedoraproject.Config.Printing"
+		ewarn "was not provided by any .service files'\""
+	fi
+}