gentoo auto-resync : 28:11:2024 - 02:00:16

7 files changed, 107 insertions, 3 deletions

diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 9294e5e2c367..a0f46417dc3b 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/kguiaddons/Manifest b/kde-frameworks/kguiaddons/Manifest
index 2c74265360d2..e1d64f638da2 100644
--- a/kde-frameworks/kguiaddons/Manifest
+++ b/kde-frameworks/kguiaddons/Manifest
@@ -1,3 +1,4 @@
+AUX kguiaddons-6.7.0-dont-access-QDBusMessage.patch 1614 BLAKE2B 72e14dce1bef06b3245bac257add5244cc0998c8a8c6c474da42663a201a0c5c423aa58c7c8b867a5a7d7f9908729b803135821a7c25663ac7228d479ecda7c2 SHA512 f9ac9b330a2569a7bb09868233d9498a6afcca4240e54e9b58df2e4b4cc763a6aa6ae43b22a34a4e6cf089155d55e3c08680087fed1fd8cc9e9e84a5e83c0bb6
 DIST kguiaddons-5.116.0.tar.xz 78472 BLAKE2B 5ebfeeda5ce828dbfb8ca6ccabd35b3a3e67fda861d82e2da7f2d7ff6050ec449c03cf4c09a5407a9955a1f905e369fbdb1badd324e3d37ab95d184037089c7d SHA512 6a09bd6b7a3142827e9e44b1526daf945b6b777d091e0c7926fb48604c1ca586c6acc3282b5c8cabec24fba0be3c78e32141ea3307c79d84465718222bd8af04
 DIST kguiaddons-6.6.0.tar.xz 82524 BLAKE2B af5f77f5a88cc5842a822cdcb21415d706c02715b572982f5eb12a48588b5a26c33b6b384ec316299fa4d2f8275e88341a8790846797431c3435cba9e1f2289d SHA512 3812731e13b14ad1dea79e467b850a9ce39d376e2581d3d89fcffe326b474e3f52ff2639ac7b90619d68c29ab2a3d191bf5ed9ae8000449cc191f692726e98ab
 DIST kguiaddons-6.7.0.tar.xz 84996 BLAKE2B edccbaef983b8056b37343e1394b21f17b5a2a6755ea4e8e769164a254ad1551bfe523fab27d305380e4019dcfa35f50b5e165dcc2417651e7b8021d61630b4a SHA512 673bc8dca39ec8149c73f3b8f08e401b7590f1dd6cf341dfb018f32c03da4cf8e816478dc6ca239ff7329255484a1b18e9612bd01c387a1558ec251063d3ff01
@@ -5,6 +6,7 @@ DIST kguiaddons-6.8.0.tar.xz 85056 BLAKE2B 32cf6f101af6523a6ccb725b66526b65933d5
 EBUILD kguiaddons-5.116.0-r1.ebuild 1116 BLAKE2B e419eabe3d68a01f60a713b060e14f598f4c10930d9cceb2bc528030246697596c2692f12b0696c2689058fb10e238032249559014fd11000b0a1395b1684491 SHA512 7820acda8a45d4665ebc80bb2522d725e806e856fe749156e1d22f22e4f91c05d269766bbebc2138a2694662b40682fd842fdafab483e401d069bae3adc3462b
 EBUILD kguiaddons-5.116.0.ebuild 1115 BLAKE2B 9d5a1d92d8827a60b5dcfd4d4f397fc4b516ad022d3fc275ba7804d68d167f6c7f1d23a03ce391aea0cb0b9bfe0c09d71078d3f2428e55b6b56be4ef024975f5 SHA512 6f3baaa42f8616725d71c7b7899d74b739255662377bd34ff58188caf3869d2fa593921f4daa9a263d140c584c1f9e5f4b4fcfd5ff6cbca74ba5235a27e77ad9
 EBUILD kguiaddons-6.6.0.ebuild 1040 BLAKE2B fd9370b9cc5b9dd2ab47ba616d06381f19e2cdcc3a6d742ed3037951020099bf7f72b13817f8e18d8773b5772b09a5061210505a808621329a384b9bd51080a0 SHA512 5301f29e9a35664fffff5961bfd19e1e74c9dae3bfd16e32d7c011b2d693df6c78fa435b860fe4bce5ecaf6744faac395e45b5708db455354a3786177255ca3b
