gentoo auto-resync : 16:11:2023 - 04:41:38

4 files changed, 67 insertions, 3 deletions

diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 75b242e640e3..089874221f5f 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/colord-kde/Manifest b/kde-misc/colord-kde/Manifest
index 2dfbc903caff..f1b00541aefc 100644
--- a/kde-misc/colord-kde/Manifest
+++ b/kde-misc/colord-kde/Manifest
@@ -1,5 +1,6 @@
+AUX colord-kde-23.08.3-without_x11.patch 1888 BLAKE2B c65bc4911af8773257c3308df0140b147305229a420814d35121140f49e138a056fe06e794455df9237ec2677c70bb9771beb04e64537bf601db3e826f66d3af SHA512 28a953bf3dceb3a2e78af5dcc04989b6f71d0dd59678828ee007b400857293c7b987c2f6b268b7a7c7f4882a0f106bb05e25a0f694b449475b5d1aa52645cd3b
 DIST colord-kde-23.04.3.tar.xz 107960 BLAKE2B edf9f09939a8e1616345b0fe089db36cc96cb9f7800c198617dd3e4fa5882a3ef11e20023c25e7707e5956775f36ddedad4936ab53de89092e474b1e826da144 SHA512 2a98c155328b8d4c4f0b1123408155ac21da9c355b2e60bdba08f07b5ac91e54c3414892fc6c7b45a8243b834c4f89ac1ef744f7a466b207e176e0021bf27637
 DIST colord-kde-23.08.3.tar.xz 108568 BLAKE2B bd6e8a2634c1741acdf2ff181a1472b8d38232275763f03f065e99bdb8a81b029dfee5bf76db14f5a0863e96477ecc1727d9f1187b626d313fbce6e341521213 SHA512 5569c2ce554b3d0756ff1eb1d99fbc5f447d75c0b350446cfae2eb16c714a69aac9a0ecce0e89f6b05927e05879f92ddb79d6057b52ee55f6144a1c38976623e
 EBUILD colord-kde-23.04.3-r1.ebuild 1453 BLAKE2B 35e170981d6a539170da979c57cbee4d5ca68e8933dc11abff7428194a103614cb3c063c2d4c392e596ee7a47486aea06d03b6433b3471e744dbea457c302063 SHA512 beb8df2ab951f2abab1ce2c72f0efc38f9956fd5f835f5fccaff485e2c905883877a534fcf2242dab45f67cc070a3753e1116436979c6711142c3272f6de0342
-EBUILD colord-kde-23.08.3.ebuild 1571 BLAKE2B b38cfb03099700839c63a97825ccc720746339ea46514e79a8305169d059d7aacc2d19b1d05998fd5f709d3d9a9e2e2d573047dbae7b0e7054bd3db2a9093084 SHA512 35b9414b839df5a5f693aa68ab3d33ea85c3edf55ffbeeb241803f5c11ad7350191d9d247ec16981a4c1c3d08697a3fe383ab66d7e6130ed15cb9b7cec0f0d30
+EBUILD colord-kde-23.08.3.ebuild 1613 BLAKE2B 38588b9b11356d4e6e6ed19709045aa059fbe0bbcee2a99f516c3bd8312c0fc64d3efe7bd3324d3181d762de48c196f02dbec1bedcc240802e7b2aacf2f63f4a SHA512 318074765d6f1f38f9973e3b9dd441ba5e57a9ae29cc82d0f36fb1ed11f82d790590cbef61d252487759f0b0ad28ec7d5947a4346cf8bab50a7406c06d6c746d
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-misc/colord-kde/colord-kde-23.08.3.ebuild b/kde-misc/colord-kde/colord-kde-23.08.3.ebuild
index 8cadd5485a4e..28197edcd668 100644
--- a/kde-misc/colord-kde/colord-kde-23.08.3.ebuild
+++ b/kde-misc/colord-kde/colord-kde-23.08.3.ebuild
@@ -38,7 +38,7 @@ COMMON_DEPEND="
 	)
 "
 DEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5[X=]
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
 "
 RDEPEND="${COMMON_DEPEND}
 	dev-libs/kirigami-addons:5
@@ -48,9 +48,11 @@ RDEPEND="${COMMON_DEPEND}
 	x11-misc/colord
 "
 
+PATCHES=( "${FILESDIR}/${P}-without_x11.patch" )
+
 src_configure() {
 	local mycmakeargs=(
-		$(cmake_use_find_package X X11)
+		-DWITHOUT_X11=$(usex !X)
 	)
 	ecm_src_configure
 }
diff --git a/kde-misc/colord-kde/files/colord-kde-23.08.3-without_x11.patch b/kde-misc/colord-kde/files/colord-kde-23.08.3-without_x11.patch
new file mode 100644
index 000000000000..d1cfc6f1085d
--- /dev/null
+++ b/kde-misc/colord-kde/files/colord-kde-23.08.3-without_x11.patch
@@ -0,0 +1,61 @@
+From 31e125cc80497b0dc9f16abc808859ce97fd5fd1 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 26 Mar 2023 19:25:40 +0200
+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.
+
+X11_FOUND is set automagically so far, and 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 if the option is enabled.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 18 +++++++++++-------
+ 1 file changed, 11 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9c08b03..d491926 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -47,13 +47,17 @@ find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED COMPON
+     Widgets
+ )
+ 
+-find_package(X11)
+-set_package_properties(X11 PROPERTIES
+-    TYPE OPTIONAL
+-    PURPOSE "For colord integration on X11"
+-)
++option(WITHOUT_X11 "Build without colord-kded for X11 integration (skips finding X11)" OFF)
++if(NOT WITHOUT_X11)
++    find_package(X11)
++    set_package_properties(X11 PROPERTIES
++        TYPE OPTIONAL
++        PURPOSE "For colord integration on X11"
++    )
++    set(HAVE_X11 ${X11_FOUND})
++endif()
+ 
+-if (X11_FOUND)
++if (HAVE_X11)
+     find_package(XCB REQUIRED COMPONENTS XCB RANDR)
+     if (QT_MAJOR_VERSION STREQUAL "5")
+         find_package(Qt5X11Extras ${REQUIRED_QT_VERSION} NO_MODULE)
+@@ -80,7 +84,7 @@ ecm_set_disabled_deprecation_versions(
+ 	KF 5.100.0)
+ 
+ 
+-if (X11_FOUND)
++if (HAVE_X11)
+     add_subdirectory(colord-kded)
+ endif()
+ add_subdirectory(colord-kcm)
+-- 
+GitLab
+