[gentoo-commits] proj/kde:master commit in: kde-apps/gwenview/files/, kde-apps/gwenview/

[Andreas Sturmlechner]

commit:     f8902579139556cd20f278d97e9cdef5cedd0b2a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  2 12:05:39 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov  2 12:57:55 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f8902579

kde-apps/gwenview: Fix build with USE -X

Backporting upstream(ed) commit 2ffdf26b81a90c91abadbc8582f82d219dd19e90

Bug: https://bugs.gentoo.org/813450
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/gwenview-22.08.3-without_x11.patch       | 52 ++++++++++++++++++++++
 kde-apps/gwenview/gwenview-22.08.3.ebuild          |  4 +-
 2 files changed, 55 insertions(+), 1 deletion(-)

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 0000000000..89724ce4bb
--- /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@g.o>
+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@g.o>
+---
+ 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.3.ebuild b/kde-apps/gwenview/gwenview-22.08.3.ebuild
index d341db59c1..9f34c3cac0 100644
--- a/kde-apps/gwenview/gwenview-22.08.3.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
 }