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

3 files changed, 88 insertions, 2 deletions

diff --git a/kde-apps/konqueror/Manifest b/kde-apps/konqueror/Manifest
index 4b058452a289..5ee9d2f864e9 100644
--- a/kde-apps/konqueror/Manifest
+++ b/kde-apps/konqueror/Manifest
@@ -1,3 +1,4 @@
+AUX konqueror-22.04.3-with_x11.patch 2326 BLAKE2B 086f7ce20655021f52dc66aac3480c6c322516a28c49d41646c88bace0c9ac67178e852c2aad42e061b28ef72fc578478c2939668b4d1f8f9b0e91ae70e6e1c0 SHA512 433d8ac2bf5f6f6eab211d68637c2aec503c03211827b2f461a029d9410675938c41626612b6f4889ca78d2e2b12785a6da98c61942a1656ba9bfb26d9a455a3
 DIST konqueror-22.04.3.tar.xz 7669364 BLAKE2B 9778cdb920854e6f76fad5fc8717263beaa3869ada35b96be68db5234a102f3a3b60f76d0171bff73136001b10114f6a2fce6b79eb6caf17f8be21679da10bd9 SHA512 e64115a083dddbe6a66c8cfdeb0b081d52068ae877cf51b09d8573e0ba87cb3665421175d915b51f6532be5199e9667f11fe5dd8c0765c4f434b9a65f218a2c6
-EBUILD konqueror-22.04.3.ebuild 2551 BLAKE2B 659ea56a691ce745e52ada0a0e60189a1b8f9c9d3e950860eafb2a33cff7cc4b1ee61173d9b0bc5583356f3cb973052a5498d29504ddf941a46f50af8a86d97e SHA512 1b19793e5a6894a04f4318e67dfecf6e223f3ee8197ea6ce7bbf20b6a51a3176f83f839608e45cd68df510fe188af066bdf09618edb7b95b23d673be87947b12
+EBUILD konqueror-22.04.3.ebuild 2587 BLAKE2B 402df4f36dd1f41ab9b233dce1d68cd0797590f6d5e73db8ff218c843b3eeee5c8791b64e07c9f45f24060b4fed7224f24e3f825ee6643cf07f0b86135571559 SHA512 ec5ac65805e241d4b955fea1f6645b842cfa31d51cb739b4c1776ca6545f0842b7df6fd9b9dba8ad82be3620582e6518366704deb80978f612afc8501d0af4fc
 MISC metadata.xml 450 BLAKE2B 61e83d89cdd87f5f0ec0acbf294ba5be5388be70e35870ef0c006775e0975244997dd59952ed4a8210d3395ec07e1abf0f2054175edf37d54be761e5a61b702c SHA512 d8558586a678dff640d2d4b66c2f3a3cdba71689e768690427752626ded385c7d1f9f3ecb0ca0c432d7557a62320c1b57f0c89e94c0be528b65c63043f9bc543
diff --git a/kde-apps/konqueror/files/konqueror-22.04.3-with_x11.patch b/kde-apps/konqueror/files/konqueror-22.04.3-with_x11.patch
new file mode 100644
index 000000000000..90273b072f0e
--- /dev/null
+++ b/kde-apps/konqueror/files/konqueror-22.04.3-with_x11.patch
@@ -0,0 +1,83 @@
+From 69c2186c1a6c4fc0bf7f13b571b581e5f6157063 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 27 Nov 2021 14:36:20 +0100
+Subject: [PATCH] Add CMake option to build without X11
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt        | 16 ++++++++++------
+ client/CMakeLists.txt |  4 ++--
+ src/CMakeLists.txt    |  6 +++---
+ 3 files changed, 15 insertions(+), 11 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 77f5ea645..488ee7dc4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -46,12 +46,16 @@ if(Qt5WebEngineWidgets_VERSION VERSION_LESS "5.14.0")
+   add_definitions(-DWEBENGINEDOWNLOADITEM_USE_PATH)
+ endif()
+ 
+-find_package(X11)
+-set(KONQ_HAVE_X11 ${X11_FOUND})
+-
+-if (X11_FOUND)
+-  find_package(Qt5 REQUIRED X11Extras)
+-endif(X11_FOUND)
++if (NOT WIN32)
++    option(WITH_X11 "Build with X11 integration" ON)
++    if (WITH_X11)
++        find_package(X11 REQUIRED)
++        find_package(Qt5X11Extras NO_MODULE REQUIRED)
++        set(KONQ_HAVE_X11 TRUE)
++    endif()
++else()
++    set(WITH_X11 OFF)
++endif()
+ 
+ add_definitions(
+     -DQT_USE_QSTRINGBUILDER
+diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
+index 24aedb14c..51d2b44d0 100644
+--- a/client/CMakeLists.txt
++++ b/client/CMakeLists.txt
+@@ -30,9 +30,9 @@ if (WIN32)
+ else (WIN32)
+     kf5_add_kdeinit_executable( kfmclient NOGUI ${kfmclient_SRCS})
+     target_link_libraries(kdeinit_kfmclient ${kfmclient_LIBS})
+-    if(X11_FOUND)
++    if(WITH_X11)
+       target_link_libraries(kdeinit_kfmclient Qt5::X11Extras)
+-    endif(X11_FOUND)
++    endif()
+     install(TARGETS kdeinit_kfmclient  ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
+ endif (WIN32)
+ 
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 2113e1c2f..07e64d90f 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -33,9 +33,9 @@ target_link_libraries(konquerorprivate
+    KF5::KIOGui
+ )
+ 
+-if(X11_FOUND)
++if(WITH_X11)
+   target_link_libraries(konquerorprivate Qt5::X11Extras)
+-endif(X11_FOUND)
++endif()
+ 
+ 
+ set_target_properties(konquerorprivate PROPERTIES VERSION ${KONQUEROR_LIB_VERSION} SOVERSION "5" )
+@@ -113,7 +113,7 @@ target_link_libraries(kdeinit_konqueror
+    KF5::SonnetUi
+ )
+ 
+-if (X11_FOUND)
++if (WITH_X11)
+   target_link_libraries(kdeinit_konqueror ${X11_LIBRARIES})
+ endif ()
+ 
+-- 
+2.34.1
+
diff --git a/kde-apps/konqueror/konqueror-22.04.3.ebuild b/kde-apps/konqueror/konqueror-22.04.3.ebuild
index 6d69ff80806c..05c5705662e8 100644
--- a/kde-apps/konqueror/konqueror-22.04.3.ebuild
+++ b/kde-apps/konqueror/konqueror-22.04.3.ebuild
@@ -63,6 +63,8 @@ RDEPEND="${COMMON_DEPEND}
 	kde-plasma/kde-cli-tools:5
 "
 
+PATCHES=( "${FILESDIR}/${P}-with_x11.patch" )
+
 src_prepare() {
 	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
 
@@ -74,7 +76,7 @@ src_configure() {
 		-DCMAKE_DISABLE_FIND_PACKAGE_Hunspell=ON # requires fixing bug 634122
 		$(cmake_use_find_package activities KF5Activities)
 		$(cmake_use_find_package speech Qt5TextToSpeech)
-		$(cmake_use_find_package X X11)
+		-DWITH_X11=$(usex X)
 	)
 	ecm_src_configure
 }