commit: 59ec2ffa5430c753c4ea92b3b7b2579ce8863589 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Dec 19 12:29:24 2023 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Dec 19 12:34:35 2023 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=59ec2ffa
kde-plasma/plasma-desktop: Fix cmake with USE=X Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> ...asma-desktop-5.90.0-override-include-dirs.patch | 37 ++++++++++++++++++++-- .../plasma-desktop/plasma-desktop-9999.ebuild | 13 +++++--- 2 files changed, 44 insertions(+), 6 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 index 2a99b99ac4..de53c25d01 100644 --- 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 @@ -1,4 +1,4 @@ -From fc3c2a00c5a2543fea4780fcffa709d3b1b76d7c Mon Sep 17 00:00:00 2001 +From 45f2c2ce1fc9d4b2f0d6418a95f04a71337239d4 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner <[email protected]> Date: Mon, 6 Apr 2020 00:41:07 +0200 Subject: [PATCH] Replace input drivers pkg_check_modules calls with manual @@ -12,8 +12,10 @@ 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 +- - 3 files changed, 24 insertions(+), 8 deletions(-) + 5 files changed, 24 insertions(+), 17 deletions(-) create mode 100644 config-gentoo.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt @@ -66,6 +68,37 @@ index 000000000..0d7353c27 +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 diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild index 8fc6f3dc2a..e76da098fc 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild @@ -143,18 +143,23 @@ src_prepare() { src_configure() { local mycmakeargs=( -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt6=ON # not packaged - -DEVDEV_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include - -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include - -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include $(cmake_use_find_package ibus GLIB2) $(cmake_use_find_package kaccounts AccountsQt6) - $(cmake_use_find_package kaccounts KAccounts) + $(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 }
