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

3 files changed, 69 insertions, 2 deletions

diff --git a/kde-apps/kruler/Manifest b/kde-apps/kruler/Manifest
index 5fd1e1d6ccbe..1aefccfcb9a3 100644
--- a/kde-apps/kruler/Manifest
+++ b/kde-apps/kruler/Manifest
@@ -1,3 +1,4 @@
+AUX kruler-22.04.3-without_x11.patch 2241 BLAKE2B 92f51f62bf0b88ec20f03088a9f752741b4d236052774764c9cd251a1c8a052253c561f314fc44f213c56383d4ccc270f9313a9071d832d44b51e26cf360698c SHA512 c8942f3ac2e5163b2df7c595f8ec4bdb0c121ee109b98c962e38f3cce45a5800f8b284811175c230deca8e94b7f906a4b58d35bf89fece9aa36959542283f3cf
 DIST kruler-22.04.3.tar.xz 276688 BLAKE2B 3442ccfe1ba7909979901e86e5157423258f897d48a1a73e5bbd83da1ead265471489c13780e97cbf05813a66c7c92789c8c9118125071cb39ec1221940a1fb1 SHA512 145c3194b1eebda382bd50fc42764f4008ba36f6dc0afc9f7ff3b8705fd70c30c6edf7ae02fbfc730a47c11cc06e63cd3f8a5501d39034ac2362c2307d0fa1c3
-EBUILD kruler-22.04.3.ebuild 946 BLAKE2B 4de4f5912260037d3131f2dcdeb3f14dd1b42ce290f2d6dc6bc4db4a09a7814f3b5dfdc634432582813e521af3f9ae5b3163477a600621d11aed13514d756a90 SHA512 191580c10ed9f743aae87b4ef52c894100430178969f3ae8624a28633ccc683b5308af97205772481f1e50b9d6cd4124c6fbae5f15374aaad7b214c773b60f3a
+EBUILD kruler-22.04.3.ebuild 989 BLAKE2B 3879195bb4ef22037bcfa9146e63866c597cda8115309e137b8472d4008587445e4a867aabfc0929afca5b91c46e3850272c8ab5f14e2790dab1b89021cc70cb SHA512 f4d3d91a7f01339b720bc8c049b1c82123559afe9c48c8ab1f5b9484d51442628fc77d93829817a90643808656a387189774be3b2833808abfc074187e82f094
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kruler/files/kruler-22.04.3-without_x11.patch b/kde-apps/kruler/files/kruler-22.04.3-without_x11.patch
new file mode 100644
index 000000000000..79bd597d9377
--- /dev/null
+++ b/kde-apps/kruler/files/kruler-22.04.3-without_x11.patch
@@ -0,0 +1,64 @@
+From 7a29873231061948408b36089a683ab4e0fc8a69 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 31 Jul 2022 14:59:24 +0200
+Subject: [PATCH] Add CMake option to build WITHOUT_X11, drop unused X11
+ dependency
+
+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.
+
+KRULER_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.
+
+X11 dependency (introduced in 4c7cab8e90f8f360fb1c6b21c73f4acba609e0fe)
+was not actually used at build time, so the new option will replace it
+to determine if the feature is enabled, however libXCB remains
+non-required.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 18 ++++++++++--------
+ 1 file changed, 10 insertions(+), 8 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 86a5dc7..a5839ff 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -41,14 +41,16 @@ set_package_properties(KF5DocTools PROPERTIES DESCRIPTION
+     TYPE OPTIONAL
+ )
+ if (NOT APPLE)
+-    find_package(X11)
+-    set (KRULER_HAVE_X11 ${X11_FOUND})
+-    if (X11_FOUND)
++    option(WITHOUT_X11 "Build without X11 integration (skips finding X11)" OFF)
++    if (NOT WITHOUT_X11)
+         find_package(XCB COMPONENTS XCB)
+-        if (QT_MAJOR_VERSION STREQUAL "5")
+-            find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras)
+-        else()
+-            # qtx11extras_p.h is in Qt6Gui, which implied by the Qt6Gui above
++        set (KRULER_HAVE_X11 ${XCB_FOUND})
++        if (XCB_FOUND)
++            if (QT_MAJOR_VERSION STREQUAL "5")
++                find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras)
++            else()
++                # qtx11extras_p.h is in Qt6Gui, which implied by the Qt6Gui above
++            endif()
+         endif()
+     endif()
+ endif()
+@@ -101,7 +103,7 @@ target_link_libraries(kruler
+     KF5::WindowSystem
+     KF5::XmlGui
+ )
+-if (X11_FOUND)
++if (KRULER_HAVE_X11)
+     target_link_libraries(kruler
+         ${XCB_LIBRARIES}
+     )
+-- 
+GitLab
+
diff --git a/kde-apps/kruler/kruler-22.04.3.ebuild b/kde-apps/kruler/kruler-22.04.3.ebuild
index 7b51b8f8f795..0a74d158d6f9 100644
--- a/kde-apps/kruler/kruler-22.04.3.ebuild
+++ b/kde-apps/kruler/kruler-22.04.3.ebuild
@@ -34,9 +34,11 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-without_x11.patch" )
+
 src_configure() {
 	local mycmakeargs=(
-		$(cmake_use_find_package X X11)
+		-DWITHOUT_X11=$(usex !X)
 	)
 
 	ecm_src_configure