gentoo auto-resync : 22:05:2024 - 00:06:25HEADmaster

4 files changed, 101 insertions, 139 deletions

diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 8af98b1b9279..a0dab71697ba 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,7 +1,8 @@
-AUX plasma-desktop-5.90.0-override-include-dirs.patch 3967 BLAKE2B 53d964e0a9c71da3a9a4e208b1d8638a9838451621c88ea690c15c018632987684e1c316bd6f25c46d3cff7e3dddcaabe2220bc895ca8c38fa689667ec960363 SHA512 7ac7072772827b97af87c28f8fff3bda8aee5ce09437da81b69ffcf18f93488db48a4bfb05a4b9285151ebb53c459e431c6cceb77d33220ea93e24fd355828c2
+AUX plasma-desktop-6.0.5-unused-dep.patch 2710 BLAKE2B 69c3cb6a6455fdeb2d2f8c70f0914f4729dbadfbb55411530f97206bff9aeddd56acb4c952a9add778ad0d86c7664762136ff314f2587ecbe60c0effcd1f003d SHA512 75764344336d18766ea71458b3c7063a690d05498f146b3eea5552705c6913e4b432a791aa09f943cc7bab15747fcf5151f9b8af594108d5d5ca5440d2a98a43
 DIST plasma-desktop-5.27.11.tar.xz 14729900 BLAKE2B 3c023febf5c6dc72fdd3ca3696d5c5c84c5c099e8d66497e9fccde601a23ec19fc001d6b48f9b1160946ab46e0436e54dc20a91c56dafae455e8455fa558bfc4 SHA512 644bfe2235dcfc591ae66fc7090ca1e67fc8dfe80033c1b0bedc32cd76299a3f47e6c74eadee7ce80241efb31d20b561d9c06af457aa36b6528548b4eaee3eb9
-DIST plasma-desktop-6.0.4.tar.xz 15635644 BLAKE2B e3f468a603290c5ceb8cd530b66b32438b8625a65d933e333ede107da69dc1f8d2bd117905a839f6abc7098a6fb19eb1d0cbf8439a375cee43b9f23675a1b253 SHA512 6e682e2ff91bda05331f581a36afbf1ea571c8855a27280d871e0ae1cd570373f5bb781d078c010d8cf74da0f062deabd9186b161a08a3178304ea6c50816860
+DIST plasma-desktop-6.0.5.tar.xz 15632868 BLAKE2B 9ece4d16440ecd9f38bad29dc5039439662abf9c872103d9faa58c742b1b93d7825ad4bf6716778c5a3881b877c30d58dcecbaef117fb9ade2ef7d804acece3c SHA512 59ab3e024a5a947603556d596f52bbcedbe94a997f67955583534ad4fce9c95c03e98e977f6df47be13d6014c55266c3f0fee88fdde682fe5d1036c170577499
 DIST plasma-desktop-override-include-dirs-3.tar.xz 8288 BLAKE2B f05ece81d1b744d45a21a5963750011c1e815156bcaac6075fa67451ba8ab1ea0fcc5ca59c8109c6fe65f9d4db6ac003bb7e26bf011e124c5f9b7f9e1b3afef5 SHA512 fbfc08a4c057dab3ef96e3c56d5e6087916e952ff32280c6e23c0822e18739441082894ea36412be04eda0893a4e10b9a0fbf0a10e0e44f046b6e872840c4dbb
+DIST plasma-desktop-override-include-dirs-4.tar.xz 6360 BLAKE2B 8d4340f7b520ec2a4d47d7679028d5d75ceb141877248f7c411a082197ca9c0735ff2d21bd30333236c50dcae8bbdabd41164daa392b803504d2707ffd013960 SHA512 5273df12260d90e7aacc90b9ed7f6f1868c8996e2609229c59a771b3fb541b720f53fe2c2198d9d91870b05d06797bc4b2cec5afcf97d8b2b754f0da197584a1
 EBUILD plasma-desktop-5.27.11.ebuild 5318 BLAKE2B 75da1ba8bec630d7d93b0a397b4905b547ad90e8b5b465f47a287b3c7b883e2ae18ed78924f267228d7c4e46b19a41e276c6e589370c265dbb35f61b3595ed4d SHA512 054fc42dee25b42b204d1fd1bbe329620c1fae0b55f8326dd3132f77f027399aac552b7e3598850c135a1fa4bd52878f619fdab5f9aafd46148fc90c82654da1
