commit: 5e0a410c1ec9585a36bb31611cf3cc99ff4cc08a Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Nov 27 12:30:03 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Aug 2 09:55:09 2022 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=5e0a410c
kde-apps/kalarm: Fix build with USE -X Upstream commit 308aa74653acc86cd6a206599a56500c827927ef Bug: https://bugs.gentoo.org/813450 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../kalarm/files/kalarm-22.04.3-without_x11.patch | 75 ++++++++++++++++++++++ kde-apps/kalarm/kalarm-22.07.80.ebuild | 7 +- kde-apps/kalarm/kalarm-22.08.49.9999.ebuild | 7 +- kde-apps/kalarm/kalarm-9999.ebuild | 5 +- 4 files changed, 85 insertions(+), 9 deletions(-) diff --git a/kde-apps/kalarm/files/kalarm-22.04.3-without_x11.patch b/kde-apps/kalarm/files/kalarm-22.04.3-without_x11.patch new file mode 100644 index 0000000000..6dc0d4e02d --- /dev/null +++ b/kde-apps/kalarm/files/kalarm-22.04.3-without_x11.patch @@ -0,0 +1,75 @@ +From 308aa74653acc86cd6a206599a56500c827927ef Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <ast...@gentoo.org> +Date: Sat, 27 Nov 2021 12:59:32 +0100 +Subject: [PATCH] Add CMake option to build WITHOUT_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. + +KDEPIM_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. + +Introducing this option means there is no behavior change by default, +cmake will just skip finding X11 or adding unwanted features if the +option is enabled. + +Signed-off-by: Andreas Sturmlechner <ast...@gentoo.org> +--- + CMakeLists.txt | 21 +++++++++++++-------- + src/CMakeLists.txt | 2 +- + 2 files changed, 14 insertions(+), 9 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 05ef5181..c1849f2a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -127,18 +127,23 @@ endif() + configure_file(kalarm-version-string.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kalarm-version-string.h @ONLY) + + if (NOT APPLE) +- find_package(X11) +-endif() +-if (X11_FOUND) +- if (QT_MAJOR_VERSION STREQUAL "5") +- find_package(Qt5X11Extras ${QT_REQUIRED_VERSION} REQUIRED NO_MODULE) +- else() +- find_package(Qt${QT_MAJOR_VERSION} ${QT_REQUIRED_VERSION} CONFIG REQUIRED Gui) # qtx11extras_p.h for Qt6 < 6.2 ++ option(WITHOUT_X11 "Build without X11 integration (skips finding X11)" OFF) ++ if (NOT WITHOUT_X11) ++ find_package(X11) ++ set(KDEPIM_HAVE_X11 ${X11_FOUND}) ++ if (X11_FOUND) ++ if (QT_MAJOR_VERSION STREQUAL "5") ++ find_package(Qt5X11Extras ${QT_REQUIRED_VERSION} REQUIRED NO_MODULE) ++ else() ++ find_package(Qt${QT_MAJOR_VERSION} ${QT_REQUIRED_VERSION} CONFIG REQUIRED Gui) # qtx11extras_p.h for Qt6 < 6.2 ++ endif() ++ endif() + endif() ++ add_feature_info(WITHOUT_X11 ${WITHOUT_X11} "Build without X11 integration") + endif() ++ + set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) + +-set(KDEPIM_HAVE_X11 ${X11_FOUND}) + configure_file(src/config-kalarm.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kalarm.h) + + include_directories(${kalarm_SOURCE_DIR} ${kalarm_BINARY_DIR}) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 6bb3e5ba..9a3fb73c 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -335,7 +335,7 @@ if (ENABLE_WAKE_FROM_SUSPEND) + target_link_libraries(kalarm_bin KF5::AuthCore) + endif() + +-if(X11_FOUND) ++if(KDEPIM_HAVE_X11) + if (QT_MAJOR_VERSION STREQUAL "5") + target_link_libraries(kalarm_bin Qt${QT_MAJOR_VERSION}::X11Extras ${X11_X11_LIB}) + elseif (Qt6_VERSION_MINOR LESS 2) +-- +GitLab + diff --git a/kde-apps/kalarm/kalarm-22.07.80.ebuild b/kde-apps/kalarm/kalarm-22.07.80.ebuild index bf56f55110..29d8f507cd 100644 --- a/kde-apps/kalarm/kalarm-22.07.80.ebuild +++ b/kde-apps/kalarm/kalarm-22.07.80.ebuild @@ -53,7 +53,7 @@ DEPEND=" >=kde-frameworks/kservice-${KFMIN}:5 >=kde-frameworks/ktextwidgets-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5[X?] >=kde-frameworks/kxmlgui-${KFMIN}:5 >=media-libs/phonon-4.11.0 pim? ( @@ -72,11 +72,12 @@ RDEPEND="${DEPEND} pim? ( >=kde-apps/kdepim-runtime-${PVCUT}:5 ) " +PATCHES=( "${FILESDIR}/${PN}-22.04.3-without_x11.patch" ) + src_configure() { local mycmakeargs=( -DENABLE_AKONADI_PLUGIN=$(usex pim) - $(cmake_use_find_package X Qt5X11Extras) - $(cmake_use_find_package X X11) + -DWITHOUT_X11=$(usex !X) ) ecm_src_configure diff --git a/kde-apps/kalarm/kalarm-22.08.49.9999.ebuild b/kde-apps/kalarm/kalarm-22.08.49.9999.ebuild index 8e35f5c2d8..eaf9481ca6 100644 --- a/kde-apps/kalarm/kalarm-22.08.49.9999.ebuild +++ b/kde-apps/kalarm/kalarm-22.08.49.9999.ebuild @@ -53,7 +53,7 @@ DEPEND=" >=kde-frameworks/kservice-${KFMIN}:5 >=kde-frameworks/ktextwidgets-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5[X?] >=kde-frameworks/kxmlgui-${KFMIN}:5 >=media-libs/phonon-4.11.0 pim? ( @@ -72,11 +72,12 @@ RDEPEND="${DEPEND} pim? ( >=kde-apps/kdepim-runtime-${PVCUT}:5 ) " +PATCHES=( "${FILESDIR}/${PN}-22.04.3-without_x11.patch" ) + src_configure() { local mycmakeargs=( -DENABLE_AKONADI_PLUGIN=$(usex pim) - $(cmake_use_find_package X Qt5X11Extras) - $(cmake_use_find_package X X11) + -DWITHOUT_X11=$(usex !X) ) ecm_src_configure diff --git a/kde-apps/kalarm/kalarm-9999.ebuild b/kde-apps/kalarm/kalarm-9999.ebuild index 8e35f5c2d8..3d124af794 100644 --- a/kde-apps/kalarm/kalarm-9999.ebuild +++ b/kde-apps/kalarm/kalarm-9999.ebuild @@ -53,7 +53,7 @@ DEPEND=" >=kde-frameworks/kservice-${KFMIN}:5 >=kde-frameworks/ktextwidgets-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5[X?] >=kde-frameworks/kxmlgui-${KFMIN}:5 >=media-libs/phonon-4.11.0 pim? ( @@ -75,8 +75,7 @@ RDEPEND="${DEPEND} src_configure() { local mycmakeargs=( -DENABLE_AKONADI_PLUGIN=$(usex pim) - $(cmake_use_find_package X Qt5X11Extras) - $(cmake_use_find_package X X11) + -DWITHOUT_X11=$(usex !X) ) ecm_src_configure