+EBUILD kguiaddons-6.7.0-r1.ebuild 1153 BLAKE2B abc2445a1fdec015052131828613aeccbb09cd1ab7169f7b4e6a098b0a26f1d55dae217c92ab5db9e482812379c23e7d1ca159890b7c4474e2ae21146f4d7c07 SHA512 043954ec8e337800ad6ab0b75c35d580f88b598713d3d4dd041fb727af977c67554536088d3e9f043053ef41770a305d867bcddde0f564da87dddad100f82107
 EBUILD kguiaddons-6.7.0.ebuild 1077 BLAKE2B 1910f9c9579a85ab5e8687a417071b686b105555f2874bb27b76dd9d3b95e690ee678da713c14342bcb2ca13322dc39266d5c3b08d2d09e187ae4c61f3935a47 SHA512 59c7fdf65cdb1e09b9efc0ad454165716877b7f5442470650984dd4f0c129d9969cb5097824b5ae8423043581a651d7470c3b764724d0c1958212d97eef0a32c
-EBUILD kguiaddons-6.8.0.ebuild 1078 BLAKE2B 9f9e006d9825affd01d04b8e072d83555daf8f20645d314668a50df6b10543a3b805947207a94437672eb6ff893810add6210061ac3ed680bccff90ae3dc76c8 SHA512 e4938f6471cb5bb531b54fe20c176373ad248487265a75926d4584f1457b62f1ea1620ff7aa2956bb69322fa0bc05d2c18959d944e80708ed9fca92489bd8c7a
+EBUILD kguiaddons-6.8.0-r1.ebuild 1161 BLAKE2B fa8cddef786df9c2571bd51ce9d5cfad33dfbca31d54012c6efdfd231850a02594961682a9146c712a5d4cc4848ed2f56f1b6bf16b5ff42f89630fa9ba3b39a6 SHA512 3cd996bebc15ee40f2adb1bf91031c24a7dcd80ef274f2cbdb90cb97f9146c550bcfc70a5a523e3268dc4512989e1745a8415eba22f8bed3872e5ef4561047dd
 MISC metadata.xml 575 BLAKE2B 040d93d8f8e1d2c97c4e84e322884b676648cc1c7639a87986ac40f3056bf9616f30fb70d7dd7e69a9b7bed344de0ad6a08fa7569e576543c957da8abb779698 SHA512 f82968e1bf26f71e9a67718b4220e777075b86480304997ac4ed1dbebb5eab1251d2c45dab43d661564bde8961405eb1f979aafc84abd1fb7e2717e140a80d28
