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

4 files changed, 350 insertions, 0 deletions

diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 04702790840b..74805e4d63b0 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,7 +1,10 @@
 AUX plasma-desktop-6.1.80-override-include-dirs.patch 3470 BLAKE2B 9f3c9dff718499740271045e267f2e5d929a9b23e5fe8d2481238426c262da31ed1544ddb8b235a47cac2befbe39784224bd6bf49cab9409933ea6fec41719b3 SHA512 4ae89c84ca0c90d5660746bd97cae7d433bdb52c459d94caa5705b38ec077eca5c273e334859e27dc2230d410f6c6d926450ba961934a5f331cf79060e12d912
+AUX plasma-desktop-6.2.3-panel-fix-flexible-spacer.patch 2741 BLAKE2B d9d52f034be927ba1db8751b0e293c373bd66a7ef00655a7f15c1facb0b87f528e20f27f974093375d318cf8b26053996d0eaf1297c66a4bd72d1cbb78664530 SHA512 90f944b8ec53377f965998b4107e0369347055dfc9dc42c75b755fdf944d595463483ddc3eaa0c47bcd16af0b0a3f528f37b8bca9ab870d707a0a0a84ea8b3ff
+AUX plasma-desktop-6.2.3-tablet-kcm-optional.patch 3229 BLAKE2B f74fe4e69930e366911d09d7887486e7ab9c8517ecb628246833d510da7f5c114ea3c6dfd71c32c3d8f3e7c9205ece26618e077b7bac97b23ca7a1e73cec5103 SHA512 1bc677637d9eb1bc929a805362d7d8b88c5479eac0652d45b38f538702197355f58ae3f14659af93afee2d6e25236b0c8e2a5fba0da1138710dd7830aa998e22
 DIST plasma-desktop-6.1.5.tar.xz 16144320 BLAKE2B 60b8ad791325e506551746790d23347c501caaa1550c470e5157e8902da07162691b30a36c53c6910d1daa32ea3e3801562d4acbf0feceaf35d72ad32662f809 SHA512 db5698874bd66be0194f868cc037af2521b924afb02a56036696504c2b3e8dec3d59ba9228203f7b0d08ffaaa36137f10081207fa79d748c5044b37063507b6f
 DIST plasma-desktop-6.2.3.tar.xz 16334344 BLAKE2B 4dfa7c55e6d2bedcc1a52057bc86663b014b1aff54450cc521f0cb79814c08c1bf449408b3161b32d1b157a026f80c1a96dab0aad892322754d725ae3a3b4cb9 SHA512 72e8af1b71d3ed7e22f14ec044108a5a49daa4764586549e878378f4b4ffdfde72ef83c862102571e576724748c712b40e2f6dc302dafe68eee50c401d3f7645
 DIST plasma-desktop-override-include-dirs-4.tar.xz 6360 BLAKE2B 8d4340f7b520ec2a4d47d7679028d5d75ceb141877248f7c411a082197ca9c0735ff2d21bd30333236c50dcae8bbdabd41164daa392b803504d2707ffd013960 SHA512 5273df12260d90e7aacc90b9ed7f6f1868c8996e2609229c59a771b3fb541b720f53fe2c2198d9d91870b05d06797bc4b2cec5afcf97d8b2b754f0da197584a1
 EBUILD plasma-desktop-6.1.5-r1.ebuild 5230 BLAKE2B 4e2a80948e6150c64e95529ba68de9107e274b5a05567bb834f621e24d9d2af9f2a4493eecf4e91f2c5638effc1e105ab40d8d9fb4b884ae79434875ce29f7d9 SHA512 f8abbeb311568051381a42b442928ddc05327cdb61c383e3a76543fa3b33a637a21cfe98a5cdff70dc80e4c22b2bf56d2bd340dc50d0588220c7e3604a35b57a
