gentoo auto-resync : 05:12:2024 - 02:07:17

3 files changed, 96 insertions, 2 deletions

diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index dc8c71cc49fb..f990abeb6ee2 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,7 +1,8 @@
 AUX plasma-desktop-6.1.80-override-include-dirs.patch 3470 BLAKE2B 9f3c9dff718499740271045e267f2e5d929a9b23e5fe8d2481238426c262da31ed1544ddb8b235a47cac2befbe39784224bd6bf49cab9409933ea6fec41719b3 SHA512 4ae89c84ca0c90d5660746bd97cae7d433bdb52c459d94caa5705b38ec077eca5c273e334859e27dc2230d410f6c6d926450ba961934a5f331cf79060e12d912
+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.4.tar.xz 16335912 BLAKE2B 95b7ca6b5c98f372ffe9c57f1d06bd0dc6ed7050891640fc4a523cc5373c904086f7c47cec84f168be2384798cde0eb6d8bdaa8f8cc0759baf3e52fdab888ffa SHA512 9a766a2799bc96a803433a649884307fc40eb4e5d3c10578a3568ab433833b2a65462b5efb9275295dba5384eccb0365c52e7d98d42374c297adee9f42678f1e
 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.4.ebuild 5435 BLAKE2B 2890eb498c41f356056f9d4d73b595d3f297e68cc185a5a744c005f3bad5ed1bc118d03761c3e86fecdbbf863ef89655976f2c7c625f45968df3e79d25852bb9 SHA512 557b7c46a64d617bd805fbcedba4935c3d9230c92c9bf2c80a41db554d5b82dc7f1942d82411cf93def911c6e18f4e72bfb9a087b5b1afeb9cf17060deb1731d
+EBUILD plasma-desktop-6.2.4.ebuild 5433 BLAKE2B bb8e4dacad307d682945ece53ce0b19657c021e1d83ae0772d8d08ea12775d19607d022dde086bc83c340ab7f4a9c96ff7e6e9ccfee0a7f945b185afe3082d36 SHA512 245f2941d4e1ce09dd8e5b83cdccbb8acf9f7a946fff6ef2a7c1f6164ce8d197039d0ea164186af9fea8cbc971d494323baaa6e2ffaa33ed67108dedd206dd99
 MISC metadata.xml 560 BLAKE2B 04dc70f5284d8fc3e486718b5eb17ee773f90ff807828640f7ff63c0dffcc3bbe4f84600262d4f11ccb6df8d3af5e69aac1b81ddfd2a5ec50dee9bbbb5a5f656 SHA512 7a1df153e7327f1c3fcf7e5027745612bf6c7c24ceb66b71aec77ceecf43aada94f8dba7a33bac72524067845691831ec5cda411650fd9e834245d7d3dd86f0e
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.4.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-6.2.4.ebuild
index f22e598f9785..e1a4f33a3d79 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-6.2.4.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-6.2.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="ibus input_devices_wacom scim screencast sdl +semantic-desktop webengine"
 
 RESTRICT="test" # missing selenium-webdriver-at-spi