diff --git a/kde-frameworks/kguiaddons/files/kguiaddons-6.7.0-dont-access-QDBusMessage.patch b/kde-frameworks/kguiaddons/files/kguiaddons-6.7.0-dont-access-QDBusMessage.patch
new file mode 100644
index 000000000000..c55d0a57ccf4
--- /dev/null
+++ b/kde-frameworks/kguiaddons/files/kguiaddons-6.7.0-dont-access-QDBusMessage.patch
@@ -0,0 +1,42 @@
+From 91c23a57f39103201d305480eb24039942a376ad Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Julius=20K=C3=BCnzel?= <julius.kuenzel@kde.org>
+Date: Sat, 2 Nov 2024 17:17:09 +0100
+Subject: [PATCH] Don't try to access QDBusMessage if not successful reply
+
+In case it is a ErrorMessage the arguments QList is empty and calling
+reply.first() will cause a crash
+---
+ src/colors/kcolorschemewatcher_xdg.cpp | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/src/colors/kcolorschemewatcher_xdg.cpp b/src/colors/kcolorschemewatcher_xdg.cpp
+index 60693ad..535a54e 100644
+--- a/src/colors/kcolorschemewatcher_xdg.cpp
++++ b/src/colors/kcolorschemewatcher_xdg.cpp
+@@ -8,6 +8,7 @@
+ 
+ #include <QDBusConnection>
+ #include <QDBusMessage>
++#include <QDBusReply>
+ #include <QDBusVariant>
+ #include <QDebug>
+ 
+@@ -27,10 +28,12 @@ KColorSchemeWatcherXDG::KColorSchemeWatcherXDG()
+                                                     QStringLiteral("Read"));
+     m.setArguments({QStringLiteral("org.freedesktop.appearance"), QStringLiteral("color-scheme")});
+ 
+-    auto reply = QDBusConnection::sessionBus().call(m);
++    QDBusReply<QDBusVariant> reply = QDBusConnection::sessionBus().call(m);
+ 
+-    const uint result = reply.arguments().first().value<QDBusVariant>().variant().value<QDBusVariant>().variant().toUInt();
+-    m_preference = fdoToInternal(result);
++    if (reply.isValid()) {
++        const uint result = reply.value().variant().toUInt();
++        m_preference = fdoToInternal(result);
++    }
+ }
+ 
+ KColorSchemeWatcher::ColorPreference KColorSchemeWatcherXDG::systemPreference() const
+-- 
+GitLab
+
diff --git a/kde-frameworks/kguiaddons/kguiaddons-6.7.0-r1.ebuild b/kde-frameworks/kguiaddons/kguiaddons-6.7.0-r1.ebuild
new file mode 100644
index 000000000000..2380592d3ddc
--- /dev/null
+++ b/kde-frameworks/kguiaddons/kguiaddons-6.7.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_NONGUI="false"
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework providing assorted high-level user interface components"
+
+LICENSE="LGPL-2+"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="dbus wayland X"
+
+# slot op: includes qpa/qplatformnativeinterface.h
+COMMON_DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus?,gui]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	wayland? (
+		dev-libs/wayland
+		>=dev-qt/qtbase-${QTMIN}:6=[wayland]
+		>=dev-qt/qtwayland-${QTMIN}:6
+	)
+	X? (
+		>=dev-qt/qtbase-${QTMIN}:6[X]
+		x11-libs/libX11
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	wayland? ( >=dev-libs/plasma-wayland-protocols-1.11.1 )
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libxcb
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!${CATEGORY}/${PN}:5[-kf6compat(-)]
+"
+BDEPEND="wayland? ( >=dev-qt/qtwayland-${QTMIN}:6 )"
+
+PATCHES=( "${FILESDIR}/${P}-dont-access-QDBusMessage.patch" ) # bug 944927
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_GEO_SCHEME_HANDLER=ON
+		-DUSE_DBUS=$(usex dbus)
+		-DWITH_WAYLAND=$(usex wayland)
+		-DWITH_X11=$(usex X)
+	)
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kguiaddons/kguiaddons-6.8.0.ebuild b/kde-frameworks/kguiaddons/kguiaddons-6.8.0-r1.ebuild
index 4bad8bb27a3b..fd1f55fe7b9d 100644
--- a/kde-frameworks/kguiaddons/kguiaddons-6.8.0.ebuild
+++ b/kde-frameworks/kguiaddons/kguiaddons-6.8.0-r1.ebuild
@@ -39,6 +39,8 @@ RDEPEND="${COMMON_DEPEND}
 "
 BDEPEND="wayland? ( >=dev-qt/qtwayland-${QTMIN}:6 )"
 