+EBUILD plasma-desktop-6.2.3-r1.ebuild 5497 BLAKE2B c331d4d27ef3f398a3da037d347dce3f73328503ab45c2878deb78a49a1630856308577208a48fb7bb6aad1b8f141e11007f705e130129b128b28595b24236a7 SHA512 bbd3a1d5e152e64bd854f52d745f2d163a29c762bc41a4ad860488b5508ac08e7f1ffb47677fe58f1efcf2e7512139dff9aa0b9193e1609b21b577749cf1f0f8
 EBUILD plasma-desktop-6.2.3.ebuild 5221 BLAKE2B db5dc4f8d2bd80d79164a6b376c199e3566c891a39135033be26b8a365b2023d8ec3dda70d4c18050ef15ac2af3f1f0aa154838fc8eb0b9c70b087c739ed1ac9 SHA512 29ba20714a5ee5ad2325320b95ad2485ef0c0e59b7fd10957445e1069a2cddbecb1b7a65ca0184be97da096ac0c6921a6d416256185b125ac1b0302958f08a96
 MISC metadata.xml 560 BLAKE2B 04dc70f5284d8fc3e486718b5eb17ee773f90ff807828640f7ff63c0dffcc3bbe4f84600262d4f11ccb6df8d3af5e69aac1b81ddfd2a5ec50dee9bbbb5a5f656 SHA512 7a1df153e7327f1c3fcf7e5027745612bf6c7c24ceb66b71aec77ceecf43aada94f8dba7a33bac72524067845691831ec5cda411650fd9e834245d7d3dd86f0e
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-6.2.3-panel-fix-flexible-spacer.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-6.2.3-panel-fix-flexible-spacer.patch
new file mode 100644
index 000000000000..185b1493102b
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-6.2.3-panel-fix-flexible-spacer.patch
@@ -0,0 +1,70 @@
+From 8789c9c2a847d2e1c83b8de7b915cf9888e68937 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Niccol=C3=B2=20Venerandi?= <niccolo@venerandi.com>
+Date: Thu, 7 Nov 2024 13:30:27 +0000
+Subject: [PATCH] Fill panel width/height in custom/fit content modes when
+ flexible spacer is in panel
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The flexible spacer should always make the panel gain its maximum
+width/height; this implements that.
+
+BUG:495378
+
+
+(cherry picked from commit 7d2e16b09d391b7bc979e447d21bc8747399c55d)
+
+Co-authored-by: Niccolò Venerandi <niccolo@venerandi.com>
+---
+ containments/panel/contents/ui/main.qml |  6 ++++++
+ desktoppackage/contents/views/Panel.qml | 14 ++++++++++++++
+ 2 files changed, 20 insertions(+)
+
+diff --git a/containments/panel/contents/ui/main.qml b/containments/panel/contents/ui/main.qml
+index 2570f9f520..e69131d6a6 100644
+--- a/containments/panel/contents/ui/main.qml
++++ b/containments/panel/contents/ui/main.qml
+@@ -26,6 +26,12 @@ ContainmentItem {
+ //BEGIN properties
+     Layout.preferredWidth: fixedWidth || currentLayout.implicitWidth + currentLayout.horizontalDisplacement
+     Layout.preferredHeight: fixedHeight || currentLayout.implicitHeight + currentLayout.verticalDisplacement
++    Layout.fillWidth: {
++        return currentLayout.children
++            .filter(child => child?.applet?.plasmoid?.pluginName === "org.kde.plasma.panelspacer")
++            .some(child => child.applet.plasmoid.configuration.expanding)
++    }
++    Layout.fillHeight: Layout.fillWidth
+ 
+     property Item toolBox
+     property var layoutManager: LayoutManager
+diff --git a/desktoppackage/contents/views/Panel.qml b/desktoppackage/contents/views/Panel.qml
+index 2083123282..a4fab11699 100644
+--- a/desktoppackage/contents/views/Panel.qml
++++ b/desktoppackage/contents/views/Panel.qml
+@@ -275,8 +275,22 @@ Item {
+                 return;
+             }
+             if (verticalPanel) {
++                if (containment.Layout.fillHeight) {
++                    if (panel.lengthMode == Panel.Global.Custom) {
++                        return panel.maximumHeight
++                    } else {
++                        return panel.screenGeometry.height
++                    }
++                }
+                 return containment.Layout.preferredHeight
+             } else {
++                if (containment.Layout.fillWidth) {
++                    if (panel.lengthMode == Panel.Global.Custom) {
++                        return panel.maximumWidth
++                    } else {
++                        return panel.screenGeometry.width
++                    }
++                }
+                 return containment.Layout.preferredWidth
+             }
+         }
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-6.2.3-tablet-kcm-optional.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-6.2.3-tablet-kcm-optional.patch
new file mode 100644
index 000000000000..b0d2f512ed9e
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-6.2.3-tablet-kcm-optional.patch
@@ -0,0 +1,93 @@
+From 5296ef03a9b14a6a9324d506d04f78e61e8512f6 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 4 Nov 2024 23:15:19 +0100
+Subject: [PATCH] cmake: Add BUILD_KCM_TABLET option to conditionalise Wayland
+ deps
+
+Follow-up to 240ca31717ebed55e43ffaf6ac906dea07e9f4c6
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+(cherry picked from commit 8f0e9b4d625024469b4fbd0468e767e45b464872)
+---
+ CMakeLists.txt      | 30 ++++++++++++++++++------------
+ kcms/CMakeLists.txt |  5 ++++-
+ 2 files changed, 22 insertions(+), 13 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6f764d1ef4..8222cfaed5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -40,6 +40,7 @@ option(BUILD_KCM_MOUSE_KWIN_WAYLAND "Build the Mouse KCM's KWin+Wayland backend"
+ option(BUILD_KCM_MOUSE_X11 "Build the Mouse KCM's X11 backend" ON)
+ option(BUILD_KCM_TOUCHPAD_KWIN_WAYLAND "Build the Touchpad KCM's KWin+Wayland backend" ON)
+ option(BUILD_KCM_TOUCHPAD_X11 "Build the Touchpad KCM's X11 backend" ON)
++option(BUILD_KCM_TABLET "Build the Tablet KCM" ON)
+ 
+ find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
+     Quick
+@@ -51,7 +52,10 @@ find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
+     Core5Compat
+     Sql # kcms/activities
+ )
+-find_package(Qt6 ${QT_MIN_VERSION} CONFIG OPTIONAL_COMPONENTS WaylandClient)
++
++if(BUILD_KCM_TABLET)
++    find_package(Qt6WaylandClient ${QT_MIN_VERSION} CONFIG REQUIRED)
++endif()
+ 
+ find_package(KF6 ${KF6_MIN_VERSION} REQUIRED COMPONENTS
+     Auth
+@@ -139,17 +143,19 @@ set_package_properties(KF6QQC2DesktopStyle PROPERTIES
+     TYPE RUNTIME
+ )
+ 
+-find_package(WaylandProtocols 1.25)
+-set_package_properties(WaylandProtocols PROPERTIES
+-    TYPE REQUIRED
+-    PURPOSE "Collection of Wayland protocols that add functionality not available in the Wayland core protocol"
+-    URL "https://gitlab.freedesktop.org/wayland/wayland-protocols/"
+-)
+-find_package(Wayland 1.2)
+-set_package_properties(Wayland PROPERTIES
+-    TYPE REQUIRED
+-    PURPOSE "Required for building Tablet input KCM"
+-)
++if(BUILD_KCM_TABLET)
++    find_package(WaylandProtocols 1.25)
++    set_package_properties(WaylandProtocols PROPERTIES
++        TYPE REQUIRED
++        PURPOSE "Collection of Wayland protocols that add functionality not available in the Wayland core protocol"
++        URL "https://gitlab.freedesktop.org/wayland/wayland-protocols/"
++    )
++    find_package(Wayland 1.2)
++    set_package_properties(Wayland PROPERTIES
++        TYPE REQUIRED
++        PURPOSE "Required for building Tablet input KCM"
++    )
++endif()
+ 
+ find_package(SDL2 2.0.16)
+ set_package_properties(SDL2 PROPERTIES
+diff --git a/kcms/CMakeLists.txt b/kcms/CMakeLists.txt
+index 5b204a7c19..cea880c139 100644
+--- a/kcms/CMakeLists.txt
++++ b/kcms/CMakeLists.txt
+@@ -26,7 +26,6 @@ add_subdirectory(kded)
+ add_subdirectory(runners)
+ add_subdirectory(spellchecking)
+ add_subdirectory(qtquicksettings)
+-add_subdirectory(tablet)
+ add_subdirectory(touchscreen)
+ 
+ add_subdirectory(workspaceoptions)
+@@ -42,3 +41,7 @@ endif()
+ if (BUILD_KCM_TOUCHPAD_KWIN_WAYLAND OR BUILD_KCM_TOUCHPAD_X11)
+     add_subdirectory(touchpad)
+ endif()
++
++if(BUILD_KCM_TABLET)
++    add_subdirectory(tablet)
++endif()
+-- 
+2.47.0
+
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-6.2.3-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-6.2.3-r1.ebuild
new file mode 100644
index 000000000000..b7e4dd945e2e
--- /dev/null
+++ b/kde-plasma/plasma-desktop/plasma-desktop-6.2.3-r1.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KFMIN=6.6.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=6.7.2
+inherit ecm plasma.kde.org optfeature
+
+DESCRIPTION="KDE Plasma desktop"
+XORGHDRS="${PN}-override-include-dirs-4"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="ibus input_devices_wacom scim screencast sdl +semantic-desktop webengine"
+
+RESTRICT="test" # missing selenium-webdriver-at-spi
+
+# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
+# kde-frameworks/kwindowsystem[X]: Uses KX11Extras
+COMMON_DEPEND="
+	dev-libs/icu:=
+	>=dev-qt/qt5compat-${QTMIN}:6[qml]
+	>=dev-qt/qtbase-${QTMIN}:6=[concurrent,dbus,gui,network,sql,widgets,xml]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-frameworks/attica-${KFMIN}:6
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kauth-${KFMIN}:6
+	>=kde-frameworks/kbookmarks-${KFMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kded-${KFMIN}:6
+	>=kde-frameworks/kglobalaccel-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemmodels-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/knotifyconfig-${KFMIN}:6
+	>=kde-frameworks/kpackage-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/krunner-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/ksvg-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/solid-${KFMIN}:6
+	>=kde-frameworks/sonnet-${KFMIN}:6
+	>=kde-plasma/kwin-${PVCUT}:6
+	>=kde-plasma/libksysguard-${PVCUT}:6
+	>=kde-plasma/libplasma-${PVCUT}:6
+	>=kde-plasma/plasma-activities-${PVCUT}:6
+	>=kde-plasma/plasma-activities-stats-${PVCUT}:6
+	>=kde-plasma/plasma-workspace-${PVCUT}:6[screencast?]
+	>=kde-plasma/plasma5support-${PVCUT}:6
+	media-libs/libcanberra
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcursor
+	x11-libs/libXi
+	x11-libs/libxkbcommon
+	x11-libs/libxkbfile
+	ibus? (
+		app-i18n/ibus
+		dev-libs/glib:2
+		x11-libs/xcb-util-keysyms
+	)
+	input_devices_wacom? (
+		dev-libs/wayland
+		>=dev-qt/qtwayland-${QTMIN}:6
+	)
+	scim? ( app-i18n/scim )
+	sdl? ( media-libs/libsdl2[joystick] )
+	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:6 )
+	webengine? (
+		kde-apps/kaccounts-integration:6
+		>=net-libs/accounts-qt-1.17[qt6(+)]
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	x11-base/xorg-proto
+	input_devices_wacom? ( >=dev-libs/wayland-protocols-1.25 )
+	test? (
+		>=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
+		>=kde-plasma/kactivitymanagerd-${PVCUT}:6
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-plasma/kdeplasma-addons-5.25.50
+	!<kde-plasma/plasma-workspace-6.0.80
+	dev-libs/kirigami-addons:6
+	>=dev-qt/qtwayland-${QTMIN}:6
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
+	>=kde-plasma/oxygen-${PVCUT}:6
+	kde-plasma/plasma-mimeapps-list
+	media-fonts/noto-emoji
+	sys-apps/util-linux
+	x11-apps/setxkbmap
+	x11-misc/xdg-user-dirs
+	screencast? ( >=kde-plasma/kpipewire-${PVCUT}:6 )
+	webengine? ( >=net-libs/signon-oauth2-0.25_p20210102[qt6(+)] )
+"
+BDEPEND="
+	dev-util/intltool
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	virtual/pkgconfig
+	input_devices_wacom? ( dev-util/wayland-scanner )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.1.80-override-include-dirs.patch" # downstream patch
+	"${FILESDIR}/${P}-tablet-kcm-optional.patch" # bug 942817
+	"${FILESDIR}/${P}-panel-fix-flexible-spacer.patch" # KDE-bug 495378
+)
+
+src_prepare() {
+	ecm_src_prepare
+
+	if ! use ibus; then
+		sed -e "s/XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \
+			-i applets/kimpanel/backend/ibus/CMakeLists.txt || die
+	fi
+
+	# TODO: try to get a build switch upstreamed
+	if ! use scim; then
+		sed -e "s/^pkg_check_modules.*SCIM/#&/" -i CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_KCM_MOUSE_X11=ON
+		-DBUILD_KCM_TOUCHPAD_X11=ON
+		-DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+		-DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt6=ON # not packaged
+		$(cmake_use_find_package ibus GLIB2)
+		-DBUILD_KCM_TABLET=$(usex input_devices_wacom)
+		$(cmake_use_find_package sdl SDL2)
+		$(cmake_use_find_package semantic-desktop KF6Baloo)
+		$(cmake_use_find_package webengine AccountsQt6)
+		$(cmake_use_find_package webengine KAccounts6)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# parallel tests fail, foldermodeltest,positionertest hang, bug #646890
+	# test_kio_fonts needs D-Bus, bug #634166
+	# lookandfeel-kcmTest is unreliable for a long time, bug #607918
+	local myctestargs=(
+		-j1
+		-E "(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)"
+	)
+
+	ecm_src_test
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "screen reader support" "app-accessibility/orca"
+	fi
+	ecm_pkg_postinst
+}