commit: 6ecbad44e5fd2a653bcb5e0f43c6411d99e22da9 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Jan 15 12:22:48 2023 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Jan 15 13:04:32 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ecbad44
kde-plasma/libksysguard: Drop IUSE X kde-frameworks/kwindowsystem[X] is unconditional through use of KX11Extras Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../files/libksysguard-5.26.0-with_x11.patch | 110 --------------------- ...5.26.5.ebuild => libksysguard-5.26.5-r1.ebuild} | 19 ++-- 2 files changed, 7 insertions(+), 122 deletions(-) diff --git a/kde-plasma/libksysguard/files/libksysguard-5.26.0-with_x11.patch b/kde-plasma/libksysguard/files/libksysguard-5.26.0-with_x11.patch deleted file mode 100644 index d27504413384..000000000000 --- a/kde-plasma/libksysguard/files/libksysguard-5.26.0-with_x11.patch +++ /dev/null @@ -1,110 +0,0 @@ -From c389fbdaff34e35b0cd5de32b52e818714e13d40 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <[email protected]> -Date: Mon, 1 Aug 2022 16:53:42 +0200 -Subject: [PATCH] Add CMake option to build WITH_X11 - -We want to be able to build without X11 support even if some of the used -libraries may not work w/o X11 themselves yet or need to be built with -X11 support for other reverse dependencies. - -HAVE_X11 already exists and is set automagically so far, but using --DCMAKE_DISABLE_FIND_PACKAGE_X11 will break if any dependencies list X11 -as required in their cmake config. - -- Cleanup HAVE_* definitions a bit -- Clarify X11 PURPOSE a bit - -Signed-off-by: Andreas Sturmlechner <[email protected]> ---- - CMakeLists.txt | 44 ++++++++++++++++++++++------------------ - processui/CMakeLists.txt | 4 ++-- - 2 files changed, 26 insertions(+), 22 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 55938c4..5d4e085 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -65,25 +65,31 @@ ecm_setup_version(${PROJECT_VERSION} - SOVERSION 9 - ) - --find_package(X11) --set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries" -- URL "https://www.x.org"; -- TYPE OPTIONAL -- PURPOSE "Required for building the X11 based workspace" -- ) --if(X11_FOUND) -- if (QT_MAJOR_VERSION STREQUAL "5") -- find_package(Qt5X11Extras REQUIRED) -- elseif (QT_MAJOR_VERSION STREQUAL "6") -- find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui) # qtx11extras_p.h -- endif() -- set(HAVE_X11 1) -- find_library(X11_XRes_LIB XRes ${X11_LIB_SEARCH_PATH}) -- find_path(X11_XRes_INCLUDE_PATH X11/extensions/XRes.h ${X11_INC_SEARCH_PATH}) -- -- if(X11_XRes_LIB AND X11_XRes_INCLUDE_PATH) -- set(X11_XRes_FOUND TRUE) -+option(WITH_X11 "Build with X11 support." ON) -+if(WITH_X11) -+ find_package(X11) -+ set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries" -+ URL "https://www.x.org"; -+ TYPE OPTIONAL -+ PURPOSE "Required for building Process UI with X11 support" -+ ) -+ if(X11_FOUND) -+ if (QT_MAJOR_VERSION STREQUAL "5") -+ find_package(Qt5X11Extras REQUIRED) -+ elseif (QT_MAJOR_VERSION STREQUAL "6") -+ find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui) # qtx11extras_p.h -+ endif() -+ set(HAVE_X11 1) -+ find_library(X11_XRes_LIB XRes ${X11_LIB_SEARCH_PATH}) -+ find_path(X11_XRes_INCLUDE_PATH X11/extensions/XRes.h ${X11_INC_SEARCH_PATH}) -+ -+ if(X11_XRes_LIB AND X11_XRes_INCLUDE_PATH) -+ set(HAVE_XRES 1) -+ endif() - endif() -+else() -+ set(HAVE_X11 0) -+ set(HAVE_XRES 0) - endif() - - set(WEBENGINE_SCRIPTING_ENABLED FALSE) -@@ -122,8 +128,6 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") - PURPOSE "Used for reading hardware sensors") - endif() - --set(HAVE_X11 ${X11_FOUND}) --set(HAVE_XRES ${X11_XRes_FOUND}) - configure_file(config-ksysguard.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ksysguard.h ) - - option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON) -diff --git a/processui/CMakeLists.txt b/processui/CMakeLists.txt -index 2932733..c9bd800 100644 ---- a/processui/CMakeLists.txt -+++ b/processui/CMakeLists.txt -@@ -30,7 +30,7 @@ ki18n_wrap_ui( processui_LIB_SRCS - add_library(processui ${processui_LIB_SRCS}) - add_library(KSysGuard::ProcessUi ALIAS processui) - --if(X11_XRes_FOUND) -+if(HAVE_XRES) - target_link_libraries(processui PRIVATE ${X11_XRes_LIB} ${X11_LIBRARIES}) - include_directories(${X11_XRes_INCLUDE_PATH}) - endif() -@@ -59,7 +59,7 @@ target_include_directories(processui - "$<BUILD_INTERFACE:${libksysguard_SOURCE_DIR}>" - "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/ksysguard>" - ) --if(X11_FOUND) -+if(HAVE_X11) - if (QT_MAJOR_VERSION STREQUAL "5") - target_link_libraries(processui PRIVATE Qt::X11Extras KF5::WindowSystem) - else() --- -2.35.1 - diff --git a/kde-plasma/libksysguard/libksysguard-5.26.5.ebuild b/kde-plasma/libksysguard/libksysguard-5.26.5-r1.ebuild similarity index 83% rename from kde-plasma/libksysguard/libksysguard-5.26.5.ebuild rename to kde-plasma/libksysguard/libksysguard-5.26.5-r1.ebuild index d9c38f3b05fc..43bb682c183b 100644 --- a/kde-plasma/libksysguard/libksysguard-5.26.5.ebuild +++ b/kde-plasma/libksysguard/libksysguard-5.26.5-r1.ebuild @@ -15,8 +15,9 @@ DESCRIPTION="Task management and system monitoring library" LICENSE="LGPL-2+" SLOT="5/9" KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="webengine X" +IUSE="webengine" +# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras COMMON_DEPEND=" dev-libs/libnl:3 >=dev-qt/qtdbus-${QTMIN}:5 @@ -24,6 +25,7 @@ COMMON_DEPEND=" >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtnetwork-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 >=kde-frameworks/kauth-${KFMIN}:5 >=kde-frameworks/kcompletion-${KFMIN}:5 >=kde-frameworks/kconfig-${KFMIN}:5[qml] @@ -34,24 +36,21 @@ COMMON_DEPEND=" >=kde-frameworks/knewstuff-${KFMIN}:5 >=kde-frameworks/kpackage-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5[X] net-libs/libpcap sys-apps/lm-sensors:= sys-libs/libcap sys-libs/zlib + x11-libs/libX11 + x11-libs/libXres webengine? ( >=dev-qt/qtwebchannel-${QTMIN}:5 >=dev-qt/qtwebengine-${QTMIN}:5 ) - X? ( - >=dev-qt/qtx11extras-${QTMIN}:5 - x11-libs/libX11 - x11-libs/libXres - ) " DEPEND="${COMMON_DEPEND} >=kde-frameworks/kiconthemes-${KFMIN}:5 - X? ( x11-base/xorg-proto ) + x11-base/xorg-proto " RDEPEND="${COMMON_DEPEND} !<kde-plasma/ksysguard-5.21.90:5 @@ -60,16 +59,12 @@ RDEPEND="${COMMON_DEPEND} PATCHES=( # downstream patch "${FILESDIR}/${PN}-5.22.80-no-detailed-mem-message.patch" - # pending upstream: - # https://invent.kde.org/plasma/libksysguard/-/merge_requests/238 - "${FILESDIR}/${PN}-5.26.0-with_x11.patch" ) src_configure() { local mycmakeargs=( $(cmake_use_find_package webengine Qt5WebChannel) $(cmake_use_find_package webengine Qt5WebEngineWidgets) - -DWITH_X11=$(usex X) ) ecm_src_configure
