gentoo auto-resync : 03:11:2022 - 21:12:43

3 files changed, 58 insertions, 3 deletions

diff --git a/kde-apps/gwenview/Manifest b/kde-apps/gwenview/Manifest
index cc190dc5a1c6..98880b5cd315 100644
--- a/kde-apps/gwenview/Manifest
+++ b/kde-apps/gwenview/Manifest
@@ -1,5 +1,6 @@
+AUX gwenview-22.08.3-without_x11.patch 1872 BLAKE2B 3bf81001d4d27e1baa0f4a9e44fb0265eab29d60cd9befba3f6fc6e7a194f54ef36e32f8e03726bd46c5fe6a6d3577c6175a10ac5d3516f98b2498b7c3030be4 SHA512 93d271f4647aff5728c6be0d0732c60c3e670b63332195e480a8288b4d7d9e97187ad99c7ddf00631309e33ca60782eb1ff0c991b1d8b516fdce2acba17668fe
 DIST gwenview-22.04.3.tar.xz 6821928 BLAKE2B cabf701b4ea43bd85b2babe4b982b6757d1302d9c01ac7cef951827b7953a359564d679f5be8cb792fe1d915cd32a2b2092d33dea0c463aa459761252022a920 SHA512 8b7460eee6d2c47ab08978db0cee56b2c7cf5933c85b6d077cd11781f105e5d3dca0e97a3cca9af097074e64ed5b9f396f7699d91c599eee57d04c53191372c7
-DIST gwenview-22.08.2.tar.xz 6824936 BLAKE2B 17860e79ec5b3b86dc8b84704090e381decaab4dfd503f50b42de23d7fde144763de770ac3241974bdec2f140756ad7eae340128a6b267b6cac4fe6c67fed927 SHA512 a3baea5fd0e78c4655ceb364db631760e5140a49e21d309cf92b461dbfc454bd8f079536a5c313e5429335254b66fb1eedb1db88ca8e0a9c3e1e61ca118febb0
+DIST gwenview-22.08.3.tar.xz 6825392 BLAKE2B 60f7ea9623a88fc153e6ba60bd7f3ae8e76e5e3da95940578e89d41a90f401b48c927d15f3270cbf18ff93998e50b7fdefde6ad9944ee9a11733f12262df0f7f SHA512 1a450a6df3b5976cca2f4077695e7360e434fbe500d07b1d8f4adb72d3cad6caee8c886a89c2067082c721959f78fce6385fd561c8ec8916b3c6b0ceef2b6462
 EBUILD gwenview-22.04.3.ebuild 2737 BLAKE2B c88c9c2e46ef68b4577de7c6c7e630d12d4e43c65b4a922a87e12c7c0ee56f5a12415ce1497bf270156a29b8b9e72a83ee7106674ac2e8bfe001aba11defc91c SHA512 7658d247df12126d343c7cc9d2a58486bd13f4f0b5089241c75108e71ce2c9c17e611c17b55ad943ae0c1115511f2373713b6f5d60d55edeb836cb538e7efb6b
-EBUILD gwenview-22.08.2.ebuild 2801 BLAKE2B 4db5cb44cfde29fe046723300804927ab7b5c6c5d8f15d3f52f5fe76c4c761d003ab26e231272b66f443bcdcece81862ef3d76237bec313357f1b6775b8bb147 SHA512 bc1a2d2055e3c3795ae3cb139c3908d008676ea91354ea17add4f32e6ec24ac1860017d5ffc93cc2c8bbc144dc12c137ad6629099beef2fde685eea55c41972a
+EBUILD gwenview-22.08.3.ebuild 2844 BLAKE2B 65f82b6a6bba827fbb8c703d71b265c09f6da08489d9cb8b135b61d3dbfba5056c04eda9824bbfd53085d9aa5c7271960a245ca9077f46be65fffa39b76e7e1d SHA512 e5d5316130af87f40b0ab56a0bbd9c2a7cff1f94735e368499dc040ce53c470342d710e71aecedd1b988baacd7da11a7e35868e9c6b52371d26146c7f4d5ff59
 MISC metadata.xml 697 BLAKE2B 1b9d505c5490486b4a5b6e11447a8c0bf3d52f678f80a1825164458188cc4dee675b3f620818d6a402f7a4dc14498370efa0c08baacc7f78b928beda8f54b697 SHA512 4cf16eb17b7b10862f6268a2082dfaf808c00ae9342a2b864716a64c23dcfca6c837d39a2637d8b9a6c7ec391492b4c3fc7bfd5e21e81c97f21053ff4acd9aed
diff --git a/kde-apps/gwenview/files/gwenview-22.08.3-without_x11.patch b/kde-apps/gwenview/files/gwenview-22.08.3-without_x11.patch
new file mode 100644
index 000000000000..89724ce4bb1d
--- /dev/null
+++ b/kde-apps/gwenview/files/gwenview-22.08.3-without_x11.patch
@@ -0,0 +1,52 @@
+From 2ffdf26b81a90c91abadbc8582f82d219dd19e90 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 27 Nov 2021 12:49:09 +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.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 15 +++++++++------
+ 1 file changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 22ebcb42..d1b0b5fe 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -132,13 +132,16 @@ endif()
+ set_package_properties(KF5KDcraw PROPERTIES URL "https://invent.kde.org/graphics/libkdcraw/" DESCRIPTION "C++ interface around LibRaw library used to decode RAW picture files" TYPE OPTIONAL)
+ 
+ 
+-find_package(X11)
+-if(X11_FOUND)
+-    if (QT_MAJOR_VERSION STREQUAL "5")
+-        find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED X11Extras)
++option(WITHOUT_X11 "Build without X11 integration (disables finding X11)" OFF)
++if(NOT WITHOUT_X11)
++    find_package(X11)
++    if(X11_FOUND)
++        if (QT_MAJOR_VERSION STREQUAL "5")
++            find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED X11Extras)
++        endif()
++        # we need to add qt6 lib when we found x11
++        set(HAVE_X11 TRUE)
+     endif()
+-    # we need to add qt6 lib when we found x11
+-    set(HAVE_X11 1)
+ endif()
+ 
+ if (QT_MAJOR_VERSION STREQUAL "5")
+-- 
+GitLab
+
diff --git a/kde-apps/gwenview/gwenview-22.08.2.ebuild b/kde-apps/gwenview/gwenview-22.08.3.ebuild
index d341db59c116..9f34c3cac069 100644
--- a/kde-apps/gwenview/gwenview-22.08.2.ebuild
+++ b/kde-apps/gwenview/gwenview-22.08.3.ebuild
@@ -74,6 +74,8 @@ RDEPEND="${COMMON_DEPEND}
 	>=kde-frameworks/kimageformats-${KFMIN}:5
 "
 
+PATCHES=( "${FILESDIR}/${P}-without_x11.patch" )
+
 src_prepare() {
 	ecm_src_prepare
 	if ! use mpris; then
@@ -89,7 +91,7 @@ src_configure() {
 		$(cmake_use_find_package raw KF5KDcraw)
 		-DGWENVIEW_SEMANTICINFO_BACKEND=$(usex semantic-desktop Baloo None)
 		$(cmake_use_find_package share KF5Purpose)
-		$(cmake_use_find_package X X11)
+		-DWITHOUT_X11=$(usex !X)
 	)
 	ecm_src_configure
 }