gentoo auto-resync : 06:08:2022 - 14:10:01

3 files changed, 79 insertions, 4 deletions

diff --git a/kde-apps/kalarm/Manifest b/kde-apps/kalarm/Manifest
index efed5561cbaa..fe78e933d9a1 100644
--- a/kde-apps/kalarm/Manifest
+++ b/kde-apps/kalarm/Manifest
@@ -1,3 +1,4 @@
+AUX kalarm-22.04.3-without_x11.patch 2519 BLAKE2B 0c71b4bbd30033be19825315d997df0138fb910219a5ce58396f9919d9bc61d6fafea911316b07f134a310eedee77938e6484f9231265792e85b41f20dbd2080 SHA512 766b840920ac6b18fe79ddb0953f75e5b036d8cd4f7370c9869ab7489c5c5e7dc0828d3bd61e2cab7897b4ee4be3252fce0be7db1f8213da4ffd803011147e8a
 DIST kalarm-22.04.3.tar.xz 2347752 BLAKE2B 9749172b9246c0f903ccbf7fd6ca7dae756ac9cfab594a85cc0cdff772dc0f0c21b48b2f2c0ff71467b117f0e287def9c4202a033636ce93f1317a567ff8e017 SHA512 22650e5263d0a7bb584da138977da32cad38672f2e2dd2beb5ad1b9f31f76cbed68fd3b9ca5c241bacbc793ce5102da5b331b68e689868620f46aab2234d26c4
-EBUILD kalarm-22.04.3.ebuild 2487 BLAKE2B 96bc8715a9179a3c4786f783932974793f543e91432b5af94e867dacb0d8b92c1e70817b65da6dacec7e459f1f247b819632df3780195d0db6b5323af6d3a75d SHA512 784bfabdaca1a5c0018a3dc6c9b0b6e06a0aa210457e7adfda224c29aabc9b231e3932870e80410bccc0c3159ab08aeaaaea119b36573571a131f957752a273c
+EBUILD kalarm-22.04.3-r1.ebuild 2491 BLAKE2B ed5ff0797af99d488a178d66bfeafd9de81fe5da3a4f33cafed7326d844d0a9cb7ab0b4acadfc1cca1c19dacbbad2aaa1b50004130964fdeb55222636537543e SHA512 61dda501fd326b8e6f60c760caf61c9fa04d3841692d7d3072039b8af4f5e13ab9faefbd43151555533213e787a5b4663241df04b1085d2c52abe7d455f09cf1
 MISC metadata.xml 392 BLAKE2B d284f1f6d15ec099b824fc8aae970cceca3e558cbd7e4dc4b1ca93911394fd57834785936d1ca6626b4b4ff6b71613cd872b93e45b8701104978f80d8170e9e9 SHA512 872b0653ecebb83d93e152d510808ad85502024f5c162bb5c40a94aa76cddac615c0e930c04313c53a9e0a1a5c4b383829e302bb34647db46a698b47edc7fbdb
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 000000000000..2f904201566b
--- /dev/null
+++ b/kde-apps/kalarm/files/kalarm-22.04.3-without_x11.patch
@@ -0,0 +1,73 @@
+From f8646ef6db5b4d0e6add5c9a83a13707f6175b13 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@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.
+
+* backported to release/22.04
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt     | 17 +++++++++--------
+ src/CMakeLists.txt |  2 +-
+ 2 files changed, 10 insertions(+), 9 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 06623ad9..3446a87c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -114,18 +114,19 @@ find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED)
+ 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()
+-        #TODO X11 on Qt6
++    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)
++            find_package(Qt5X11Extras ${QT_REQUIRED_VERSION} REQUIRED NO_MODULE)
++        endif()
+     endif()
+ endif()
++add_feature_info(WITHOUT_X11 ${WITHOUT_X11} "Build without X11 integration")
++
+ 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 e8d70203..3aee2965 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -298,7 +298,7 @@ target_link_libraries(kalarm_bin
+     KF5::PimCommon
+ )
+ 
+-if (Qt${QT_MAJOR_VERSION}X11Extras_FOUND)
++if(KDEPIM_HAVE_X11)
+     target_link_libraries(kalarm_bin Qt${QT_MAJOR_VERSION}::X11Extras ${X11_X11_LIB})
+ endif()
+ 
+-- 
+2.35.1
+
diff --git a/kde-apps/kalarm/kalarm-22.04.3.ebuild b/kde-apps/kalarm/kalarm-22.04.3-r1.ebuild
index 6a291cf0cc6b..ef402863f33c 100644
--- a/kde-apps/kalarm/kalarm-22.04.3.ebuild
+++ b/kde-apps/kalarm/kalarm-22.04.3-r1.ebuild
@@ -57,7 +57,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
 	X? (
@@ -70,10 +70,11 @@ RDEPEND="${DEPEND}
 	>=kde-apps/kdepim-runtime-${PVCUT}:5
 "
 
+PATCHES=( "${FILESDIR}/${P}-without_x11.patch" )
+
 src_configure() {
 	local mycmakeargs=(
-		$(cmake_use_find_package X Qt5X11Extras)
-		$(cmake_use_find_package X X11)
+		-DWITHOUT_X11=$(usex !X)
 	)
 
 	ecm_src_configure