commit: 336670543dcd9cbcacaff655a482320a88232853 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon May 20 18:44:09 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon May 20 19:18:32 2024 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=33667054
kde-plasma/plasma-desktop: Drop IUSE X, bump override-include-dirs to v4 IUSE X was very weak in the first place since still depending on libX11, and not even correct in some of the thought-to-be optional deps. Drop EVDEV, it is gone, backport a couple commits to 6.0 branch for dual use of the respun tarball. Closes: https://bugs.gentoo.org/929969 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> ...asma-desktop-5.90.0-override-include-dirs.patch | 117 --------------------- .../files/plasma-desktop-6.0.5-unused-dep.patch | 85 +++++++++++++++ .../plasma-desktop-6.0.49.9999.ebuild | 31 +++--- .../plasma-desktop/plasma-desktop-9999.ebuild | 30 ++---- 4 files changed, 108 insertions(+), 155 deletions(-) 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 de53c25d01..0000000000 --- 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 <ast...@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 0000000000..e88c78b49b --- /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 <jpe...@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 <ast...@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 <ast...@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.49.9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-6.0.49.9999.ebuild index 7b353b5d0a..a834758ab5 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-6.0.49.9999.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-6.0.49.9999.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="" -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 } diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild index fcf6719a4d..fbefa5b7a2 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.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="" -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,7 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}/${PN}-5.90.0-override-include-dirs.patch" # downstream patch + "${WORKDIR}/${XORGHDRS}/${PN}-6.0.80-override-include-dirs.patch" # downstream patch ) src_prepare() { @@ -145,24 +143,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 }
