summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'kde-apps/konqueror/files/konqueror-22.04.3-with_x11.patch')
-rw-r--r--kde-apps/konqueror/files/konqueror-22.04.3-with_x11.patch83
1 files changed, 0 insertions, 83 deletions
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
deleted file mode 100644
index 90273b072f0e..000000000000
--- a/kde-apps/konqueror/files/konqueror-22.04.3-with_x11.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-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
-