gentoo auto-resync : 23:08:2022 - 20:45:29

3 files changed, 127 insertions, 0 deletions

diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 022ded78fdd4..b4484deb7e9c 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/konqueror/Manifest b/kde-apps/konqueror/Manifest
index 228a8d9dd9c4..c57002d4b572 100644
--- a/kde-apps/konqueror/Manifest
+++ b/kde-apps/konqueror/Manifest
@@ -1,4 +1,5 @@
 AUX konqueror-22.04.3-with_x11.patch 2326 BLAKE2B 086f7ce20655021f52dc66aac3480c6c322516a28c49d41646c88bace0c9ac67178e852c2aad42e061b28ef72fc578478c2939668b4d1f8f9b0e91ae70e6e1c0 SHA512 433d8ac2bf5f6f6eab211d68637c2aec503c03211827b2f461a029d9410675938c41626612b6f4889ca78d2e2b12785a6da98c61942a1656ba9bfb26d9a455a3
+AUX konqueror-22.04.3-without_x11.patch 3888 BLAKE2B 8311104ac6157badc858daff7d9e28e577ed49327e3ed20544146964cc9f7c109b5e74b2022216f0fd43269b77d17bbb762a20f3f609d294f38e61c84249b256 SHA512 25a3495bef4402eb83ebb8625348eb51b29d224f302f7048163bdf51b15e6c802aa4acf88cdc809654104264c63269e3adc2f6ef54c0e8b7a69ce4f6f2248a07
 DIST konqueror-22.04.3.tar.xz 7669364 BLAKE2B 9778cdb920854e6f76fad5fc8717263beaa3869ada35b96be68db5234a102f3a3b60f76d0171bff73136001b10114f6a2fce6b79eb6caf17f8be21679da10bd9 SHA512 e64115a083dddbe6a66c8cfdeb0b081d52068ae877cf51b09d8573e0ba87cb3665421175d915b51f6532be5199e9667f11fe5dd8c0765c4f434b9a65f218a2c6
 DIST konqueror-22.08.0.tar.xz 7668492 BLAKE2B 9646d591ee3a740e952172c6a2ed9ade39e7a6582c6338005b2cacb5c0b305cc19cc8b5f193d7f188dedad0cbc61aaeac06596928ad97e59d874ba9ae417836c SHA512 c9c16f22667616c794762dd71d8a341a878e59692bc78aca83f68d80e93231776a598d04ded606832038e7e9c4b48c6bfbffa02985729640ddb0115625d99d09
 EBUILD konqueror-22.04.3.ebuild 2587 BLAKE2B 402df4f36dd1f41ab9b233dce1d68cd0797590f6d5e73db8ff218c843b3eeee5c8791b64e07c9f45f24060b4fed7224f24e3f825ee6643cf07f0b86135571559 SHA512 ec5ac65805e241d4b955fea1f6645b842cfa31d51cb739b4c1776ca6545f0842b7df6fd9b9dba8ad82be3620582e6518366704deb80978f612afc8501d0af4fc
diff --git a/kde-apps/konqueror/files/konqueror-22.04.3-without_x11.patch b/kde-apps/konqueror/files/konqueror-22.04.3-without_x11.patch
new file mode 100644
index 000000000000..ff1de8680e69
--- /dev/null
+++ b/kde-apps/konqueror/files/konqueror-22.04.3-without_x11.patch
@@ -0,0 +1,126 @@
+From 503557c54c6162970072f31cb84b0eb934d409d4 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 31 Jul 2022 14:47:48 +0200
+Subject: [PATCH 1/2] Drop unused X11 dependency
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt     | 8 ++------
+ src/CMakeLists.txt | 4 ----
+ 2 files changed, 2 insertions(+), 10 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 838197be7..d9218ae06 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -47,12 +47,8 @@ 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)
++find_package(Qt5X11Extras)
++set(KONQ_HAVE_X11 ${Qt5X11Extras_FOUND})
+ 
+ add_definitions(
+     -DQT_USE_QSTRINGBUILDER
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 9a1343e04..286bc7da8 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -113,10 +113,6 @@ target_link_libraries(kdeinit_konqueror
+    KF5::SonnetUi
+ )
+ 
+-if (X11_FOUND)
+-  target_link_libraries(kdeinit_konqueror ${X11_LIBRARIES})
+-endif ()
+-
+ if (KActivities_FOUND)
+   target_link_libraries(kdeinit_konqueror KF5::Activities)
+ endif (KActivities_FOUND)
+-- 
+2.35.1
+
+
+From ff0e19961f8345faea54e4f85057312b7ad7007d Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 27 Nov 2021 14:36:20 +0100
+Subject: [PATCH 2/2] 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 Qt5X11Extras themselves yet or need
+to be built with X11 support for other reverse dependencies.
+
+KONQ_HAVE_X11 already exists and is set automagically so far, but
+using -DCMAKE_DISABLE_FIND_PACKAGE_Qt5X11Extras will break if any
+dependencies list Qt5X11Extras as required in their cmake config.
+
+Introducing this option means there is no behavior change by default,
+cmake will just skip finding Qt5X11Extras or adding unwanted features
+if the option is enabled.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt        | 7 +++++--
+ client/CMakeLists.txt | 4 ++--
+ src/CMakeLists.txt    | 4 ++--
+ 3 files changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d9218ae06..71bc03ecb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -47,8 +47,11 @@ if(Qt5WebEngineWidgets_VERSION VERSION_LESS "5.14.0")
+   add_definitions(-DWEBENGINEDOWNLOADITEM_USE_PATH)
+ endif()
+ 
+-find_package(Qt5X11Extras)
+-set(KONQ_HAVE_X11 ${Qt5X11Extras_FOUND})
++option(WITHOUT_X11 "Build without X11 integration (skips finding Qt5X11Extras)" OFF)
++if(NOT WITHOUT_X11)
++    find_package(Qt5X11Extras)
++    set(KONQ_HAVE_X11 ${Qt5X11Extras_FOUND})
++endif()
+ 
+ add_definitions(
+     -DQT_USE_QSTRINGBUILDER
+diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
+index 24aedb14c..3c32c86f3 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(KONQ_HAVE_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 286bc7da8..500b9750c 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -33,9 +33,9 @@ target_link_libraries(konquerorprivate
+    KF5::KIOGui
+ )
+ 
+-if(X11_FOUND)
++if(KONQ_HAVE_X11)
+   target_link_libraries(konquerorprivate Qt5::X11Extras)
+-endif(X11_FOUND)
++endif()
+ 
+ 
+ set_target_properties(konquerorprivate PROPERTIES VERSION ${KONQUEROR_LIB_VERSION} SOVERSION "5" )
+-- 
+2.35.1
+