+PATCHES=( "${FILESDIR}/${PN}-6.7.0-dont-access-QDBusMessage.patch" ) # bug 944927
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_GEO_SCHEME_HANDLER=ON
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 86a34245dea4..86f5d7ead44a 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -6,5 +6,5 @@ DIST kio-6.8.0.tar.xz 3365712 BLAKE2B fe3877b21522d1899706fcbf9ccdec1355e4cd2f15
 EBUILD kio-5.116.0-r3.ebuild 2553 BLAKE2B 00f8a7e7628245687041a2117fb749c29fb73e1c320a35a62c3ddd8ea80d3d930ef4066d83b8bcd43228921b1a7d808b92183acb041bfee213c0aaabf5d6565c SHA512 345b937eb558f08abf88952a5e86b8747efed855647859a1986ad636fea5b3640fff1ba57ecda2ea3b04284ccb5a66edf40f806753bc2bcda7e321a036a82a92
 EBUILD kio-6.6.0.ebuild 2394 BLAKE2B 1bfe3cc4c2a3bb2b6763afe43b18f203d81c2efddc3c3d4725e5a20992f09855ed38bca86e81974b348e4bff2bbfdd468a6b8a50fabda8b3d202ac051489441c SHA512 c49d0edf60ebbb099f2abc1c40b2e4dde9f2aa13e24318c43e9c4dd00f5a2820f2ddc8d03026b089980e93608e3bca39891b6836fef881320520420e43d2193e
 EBUILD kio-6.7.0.ebuild 2399 BLAKE2B d02c66376fa55946a4c47c2064fd936a5d520f6cd25ea26f7dc47d3fb7e8e3108eb25c06c27ee146a473ae6d6b9b7d995404f87d74ecc07c10559223e0e08174 SHA512 d8a1fe1b6f92f2abf5587a851be3fcc5cc2c8cc4d3adecb66ec415c921987a4cdcb181c1e48b25f7e288f4d8133efb5babebe4a180417a1dd6bbca05ec931ea1
-EBUILD kio-6.8.0.ebuild 2325 BLAKE2B 03913795f7548e3b530b550b404394cc6675b498fe9034cf27e7682468da2e0b888e66b5973510343a648f3478665bea66a3cc44dea7cabbced987ff1be14bc9 SHA512 9ac8b37303daff99d0d4ed8bda6a2194b8ba0e465c4c1464f5bc1daced87bfb4b852bfbf5cba77e426c47539d92591f2a9859c2f8c63c186609850ad62c89028
+EBUILD kio-6.8.0-r1.ebuild 2566 BLAKE2B d6ff0d8ba8827d61dbdfc2a79037b83d9f5e6199a879dd332a4e526dd8c9fe0612843910439f13e19f90efb4d9263f8b8ff28b492b2d1bfcb5c8402c290d52c9 SHA512 0fd4ea7e3d3cc5e55a147b8fae61a4f3cfc47ccfb702b537ba1541e241f19e371c4803d43ddfe745a47172cbb698bfec511f96424e2dccdb5b60ee6990195612
 MISC metadata.xml 672 BLAKE2B ed652f6e5751355ab96a5206da0184e37745e4b675e7f235648536931563b53c4f71112e81f809c88d02d01f9c77a20e9f41a2f6eb988b104636c8d450c50a18 SHA512 1fa6b33c8f146152015b0c8dbd70165022ceee580253850545c79eb3a74dbf44539e562014606a4ef4ea283a42f3946b1d3a79c0953a38fe10689137a53207ce
diff --git a/kde-frameworks/kio/kio-6.8.0.ebuild b/kde-frameworks/kio/kio-6.8.0-r1.ebuild
index 563295203958..9d429efc766f 100644
--- a/kde-frameworks/kio/kio-6.8.0.ebuild
+++ b/kde-frameworks/kio/kio-6.8.0-r1.ebuild
@@ -66,7 +66,13 @@ RDEPEND="${COMMON_DEPEND}
 	>=dev-qt/qtbase-${QTMIN}:6[libproxy]
 	sys-power/switcheroo-control
 "
-PDEPEND=">=kde-frameworks/kded-${PVCUT}:6"
+# bug 944812: File Properties is accessible from KFileWidget (KIO); this
+# provides access to keditfiletype binary via KWidgetsAddons (Tier1)
+# Typical KIO revdeps (dolphin, krusader et al.) can rely on this dep
+PDEPEND="
+	>=kde-frameworks/kded-${PVCUT}:6
+	kde-plasma/keditfiletype
+"
 
 src_configure() {
 	local mycmakeargs=(