-EBUILD plasma-desktop-6.0.4.ebuild 5295 BLAKE2B 05f4053aed492794d9f5ec2f1cefe0a10324db9c9f18cbcfc0f6cbf0e76d68a35f98b9b926868148eda528a3ed92faea6fe529586f32446722821f8c86973ca6 SHA512 6fb688ffe2a4b74f0e2ae029ec7bc8063ebb97880c2b50dae3143ee9b4d2e986f2ec146a585e070c037188d7a85b3040523a1ef63f7fef27136d453d7bc464d1
+EBUILD plasma-desktop-6.0.5.ebuild 5250 BLAKE2B 8da9aaf6fd25cf18e0d2a34712b5912a8f53ccf698e6ea58532fec4e91989c9ebd3acde1944f95612c94bacc1f2eadca2df0950bf822e05daec915f3986787b1 SHA512 4590f680ff558c8370e587b4dbd4958fffb58c16d8239342538b4ae0bae15f6ed6a18ae4580bf1605177de93dcadc672d1a98e823822114e32cc89e9a7fbecbe
 MISC metadata.xml 560 BLAKE2B bf6910f40706c17989a0961c39073bd1bb00575b0bbd12c9a44c5ae8c699b33451dac36512afe8310c4bff5432864d16adb0f5b6b3f933b39705409547b05ee5 SHA512 0f34c3e91789674538cbac7f857ef57db8e1ca9b85b7e5d512b1a6af10fb218bfae01f65ae1825d26bb31103e7b95c0cf68fc3965c40952392afafcbf5877a25
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.90.0-override-include-dirs.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.90.0-override-include-dirs.patch
deleted file mode 100644
index de53c25d0114..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.90.0-override-include-dirs.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From 45f2c2ce1fc9d4b2f0d6418a95f04a71337239d4 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Mon, 6 Apr 2020 00:41:07 +0200
-Subject: [PATCH] Replace input drivers pkg_check_modules calls with manual
- targets
-
-All they need is one header each, allow include dir overrides.
-
-Evdev - evdev-properties.h
-XorgLibinput - libinput-properties.h
-XorgServer - xserver-properties.h
----
- CMakeLists.txt                   |  8 +-------
- config-gentoo.cmake              | 22 ++++++++++++++++++++++
- kcms/mouse/CMakeLists.txt        |  6 ------
- kcms/touchpad/CMakeLists.txt     |  3 ---
- kcms/touchpad/backends/x11.cmake |  2 +-
- 5 files changed, 24 insertions(+), 17 deletions(-)
- create mode 100644 config-gentoo.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b8868a130..ea950b050 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -224,16 +224,10 @@ set_package_properties(XCB PROPERTIES TYPE REQUIRED)
- add_feature_info("XCB-XKB" XCB_XKB_FOUND "Required for building kcm/keyboard")
- add_feature_info("libxft" X11_Xft_FOUND "X FreeType interface library required for font installation")
- 
--pkg_check_modules(XORGLIBINPUT xorg-libinput IMPORTED_TARGET)
--pkg_check_modules(EVDEV xorg-evdev>=2.8.99.1 IMPORTED_TARGET)
--pkg_check_modules(XORGSERVER xorg-server IMPORTED_TARGET)
-+include(config-gentoo.cmake)
- 
- ecm_find_qmlmodule(org.kde.pipewire 0.1)
- 
--if(XORGLIBINPUT_FOUND)
--  set(HAVE_XORGLIBINPUT 1)
--endif()
--
- include(ConfigureChecks.cmake)
- 
- find_package(PackageKitQt6)
-diff --git a/config-gentoo.cmake b/config-gentoo.cmake
-new file mode 100644
-index 000000000..0d7353c27
---- /dev/null
-+++ b/config-gentoo.cmake
-@@ -0,0 +1,22 @@
-+if(BUILD_KCM_MOUSE_X11)
-+    add_library(PkgConfig::XORGLIBINPUT INTERFACE IMPORTED)
-+    set_property(TARGET PkgConfig::XORGLIBINPUT PROPERTY
-+                INTERFACE_INCLUDE_DIRECTORIES "${XORGLIBINPUT_INCLUDE_DIRS}"
-+                )
-+
-+    add_library(PkgConfig::EVDEV INTERFACE IMPORTED)
-+    set_property(TARGET PkgConfig::EVDEV PROPERTY
-+                INTERFACE_INCLUDE_DIRECTORIES "${EVDEV_INCLUDE_DIRS}"
-+                )
-+endif()
-+
-+if(BUILD_KCM_TOUCHPAD_X11)
-+    add_library(PkgConfig::XORGSERVER INTERFACE IMPORTED)
-+    set_property(TARGET PkgConfig::XORGSERVER PROPERTY
-+                INTERFACE_INCLUDE_DIRECTORIES "${XORGSERVER_INCLUDE_DIRS}"
-+                )
-+endif()
-+
-+if(BUILD_KCM_MOUSE_X11 OR BUILD_KCM_TOUCHPAD_X11)
-+    set(HAVE_XORGLIBINPUT 1)
-+endif()
-diff --git a/kcms/mouse/CMakeLists.txt b/kcms/mouse/CMakeLists.txt
-index 639981380..2c9009061 100644
---- a/kcms/mouse/CMakeLists.txt
-+++ b/kcms/mouse/CMakeLists.txt
-@@ -32,12 +32,6 @@ if (BUILD_KCM_MOUSE_KWIN_WAYLAND)
- endif()
- 
- if (BUILD_KCM_MOUSE_X11)
--    if (NOT EVDEV_FOUND)
--        list(APPEND MISSING_DEPS "xorg-evdev")
--    endif()
--    if (NOT XORGLIBINPUT_FOUND)
--        list(APPEND MISSING_DEPS "xorg-libinput")
--    endif()
-     if (NOT X11_Xi_FOUND)
-         list(APPEND MISSING_DEPS "X11_Xi")
-     endif()
-diff --git a/kcms/touchpad/CMakeLists.txt b/kcms/touchpad/CMakeLists.txt
-index 309cb247d..33b4f8428 100644
---- a/kcms/touchpad/CMakeLists.txt
-+++ b/kcms/touchpad/CMakeLists.txt
-@@ -17,9 +17,6 @@ if (BUILD_KCM_TOUCHPAD_X11)
-     if (NOT X11_Xi_FOUND)
-         list(APPEND MISSING_DEPS "X11_Xi")
-     endif()
--    if (NOT XORGSERVER_FOUND)
--        list(APPEND MISSING_DEPS "xorg-server")
--    endif()
-     if (MISSING_DEPS)
-         message(FATAL_ERROR "Missing X11 dependencies for kcm_touchpad: ${MISSING_DEPS}. Install dependencies or set CMake option -DBUILD_KCM_TOUCHPAD_X11=OFF.")
-     endif()
-diff --git a/kcms/touchpad/backends/x11.cmake b/kcms/touchpad/backends/x11.cmake
-index 88bf0c676..33be94c49 100644
---- a/kcms/touchpad/backends/x11.cmake
-+++ b/kcms/touchpad/backends/x11.cmake
-@@ -10,7 +10,7 @@ SET(backend_SRCS
-     backends/x11/xrecordkeyboardmonitor.cpp
- )
- 
--if (XORGLIBINPUT_FOUND)
-+if (HAVE_XORGLIBINPUT)
- 
-     SET(backend_SRCS
-         ${backend_SRCS}
--- 
-2.43.0
-
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-6.0.5-unused-dep.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-6.0.5-unused-dep.patch
new file mode 100644
index 000000000000..e88c78b49be4
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-6.0.5-unused-dep.patch
@@ -0,0 +1,85 @@
+From 96d62f21f52e543dfb1f114988d4912ef321772f Mon Sep 17 00:00:00 2001
+From: Jakob Petsovits <jpetso@petsovits.com>
+Date: Thu, 4 Apr 2024 19:03:49 -0400
+Subject: [PATCH 1/2] kcms/mouse: Remove unused xorg-evdev dependency
+
+It's not necessary to access it directly anymore, now that we only
+expose settings for libinput.
+
+(cherry picked from commit b4fe3e9115856cdd8a67f11d1ab9b5246e2c4770)
+---
+ kcms/mouse/CMakeLists.txt     | 3 ---
+ kcms/mouse/backends/x11.cmake | 1 -
+ kcms/mouse/inputbackend.h     | 1 -
+ 3 files changed, 5 deletions(-)
+
+diff --git a/kcms/mouse/CMakeLists.txt b/kcms/mouse/CMakeLists.txt
+index 639981380..909ed815d 100644
+--- a/kcms/mouse/CMakeLists.txt
++++ b/kcms/mouse/CMakeLists.txt
+@@ -32,9 +32,6 @@ if (BUILD_KCM_MOUSE_KWIN_WAYLAND)
+ endif()
+ 
+ if (BUILD_KCM_MOUSE_X11)
+-    if (NOT EVDEV_FOUND)
+-        list(APPEND MISSING_DEPS "xorg-evdev")
+-    endif()
+     if (NOT XORGLIBINPUT_FOUND)
+         list(APPEND MISSING_DEPS "xorg-libinput")
+     endif()
+diff --git a/kcms/mouse/backends/x11.cmake b/kcms/mouse/backends/x11.cmake
+index 3b1601285..c402612de 100644
+--- a/kcms/mouse/backends/x11.cmake
++++ b/kcms/mouse/backends/x11.cmake
+@@ -11,7 +11,6 @@ set(backend_SRCS
+ set(backend_LIBS
+     ${backend_LIBS}
+     PkgConfig::XORGLIBINPUT
+-    PkgConfig::EVDEV
+     X11::X11
+     X11::Xi
+     X11::Xcursor
+diff --git a/kcms/mouse/inputbackend.h b/kcms/mouse/inputbackend.h
+index 579634d27..0a6e6ac6a 100644
+--- a/kcms/mouse/inputbackend.h
++++ b/kcms/mouse/inputbackend.h
+@@ -20,7 +20,6 @@ enum class InputBackendMode {
+ #endif
+ #if BUILD_KCM_MOUSE_X11
+     XLibinput = 1,
+-    XEvdev = 2,
+ #endif
+ };
+ 
+-- 
+2.45.1
+
+
+From fcc965d6a90822b2c6600bf2426dfb0c2b46021a Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 20 May 2024 18:41:57 +0200
+Subject: [PATCH 2/2] Cleanup remaining pkg_check_modules(EVDEV) call
+
+Amends 181b6c85ea6d46652b136462d5b6e0c9b56fc5c2 and b4fe3e9115856cdd8a67f11d1ab9b5246e2c4770
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+(cherry picked from commit 2242b7852f1ab746e4f6929e2fcd51b24b2ec37e)
+---
+ CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b475d3c5b..a515367a8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -226,7 +226,6 @@ add_feature_info("XCB-XKB" XCB_XKB_FOUND "Required for building kcm/keyboard")
+ add_feature_info("libxft" X11_Xft_FOUND "X FreeType interface library required for font installation")
+ 
+ pkg_check_modules(XORGLIBINPUT xorg-libinput IMPORTED_TARGET)
+-pkg_check_modules(EVDEV xorg-evdev>=2.8.99.1 IMPORTED_TARGET)
+ pkg_check_modules(XORGSERVER xorg-server IMPORTED_TARGET)
+ 
+ ecm_find_qmlmodule(org.kde.pipewire 0.1)
+-- 
+2.45.1
+
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-6.0.4.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-6.0.5.ebuild
index c1de5247a60d..f928f890a09a 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-6.0.4.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-6.0.5.ebuild
@@ -11,13 +11,13 @@ QTMIN=6.6.2
 inherit ecm plasma.kde.org optfeature
 
 DESCRIPTION="KDE Plasma desktop"
-XORGHDRS="${PN}-override-include-dirs-3"
+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"
-IUSE="ibus kaccounts scim screencast sdl +semantic-desktop X"
+IUSE="ibus kaccounts scim screencast sdl +semantic-desktop"
 
 RESTRICT="test" # missing selenium-webdriver-at-spi
 
@@ -74,13 +74,11 @@ COMMON_DEPEND="
 	>=kde-plasma/plasma5support-${PVCUT}:6
 	media-libs/libcanberra
 	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcursor
 	x11-libs/libXi
-	X? (
-		x11-libs/libxcb
-		x11-libs/libXcursor
-		x11-libs/libxkbcommon
-		x11-libs/libxkbfile
-	)
+	x11-libs/libxkbcommon
+	x11-libs/libxkbfile
 	ibus? (
 		app-i18n/ibus
 		dev-libs/glib:2
@@ -126,7 +124,8 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-5.90.0-override-include-dirs.patch" # downstream patch
+	"${FILESDIR}/${PN}-6.0.5-unused-dep.patch" # backport from 6.1/git master
+	"${WORKDIR}/${XORGHDRS}/${PN}-6.0.5-override-include-dirs.patch" # downstream patch
 )
 
 src_prepare() {
@@ -145,24 +144,18 @@ src_prepare() {
 
 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)
 		$(cmake_use_find_package kaccounts AccountsQt6)
 		$(cmake_use_find_package kaccounts KAccounts6)
 		$(cmake_use_find_package sdl SDL2)
 		$(cmake_use_find_package semantic-desktop KF6Baloo)
-		-DBUILD_KCM_MOUSE_X11=$(usex X)
-		-DBUILD_KCM_TOUCHPAD_X11=$(usex X)
 	)
 
-	if use X; then
-		mycmakeargs+=(
-			-DEVDEV_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-			-DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-			-DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		)
-	fi
-
 	ecm_src_configure
 }