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

3 files changed, 83 insertions, 2 deletions

diff --git a/kde-apps/yakuake/Manifest b/kde-apps/yakuake/Manifest
index e949eef227af..fe258a189ba2 100644
--- a/kde-apps/yakuake/Manifest
+++ b/kde-apps/yakuake/Manifest
@@ -1,3 +1,4 @@
+AUX yakuake-22.04.3-without_x11.patch 2382 BLAKE2B e9d4de7f7e9c084f6bba308c73f635e3ac68e8256d6430ba99981cf352a544efd7d5dcaa509f0acd203b8cd7dd496bfbf3eb304fbd6737180fedde4f37ba9443 SHA512 eb5f4d904fdf477092be8e57ec00bf047b9dea09ee360b0f2e536ca7384a2c795c7c9ee6a9a1493c2f78ae2d43e46f0d4e1211e54cad5d932ad13afba1569c7c
 DIST yakuake-22.04.3.tar.xz 404952 BLAKE2B eaab58a553269d28dbcdb2e330beb4a86b212d9428da8d1967575ac976159c5f02d03a0ff6f70839eefb19295918b46db01d29014544584582caade006c814b4 SHA512 1c1b03f2136104fca9c91f6f6bf562f66abfa12dff9145f7c54db42f175495c57031caa1628f37cdf645787349f77d61c4047883d085e13dc221aca06765537e
-EBUILD yakuake-22.04.3.ebuild 1548 BLAKE2B 363970f409153ec09ab19d7ae46e935b88df29bb9954ccb4ae0e747fc9a7378e5d7682c9ca76ae7690049c4eba022b06118bad3b88fb9ce41260a58bd7864f41 SHA512 421da0eff5b5aaeb44ff443c40176fdb3a4b8680386fb27b9ff14d3b55ffba571b39e7d4282970a7c4d97a8de733e9a5ad5c7e95a8d2721fa9aad4ce3d6381fb
+EBUILD yakuake-22.04.3.ebuild 1591 BLAKE2B 9b8b156307dcf5783910e7e2e8a389181709c00e37e42951562af26bbffd4e09e24ec50a72419ad6bae06ba9951fa3f0af6ad1241a600e70dff8aac1f6fec74f SHA512 243f2867292e3cc8b7e88b353ff9484af57b29be88cf27899d26d8b6b270cf6b220afd67a9f5bdc1deb4884e61653e245ec1d99d53d4beb9f4e95621dd01872b
 MISC metadata.xml 730 BLAKE2B a366bbedfe3a0b4257147f664f48130ff318a003433134d63e4bd076b9ee43169f28798e0c8da2e13804446abc2b80b1c5327c7468a1f8d6e8243c44c3c72c60 SHA512 7594648f5354d0660fa1063c52fb99af6955b0f3de5603a7c9eca3d1a24db24315990efa13f85680e56d63f77bedfde01f5728271594be794bd896fcf0f01f56
diff --git a/kde-apps/yakuake/files/yakuake-22.04.3-without_x11.patch b/kde-apps/yakuake/files/yakuake-22.04.3-without_x11.patch
new file mode 100644
index 000000000000..5daf29c35da4
--- /dev/null
+++ b/kde-apps/yakuake/files/yakuake-22.04.3-without_x11.patch
@@ -0,0 +1,78 @@
+From 68bee7bce59bed1def66518bc254ecf7ae8985c5 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 27 Nov 2021 14:49:51 +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.
+
+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     | 22 ++++++++++++----------
+ app/CMakeLists.txt |  6 +++---
+ 2 files changed, 15 insertions(+), 13 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 14f6842..0ec65b9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -51,16 +51,18 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
+ )
+ 
+ if(NOT APPLE)
+-  find_package(X11)
+-  set(HAVE_X11 ${X11_FOUND})
+-
+-  if(X11_FOUND)
+-    find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED X11Extras)
+-  endif(X11_FOUND)
+-
+-  find_package(KF5Wayland ${KF5_MIN_VERSION} CONFIG)
+-  set(HAVE_KWAYLAND ${KF5Wayland_FOUND})
+-endif(NOT APPLE)
++    option(WITHOUT_X11 "Build without X11 integration (skips finding X11)" OFF)
++    if(NOT WITHOUT_X11)
++        find_package(X11)
++        set(HAVE_X11 ${X11_FOUND})
++        if(X11_FOUND)
++            find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED X11Extras)
++        endif()
++    endif()
++
++    find_package(KF5Wayland ${KF5_MIN_VERSION} CONFIG)
++    set(HAVE_KWAYLAND ${KF5Wayland_FOUND})
++endif()
+ 
+ add_subdirectory(app)
+ add_subdirectory(data)
+diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
+index 69aedcd..994d36f 100644
+--- a/app/CMakeLists.txt
++++ b/app/CMakeLists.txt
+@@ -63,9 +63,9 @@ target_link_libraries(yakuake
+     KF5::WidgetsAddons
+     KF5::WindowSystem)
+ 
+-if(X11_FOUND)
+-  target_link_libraries(yakuake Qt5::X11Extras ${X11_X11_LIB})
+-endif(X11_FOUND)
++if(HAVE_X11)
++    target_link_libraries(yakuake Qt5::X11Extras)
++endif()
+ 
+ if(KF5Wayland_FOUND)
+   target_link_libraries(yakuake KF5::WaylandClient)
+-- 
+2.35.1
+
diff --git a/kde-apps/yakuake/yakuake-22.04.3.ebuild b/kde-apps/yakuake/yakuake-22.04.3.ebuild
index 0db7a4d76d4b..556269d0a620 100644
--- a/kde-apps/yakuake/yakuake-22.04.3.ebuild
+++ b/kde-apps/yakuake/yakuake-22.04.3.ebuild
@@ -48,10 +48,12 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-without_x11.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package absolute-position KF5Wayland)
-		$(cmake_use_find_package X X11)
+		-DWITHOUT_X11=$(usex !X)
 	)
 
 	ecm_src_configure