summaryrefslogtreecommitdiff
path: root/kde-apps
diff options
context:
space:
mode:
Diffstat (limited to 'kde-apps')
-rw-r--r--kde-apps/Manifest.gzbin37058 -> 37050 bytes
-rw-r--r--kde-apps/kalarm/Manifest3
-rw-r--r--kde-apps/kalarm/files/kalarm-22.04.3-without_x11.patch73
-rw-r--r--kde-apps/kalarm/kalarm-22.04.3-r1.ebuild (renamed from kde-apps/kalarm/kalarm-22.04.3.ebuild)7
-rw-r--r--kde-apps/kio-extras/Manifest3
-rw-r--r--kde-apps/kio-extras/files/kio-extras-22.04.3-without_x11.patch62
-rw-r--r--kde-apps/kio-extras/kio-extras-22.04.3.ebuild4
-rw-r--r--kde-apps/konqueror/Manifest3
-rw-r--r--kde-apps/konqueror/files/konqueror-22.04.3-with_x11.patch83
-rw-r--r--kde-apps/konqueror/konqueror-22.04.3.ebuild4
-rw-r--r--kde-apps/konsole/Manifest3
-rw-r--r--kde-apps/konsole/files/konsole-22.04.3-without_x11.patch46
-rw-r--r--kde-apps/konsole/konsole-22.04.3.ebuild5
-rw-r--r--kde-apps/kruler/Manifest3
-rw-r--r--kde-apps/kruler/files/kruler-22.04.3-without_x11.patch64
-rw-r--r--kde-apps/kruler/kruler-22.04.3.ebuild4
-rw-r--r--kde-apps/ktouch/Manifest5
-rw-r--r--kde-apps/ktouch/files/ktouch-22.04.3-without_x11.patch95
-rw-r--r--kde-apps/ktouch/ktouch-22.04.3.ebuild5
-rw-r--r--kde-apps/ktouch/metadata.xml3
-rw-r--r--kde-apps/yakuake/Manifest3
-rw-r--r--kde-apps/yakuake/files/yakuake-22.04.3-without_x11.patch78
-rw-r--r--kde-apps/yakuake/yakuake-22.04.3.ebuild4
23 files changed, 541 insertions, 19 deletions
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 5666775434b6..dfad1a863225 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
Binary files differ
diff --git a/kde-apps/kalarm/Manifest b/kde-apps/kalarm/Manifest
index efed5561cbaa..fe78e933d9a1 100644
--- a/kde-apps/kalarm/Manifest
+++ b/kde-apps/kalarm/Manifest
@@ -1,3 +1,4 @@
+AUX kalarm-22.04.3-without_x11.patch 2519 BLAKE2B 0c71b4bbd30033be19825315d997df0138fb910219a5ce58396f9919d9bc61d6fafea911316b07f134a310eedee77938e6484f9231265792e85b41f20dbd2080 SHA512 766b840920ac6b18fe79ddb0953f75e5b036d8cd4f7370c9869ab7489c5c5e7dc0828d3bd61e2cab7897b4ee4be3252fce0be7db1f8213da4ffd803011147e8a
DIST kalarm-22.04.3.tar.xz 2347752 BLAKE2B 9749172b9246c0f903ccbf7fd6ca7dae756ac9cfab594a85cc0cdff772dc0f0c21b48b2f2c0ff71467b117f0e287def9c4202a033636ce93f1317a567ff8e017 SHA512 22650e5263d0a7bb584da138977da32cad38672f2e2dd2beb5ad1b9f31f76cbed68fd3b9ca5c241bacbc793ce5102da5b331b68e689868620f46aab2234d26c4
-EBUILD kalarm-22.04.3.ebuild 2487 BLAKE2B 96bc8715a9179a3c4786f783932974793f543e91432b5af94e867dacb0d8b92c1e70817b65da6dacec7e459f1f247b819632df3780195d0db6b5323af6d3a75d SHA512 784bfabdaca1a5c0018a3dc6c9b0b6e06a0aa210457e7adfda224c29aabc9b231e3932870e80410bccc0c3159ab08aeaaaea119b36573571a131f957752a273c
+EBUILD kalarm-22.04.3-r1.ebuild 2491 BLAKE2B ed5ff0797af99d488a178d66bfeafd9de81fe5da3a4f33cafed7326d844d0a9cb7ab0b4acadfc1cca1c19dacbbad2aaa1b50004130964fdeb55222636537543e SHA512 61dda501fd326b8e6f60c760caf61c9fa04d3841692d7d3072039b8af4f5e13ab9faefbd43151555533213e787a5b4663241df04b1085d2c52abe7d455f09cf1
MISC metadata.xml 392 BLAKE2B d284f1f6d15ec099b824fc8aae970cceca3e558cbd7e4dc4b1ca93911394fd57834785936d1ca6626b4b4ff6b71613cd872b93e45b8701104978f80d8170e9e9 SHA512 872b0653ecebb83d93e152d510808ad85502024f5c162bb5c40a94aa76cddac615c0e930c04313c53a9e0a1a5c4b383829e302bb34647db46a698b47edc7fbdb
diff --git a/kde-apps/kalarm/files/kalarm-22.04.3-without_x11.patch b/kde-apps/kalarm/files/kalarm-22.04.3-without_x11.patch
new file mode 100644
index 000000000000..2f904201566b
--- /dev/null
+++ b/kde-apps/kalarm/files/kalarm-22.04.3-without_x11.patch
@@ -0,0 +1,73 @@
+From f8646ef6db5b4d0e6add5c9a83a13707f6175b13 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 27 Nov 2021 12:59:32 +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.
+
+KDEPIM_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.
+
+* backported to release/22.04
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 17 +++++++++--------
+ src/CMakeLists.txt | 2 +-
+ 2 files changed, 10 insertions(+), 9 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 06623ad9..3446a87c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -114,18 +114,19 @@ find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED)
+ configure_file(kalarm-version-string.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kalarm-version-string.h @ONLY)
+
+ if (NOT APPLE)
+- find_package(X11)
+-endif()
+-if (X11_FOUND)
+- if (QT_MAJOR_VERSION STREQUAL "5")
+- find_package(Qt5X11Extras ${QT_REQUIRED_VERSION} REQUIRED NO_MODULE)
+- else()
+- #TODO X11 on Qt6
++ option(WITHOUT_X11 "Build without X11 integration (skips finding X11)" OFF)
++ if (NOT WITHOUT_X11)
++ find_package(X11)
++ set(KDEPIM_HAVE_X11 ${X11_FOUND})
++ if (X11_FOUND)
++ find_package(Qt5X11Extras ${QT_REQUIRED_VERSION} REQUIRED NO_MODULE)
++ endif()
+ endif()
+ endif()
++add_feature_info(WITHOUT_X11 ${WITHOUT_X11} "Build without X11 integration")
++
+ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
+
+-set(KDEPIM_HAVE_X11 ${X11_FOUND})
+ configure_file(src/config-kalarm.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kalarm.h)
+
+ include_directories(${kalarm_SOURCE_DIR} ${kalarm_BINARY_DIR})
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index e8d70203..3aee2965 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -298,7 +298,7 @@ target_link_libraries(kalarm_bin
+ KF5::PimCommon
+ )
+
+-if (Qt${QT_MAJOR_VERSION}X11Extras_FOUND)
++if(KDEPIM_HAVE_X11)
+ target_link_libraries(kalarm_bin Qt${QT_MAJOR_VERSION}::X11Extras ${X11_X11_LIB})
+ endif()
+
+--
+2.35.1
+
diff --git a/kde-apps/kalarm/kalarm-22.04.3.ebuild b/kde-apps/kalarm/kalarm-22.04.3-r1.ebuild
index 6a291cf0cc6b..ef402863f33c 100644
--- a/kde-apps/kalarm/kalarm-22.04.3.ebuild
+++ b/kde-apps/kalarm/kalarm-22.04.3-r1.ebuild
@@ -57,7 +57,7 @@ DEPEND="
>=kde-frameworks/kservice-${KFMIN}:5
>=kde-frameworks/ktextwidgets-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5[X?]
>=kde-frameworks/kxmlgui-${KFMIN}:5
>=media-libs/phonon-4.11.0
X? (
@@ -70,10 +70,11 @@ RDEPEND="${DEPEND}
>=kde-apps/kdepim-runtime-${PVCUT}:5
"
+PATCHES=( "${FILESDIR}/${P}-without_x11.patch" )
+
src_configure() {
local mycmakeargs=(
- $(cmake_use_find_package X Qt5X11Extras)
- $(cmake_use_find_package X X11)
+ -DWITHOUT_X11=$(usex !X)
)
ecm_src_configure
diff --git a/kde-apps/kio-extras/Manifest b/kde-apps/kio-extras/Manifest
index b22ad777ebdc..8f7bf4ce3630 100644
--- a/kde-apps/kio-extras/Manifest
+++ b/kde-apps/kio-extras/Manifest
@@ -1,3 +1,4 @@
+AUX kio-extras-22.04.3-without_x11.patch 2036 BLAKE2B a6ed7cee07eba03821f057c11c4bfbd29ae4a2cb81c8bfce809c3451f182de2a4f84a2769dc9551a88f352b64a86a072795dc8940422b82ac665bb6f3a3077f8 SHA512 ecfcc62723b3b591b3f5f8bc783e7fa8051371fea721b452ebb01e6d167cf1b0eb6647cf562e2858614275eecf460a686e70e6ce90b467cc087a8a16dc750bfd
DIST kio-extras-22.04.3.tar.xz 642208 BLAKE2B 6c9f0a7d03a2b735c10a8b42cfae62c222d1e2b5a73e4827ab565f7b7b2d5a818aceffd3e6c838ed7bd5ba4f5f3ecc359757b096b4542275e2f45f6993dac7de SHA512 8e6be2829743b4a44326335dfbfd655c7b52508ab7db566e0f5bec1a56a39ebd33a5d0438b7dc192ec3f0ebcde34ccff5e37d6b63d6bfd9f4ba5a5624616d732
-EBUILD kio-extras-22.04.3.ebuild 2646 BLAKE2B a7dac0e0aaedee0aae803e67aab1770a3687ba57ebacefa261c5e6d9fee4099e6faa15eb88865f57056b317ff1ea5dd79c7c051bb34a8ffef683ff73cdefe828 SHA512 1ff7f51d4dae56d49c72055dac1fb5e183a202f2a0316d375b6edce0df4dcb2a36f9da75dd0ffb3348871890c2ffab354d02a1fa5c3b7bb118dfc66ff412f1e9
+EBUILD kio-extras-22.04.3.ebuild 2689 BLAKE2B 0e4e5ec1842463a71c711fec57cb91c66d065d220ba840a9505681ec227c0714db5da8573019f5072234ad6dedf505cf992fa4f794f49b707c52b90765a69601 SHA512 008f44cf1df1dba1549131329ca47f37854750a2f7dc82f7dd0deff318c42d55eaa651a8d685565776636eaa1c8801237bd2fd2462f79eaedfe0f052f3d673d5
MISC metadata.xml 913 BLAKE2B d7ea851c61364c2fb7cfd129ba9aec20614532bce4a0837a4445f733a2c2a7124450df95f59c5bbda166d50d2e520354749b5f47914c396a1a2f42809755ac92 SHA512 cd1b93a8acd9dd96902548c943e985876887b394e0e92cb6de46bc05a8310ba334d11ec587623c5bb2ac462b1ee16d388adfb0b439d75f2f34f41ca5426e2b94
diff --git a/kde-apps/kio-extras/files/kio-extras-22.04.3-without_x11.patch b/kde-apps/kio-extras/files/kio-extras-22.04.3-without_x11.patch
new file mode 100644
index 000000000000..4c97ab5187c6
--- /dev/null
+++ b/kde-apps/kio-extras/files/kio-extras-22.04.3-without_x11.patch
@@ -0,0 +1,62 @@
+From b8dda4b3129f42323e1f6ccb37c16cb62a740d39 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 27 Nov 2021 14:07:32 +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.
+
+-DCMAKE_DISABLE_FIND_PACKAGE_X11 will break if any dependencies list X11
+as required in their cmake config, also X11_FOUND could be set by
+cascading cmake dependencies.
+
+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>
+---
+ thumbnail/CMakeLists.txt | 19 +++++++++++--------
+ 1 file changed, 11 insertions(+), 8 deletions(-)
+
+diff --git a/thumbnail/CMakeLists.txt b/thumbnail/CMakeLists.txt
+index f6f38992d..ee322a1bf 100644
+--- a/thumbnail/CMakeLists.txt
++++ b/thumbnail/CMakeLists.txt
+@@ -21,13 +21,16 @@ set_package_properties(libappimage PROPERTIES
+ PURPOSE "Provides support for AppImage thumbnails"
+ )
+
+-find_package(X11)
+-set_package_properties(X11 PROPERTIES
+- DESCRIPTION "X11 libraries"
+- URL "https://www.x.org"
+- TYPE OPTIONAL
+- PURPOSE "Provides support for XCursor thumbnails"
+-)
++option(WITHOUT_X11 "Build without support for XCursor thumbnails (disables finding X11)" OFF)
++if (NOT WITHOUT_X11)
++ find_package(X11)
++ set_package_properties(X11 PROPERTIES
++ DESCRIPTION "X11 libraries"
++ URL "https://www.x.org"
++ TYPE OPTIONAL
++ PURPOSE "Provides support for XCursor thumbnails"
++ )
++endif()
+
+ find_package(Taglib 1.11)
+ set_package_properties(Taglib PROPERTIES
+@@ -210,7 +213,7 @@ endif()
+
+ ########### next target ###############
+
+-if(X11_Xcursor_FOUND)
++if(X11_Xcursor_FOUND AND NOT WITHOUT_X11)
+
+ add_library(cursorthumbnail MODULE cursorcreator.cpp cursorcreatorplugin.cpp)
+
+--
+GitLab
+
diff --git a/kde-apps/kio-extras/kio-extras-22.04.3.ebuild b/kde-apps/kio-extras/kio-extras-22.04.3.ebuild
index abf5c1450dcd..dd98f82228bd 100644
--- a/kde-apps/kio-extras/kio-extras-22.04.3.ebuild
+++ b/kde-apps/kio-extras/kio-extras-22.04.3.ebuild
@@ -70,6 +70,8 @@ RDEPEND="${DEPEND}
"
BDEPEND="man? ( dev-util/gperf )"
+PATCHES=( "${FILESDIR}/${P}-without_x11.patch" )
+
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package activities KF5Activities)
@@ -83,7 +85,7 @@ src_configure() {
$(cmake_use_find_package samba Samba)
$(cmake_use_find_package sftp libssh)
$(cmake_use_find_package taglib Taglib)
- $(cmake_use_find_package X X11)
+ -DWITHOUT_X11=$(usex !X)
)
use samba && mycmakeargs+=(
-DBUILD_KDSoapWSDiscoveryClient=OFF # disable bundled stuff
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
}
diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest
index c4cc54bf00a8..95e48a74c861 100644
--- a/kde-apps/konsole/Manifest
+++ b/kde-apps/konsole/Manifest
@@ -1,3 +1,4 @@
+AUX konsole-22.04.3-without_x11.patch 1557 BLAKE2B 27d2ebb2dc65886938a083a92097716d5ffa5a46485deecf183dfdd5d565c3f67244516a6ce6299cf1e48ef9c20bcd59add50b99c28c54a9b13182f469344b85 SHA512 b28e4dd052d93e731990f21741195cd40e0bfb433aaa2c664881b1fb0944dce5fa3b061e01ac64a773674a030042f16e7a492ac84dd7d52308a69c0a019cc0f6
DIST konsole-22.04.3.tar.xz 1476120 BLAKE2B 6675955b6c2257d342e7560c759c95fe19301f76c72db6c542275acc879b78606eeb17893111930d575290048cb9047c7b42b8af7b60169d6995ae0efd03fd35 SHA512 05728efc051ae76b395c7ece1599e654ce3bdae0c8b43d7f8e34c76f57041f7722e161147c4a5699377b764aa8b3799421d5c735967216c5420b6f92330c1338
-EBUILD konsole-22.04.3.ebuild 1702 BLAKE2B 61eadeea4359d8f5cbfe2fa5df09617b3c73a6ba1f1982c50a68fe317188702fae47da71f16f521c233aa14fce286f869a9044febfb1a5845b1f8320be54ed88 SHA512 4d07e4c6371ee1090ad284751e5ebdd1d47e9002f34fa99ca4d5ad60da865d0950b6b27ace4e869418658e78723e0795d9ed30910451cc65549ec8ffd0f6e36b
+EBUILD konsole-22.04.3.ebuild 1744 BLAKE2B 5c4d12873b7ad40c6d59ea430f8dffe63e500459b15b1bd358b4ada318e6d23bdd4c2d98a58fdb3a47270579090c20bb5a7ed5de5e7fc27d1a7aca67cdaaa8dc SHA512 57799a93af9af3a7df8da4ae37d8a466f00a2dadcdb580d1b7168a2df2448dee19a86cc6a5bbc2e2c35b5dff57661a55d418d5512f35c30b6e90cad3273ee29b
MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/konsole/files/konsole-22.04.3-without_x11.patch b/kde-apps/konsole/files/konsole-22.04.3-without_x11.patch
new file mode 100644
index 000000000000..ed396fcf20ab
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-22.04.3-without_x11.patch
@@ -0,0 +1,46 @@
+From 0aa39e22a2bb1bbcb8a02dfd6635ffe4d8a0bbb1 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 27 Nov 2021 14:43:18 +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 | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 61ed70cd7..565682848 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -103,10 +103,13 @@ set_package_properties(KF5DocTools PROPERTIES DESCRIPTION
+ )
+
+ if(NOT APPLE)
+- find_package(X11)
+- set_package_properties(X11 PROPERTIES TYPE OPTIONAL)
++ option(WITHOUT_X11 "Build without X11 integration (skips finding X11)" OFF)
++ if (NOT WITHOUT_X11)
++ find_package(X11)
++ set_package_properties(X11 PROPERTIES TYPE OPTIONAL)
++ set(HAVE_X11 ${X11_FOUND})
++ endif()
+ endif()
+-set(HAVE_X11 ${X11_FOUND})
+
+ # Check for function GETPWUID
+ check_symbol_exists(getpwuid "pwd.h" HAVE_GETPWUID)
+--
+GitLab
+
diff --git a/kde-apps/konsole/konsole-22.04.3.ebuild b/kde-apps/konsole/konsole-22.04.3.ebuild
index cce03a53b3c6..d02a5534dca2 100644
--- a/kde-apps/konsole/konsole-22.04.3.ebuild
+++ b/kde-apps/konsole/konsole-22.04.3.ebuild
@@ -50,11 +50,12 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${P}-without_x11.patch" )
+
src_configure() {
local mycmakeargs=(
- $(cmake_use_find_package X X11)
+ -DWITHOUT_X11=$(usex !X)
)
-
ecm_src_configure
}
diff --git a/kde-apps/kruler/Manifest b/kde-apps/kruler/Manifest
index 5fd1e1d6ccbe..1aefccfcb9a3 100644
--- a/kde-apps/kruler/Manifest
+++ b/kde-apps/kruler/Manifest
@@ -1,3 +1,4 @@
+AUX kruler-22.04.3-without_x11.patch 2241 BLAKE2B 92f51f62bf0b88ec20f03088a9f752741b4d236052774764c9cd251a1c8a052253c561f314fc44f213c56383d4ccc270f9313a9071d832d44b51e26cf360698c SHA512 c8942f3ac2e5163b2df7c595f8ec4bdb0c121ee109b98c962e38f3cce45a5800f8b284811175c230deca8e94b7f906a4b58d35bf89fece9aa36959542283f3cf
DIST kruler-22.04.3.tar.xz 276688 BLAKE2B 3442ccfe1ba7909979901e86e5157423258f897d48a1a73e5bbd83da1ead265471489c13780e97cbf05813a66c7c92789c8c9118125071cb39ec1221940a1fb1 SHA512 145c3194b1eebda382bd50fc42764f4008ba36f6dc0afc9f7ff3b8705fd70c30c6edf7ae02fbfc730a47c11cc06e63cd3f8a5501d39034ac2362c2307d0fa1c3
-EBUILD kruler-22.04.3.ebuild 946 BLAKE2B 4de4f5912260037d3131f2dcdeb3f14dd1b42ce290f2d6dc6bc4db4a09a7814f3b5dfdc634432582813e521af3f9ae5b3163477a600621d11aed13514d756a90 SHA512 191580c10ed9f743aae87b4ef52c894100430178969f3ae8624a28633ccc683b5308af97205772481f1e50b9d6cd4124c6fbae5f15374aaad7b214c773b60f3a
+EBUILD kruler-22.04.3.ebuild 989 BLAKE2B 3879195bb4ef22037bcfa9146e63866c597cda8115309e137b8472d4008587445e4a867aabfc0929afca5b91c46e3850272c8ab5f14e2790dab1b89021cc70cb SHA512 f4d3d91a7f01339b720bc8c049b1c82123559afe9c48c8ab1f5b9484d51442628fc77d93829817a90643808656a387189774be3b2833808abfc074187e82f094
MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kruler/files/kruler-22.04.3-without_x11.patch b/kde-apps/kruler/files/kruler-22.04.3-without_x11.patch
new file mode 100644
index 000000000000..79bd597d9377
--- /dev/null
+++ b/kde-apps/kruler/files/kruler-22.04.3-without_x11.patch
@@ -0,0 +1,64 @@
+From 7a29873231061948408b36089a683ab4e0fc8a69 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 31 Jul 2022 14:59:24 +0200
+Subject: [PATCH] Add CMake option to build WITHOUT_X11, drop unused X11
+ dependency
+
+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.
+
+KRULER_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.
+
+X11 dependency (introduced in 4c7cab8e90f8f360fb1c6b21c73f4acba609e0fe)
+was not actually used at build time, so the new option will replace it
+to determine if the feature is enabled, however libXCB remains
+non-required.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 18 ++++++++++--------
+ 1 file changed, 10 insertions(+), 8 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 86a5dc7..a5839ff 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -41,14 +41,16 @@ set_package_properties(KF5DocTools PROPERTIES DESCRIPTION
+ TYPE OPTIONAL
+ )
+ if (NOT APPLE)
+- find_package(X11)
+- set (KRULER_HAVE_X11 ${X11_FOUND})
+- if (X11_FOUND)
++ option(WITHOUT_X11 "Build without X11 integration (skips finding X11)" OFF)
++ if (NOT WITHOUT_X11)
+ find_package(XCB COMPONENTS XCB)
+- if (QT_MAJOR_VERSION STREQUAL "5")
+- find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras)
+- else()
+- # qtx11extras_p.h is in Qt6Gui, which implied by the Qt6Gui above
++ set (KRULER_HAVE_X11 ${XCB_FOUND})
++ if (XCB_FOUND)
++ if (QT_MAJOR_VERSION STREQUAL "5")
++ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras)
++ else()
++ # qtx11extras_p.h is in Qt6Gui, which implied by the Qt6Gui above
++ endif()
+ endif()
+ endif()
+ endif()
+@@ -101,7 +103,7 @@ target_link_libraries(kruler
+ KF5::WindowSystem
+ KF5::XmlGui
+ )
+-if (X11_FOUND)
++if (KRULER_HAVE_X11)
+ target_link_libraries(kruler
+ ${XCB_LIBRARIES}
+ )
+--
+GitLab
+
diff --git a/kde-apps/kruler/kruler-22.04.3.ebuild b/kde-apps/kruler/kruler-22.04.3.ebuild
index 7b51b8f8f795..0a74d158d6f9 100644
--- a/kde-apps/kruler/kruler-22.04.3.ebuild
+++ b/kde-apps/kruler/kruler-22.04.3.ebuild
@@ -34,9 +34,11 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${P}-without_x11.patch" )
+
src_configure() {
local mycmakeargs=(
- $(cmake_use_find_package X X11)
+ -DWITHOUT_X11=$(usex !X)
)
ecm_src_configure
diff --git a/kde-apps/ktouch/Manifest b/kde-apps/ktouch/Manifest
index 779f56ffecf5..bc9ee661587b 100644
--- a/kde-apps/ktouch/Manifest
+++ b/kde-apps/ktouch/Manifest
@@ -1,3 +1,4 @@
+AUX ktouch-22.04.3-without_x11.patch 3375 BLAKE2B 01d94894fafed1f2a51be2130431cbc3164856d528143610085b04d8f91a4beab172e79ade29c37dc2897443e36b4fe33a30c8bb583af1f15505278501e74f7a SHA512 9ac5b3035c89b08e968d3c4851571cf437a8d641137308d1f8ac56f2cf66ad8e39caa60a9b3ffe44f73c02234d4ddf7ece14bbdf305117da73c155f6ab09ad35
DIST ktouch-22.04.3.tar.xz 4978228 BLAKE2B 05622b751970819b51de6118fcaf2040cacfed115b4958a8b3cee1f2842a32f415e6565701df56e7f1a296fd72f7fda6a960f9f4322175168487ebea3ace7c36 SHA512 a26955cb6235525961e59a1158067748a8ad3dfa51b1072604229e01dce2c92fbe9745b04efb955d000691998435130b27a867d1354aac06ed834c798f59ea13
-EBUILD ktouch-22.04.3.ebuild 1601 BLAKE2B 6cf061856d54b70491256503d2cff880f52993a7d8a2054389ebb3039778f1495d59cd7d7f40c80a8266f7b66adb3a15f7c28bc743b6a7f07c1bd736ef45d7a6 SHA512 cd5149e99196576160585cbb0b778fcaae8f8dc30bdbd5baf97b120519f6073629ded3efb094c7c2bcf86c65d3e1c8b389ac5e7e4108efa508d745fa5eed8988
-MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
+EBUILD ktouch-22.04.3.ebuild 1601 BLAKE2B b58881bd083d9590f52480377ecd35ff5b9e7864cfdf732ede959bdbcf250b3ed3a302a0a0b233a0525d58845afc767e2f0333dfab2d1c44ee6f9bdcb2f888a6 SHA512 bfeaaaa9b64a1fd721e6617092a5dffab9d7c35cc8d18445279626e2ccb6df73b737c8e47d1b171b9281a23b51cde94e7db10fc03314eae41455dfc24eaf1e49
+MISC metadata.xml 406 BLAKE2B 515e93940c5d57cc66d5ab4c567b5f4a0ba0768561f3a83e5b99ac610c8a89d28282ec1812e8225fb8da2e0f51318956c386b4dbcf5346d94c76f42a655645cf SHA512 c8c3e7a26162e1e1b7211beeefd0949cdc3cb74e97aede8f0ac1f660d5b557e2514d52242a6ef1b6539c2e7ad3d7a463f5c24d1b47ecbb00722ff66e9109f07a
diff --git a/kde-apps/ktouch/files/ktouch-22.04.3-without_x11.patch b/kde-apps/ktouch/files/ktouch-22.04.3-without_x11.patch
new file mode 100644
index 000000000000..2278011d6e20
--- /dev/null
+++ b/kde-apps/ktouch/files/ktouch-22.04.3-without_x11.patch
@@ -0,0 +1,95 @@
+From f94d8b2bcdb738354f73efabbbe4fcf5bb623bf7 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 31 Jul 2022 16:17:30 +0200
+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.
+
+KTOUCH_BUILD_WITH_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.
+
+- Move the checks to root CMakeLists.txt
+- Move finding Qt5X11Extras behind "NOT WITHOUT_X11" too
+- x11_helper is conditional on KTOUCH_BUILD_WITH_X11
+
+* backported to release/22.04
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 14 +++++++++++++-
+ src/CMakeLists.txt | 13 +------------
+ 2 files changed, 14 insertions(+), 13 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ae5dfb8..55753cd 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -40,7 +40,6 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS
+ XmlPatterns
+ )
+
+-find_package(Qt5X11Extras)
+ find_package(Qt5 CONFIG QUIET OPTIONAL_COMPONENTS QuickCompiler)
+
+ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+@@ -61,6 +60,19 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+
+
+ option(COMPILE_QML "Precompile QML code" OFF)
++option(WITHOUT_X11 "Build without X11 Keyboard Layout Detection (skips finding X11)" OFF)
++
++if (NOT WITHOUT_X11)
++ find_package(X11)
++ find_package(XCB OPTIONAL_COMPONENTS XCB XKB)
++ find_package(Qt5X11Extras ${QT_MIN_VERSION} CONFIG)
++
++ if (Qt5X11Extras_FOUND AND X11_FOUND AND X11_Xkbfile_FOUND AND X11_Xkb_FOUND AND XCB_FOUND AND XCB_XKB_FOUND)
++ set(KTOUCH_BUILD_WITH_X11 TRUE)
++ endif()
++
++ add_feature_info ("Keyboard Layout Detection" KTOUCH_BUILD_WITH_X11 "needs Qt5X11Extras, libX11, libxkb, libxkbfile, libxcb, and libxcb-xkb")
++endif()
+
+ # enable QML debugging for debug builds
+ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DQT_QML_DEBUG")
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index e158d7c..b352184 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -4,15 +4,6 @@ ecm_setup_version(${RELEASE_SERVICE_VERSION}
+ PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KTouchConfigVersion.cmake"
+ )
+
+-find_package(X11)
+-find_package(XCB OPTIONAL_COMPONENTS XCB XKB)
+-
+-if (Qt5X11Extras_FOUND AND X11_FOUND AND X11_Xkbfile_FOUND AND X11_Xkb_FOUND AND XCB_FOUND AND XCB_XKB_FOUND)
+- set(KTOUCH_BUILD_WITH_X11 TRUE)
+-endif()
+-
+-add_feature_info ("Keyboard Layout Detection" KTOUCH_BUILD_WITH_X11 "needs Qt5X11Extras, libX11, libxkb, libxkbfile, libxcb, and libxcb-xkb")
+-
+ ecm_optional_add_subdirectory(schemata)
+
+ # set include directories
+@@ -142,9 +133,7 @@ set(ktouch_SRCS
+ undocommands/coursecommands.cpp
+ undocommands/coursecommands.h
+ undocommands/keyboardlayoutcommands.cpp
+- undocommands/keyboardlayoutcommands.h
+- x11_helper.cpp
+- x11_helper.h)
++ undocommands/keyboardlayoutcommands.h)
+
+ qt_add_resources(ktouch_imgs_SRCS images/images.qrc)
+
+--
+2.35.1
+
diff --git a/kde-apps/ktouch/ktouch-22.04.3.ebuild b/kde-apps/ktouch/ktouch-22.04.3.ebuild
index 1437028afa44..5e61ab78de92 100644
--- a/kde-apps/ktouch/ktouch-22.04.3.ebuild
+++ b/kde-apps/ktouch/ktouch-22.04.3.ebuild
@@ -54,11 +54,12 @@ RDEPEND="${COMMON_DEPEND}
>=kde-apps/kqtquickcharts-${PVCUT}:5
"
+PATCHES=( "${FILESDIR}/${P}-without_x11.patch" )
+
src_configure() {
local mycmakeargs=(
-DCOMPILE_QML=OFF
- $(cmake_use_find_package X X11)
- $(cmake_use_find_package X Qt5X11Extras)
+ -DWITHOUT_X11=$(usex !X)
)
ecm_src_configure
}
diff --git a/kde-apps/ktouch/metadata.xml b/kde-apps/ktouch/metadata.xml
index d925f2439758..6e812b0dfadd 100644
--- a/kde-apps/ktouch/metadata.xml
+++ b/kde-apps/ktouch/metadata.xml
@@ -8,4 +8,7 @@
<upstream>
<bugs-to>https://bugs.kde.org/</bugs-to>
</upstream>
+ <use>
+ <flag name="X">Enable support for X11 Keyboard Layout Detection</flag>
+ </use>
</pkgmetadata>
diff --git a/kde-apps/yakuake/Manifest b/kde-apps/yakuake/Manifest
index e949eef227af..fe258a189ba2 100644
--- a/kde-apps/yakuake/Manifest
+++ b/kde-apps/yakuake/Manifest
@@ -1,3 +1,4 @@
+AUX yakuake-22.04.3-without_x11.patch 2382 BLAKE2B e9d4de7f7e9c084f6bba308c73f635e3ac68e8256d6430ba99981cf352a544efd7d5dcaa509f0acd203b8cd7dd496bfbf3eb304fbd6737180fedde4f37ba9443 SHA512 eb5f4d904fdf477092be8e57ec00bf047b9dea09ee360b0f2e536ca7384a2c795c7c9ee6a9a1493c2f78ae2d43e46f0d4e1211e54cad5d932ad13afba1569c7c
DIST yakuake-22.04.3.tar.xz 404952 BLAKE2B eaab58a553269d28dbcdb2e330beb4a86b212d9428da8d1967575ac976159c5f02d03a0ff6f70839eefb19295918b46db01d29014544584582caade006c814b4 SHA512 1c1b03f2136104fca9c91f6f6bf562f66abfa12dff9145f7c54db42f175495c57031caa1628f37cdf645787349f77d61c4047883d085e13dc221aca06765537e
-EBUILD yakuake-22.04.3.ebuild 1548 BLAKE2B 363970f409153ec09ab19d7ae46e935b88df29bb9954ccb4ae0e747fc9a7378e5d7682c9ca76ae7690049c4eba022b06118bad3b88fb9ce41260a58bd7864f41 SHA512 421da0eff5b5aaeb44ff443c40176fdb3a4b8680386fb27b9ff14d3b55ffba571b39e7d4282970a7c4d97a8de733e9a5ad5c7e95a8d2721fa9aad4ce3d6381fb
+EBUILD yakuake-22.04.3.ebuild 1591 BLAKE2B 9b8b156307dcf5783910e7e2e8a389181709c00e37e42951562af26bbffd4e09e24ec50a72419ad6bae06ba9951fa3f0af6ad1241a600e70dff8aac1f6fec74f SHA512 243f2867292e3cc8b7e88b353ff9484af57b29be88cf27899d26d8b6b270cf6b220afd67a9f5bdc1deb4884e61653e245ec1d99d53d4beb9f4e95621dd01872b
MISC metadata.xml 730 BLAKE2B a366bbedfe3a0b4257147f664f48130ff318a003433134d63e4bd076b9ee43169f28798e0c8da2e13804446abc2b80b1c5327c7468a1f8d6e8243c44c3c72c60 SHA512 7594648f5354d0660fa1063c52fb99af6955b0f3de5603a7c9eca3d1a24db24315990efa13f85680e56d63f77bedfde01f5728271594be794bd896fcf0f01f56
diff --git a/kde-apps/yakuake/files/yakuake-22.04.3-without_x11.patch b/kde-apps/yakuake/files/yakuake-22.04.3-without_x11.patch
new file mode 100644
index 000000000000..5daf29c35da4
--- /dev/null
+++ b/kde-apps/yakuake/files/yakuake-22.04.3-without_x11.patch
@@ -0,0 +1,78 @@
+From 68bee7bce59bed1def66518bc254ecf7ae8985c5 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 27 Nov 2021 14:49:51 +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.
+
+* backported to release/22.04
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 22 ++++++++++++----------
+ app/CMakeLists.txt | 6 +++---
+ 2 files changed, 15 insertions(+), 13 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 14f6842..0ec65b9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -51,16 +51,18 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
+ )
+
+ if(NOT APPLE)
+- find_package(X11)
+- set(HAVE_X11 ${X11_FOUND})
+-
+- if(X11_FOUND)
+- find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED X11Extras)
+- endif(X11_FOUND)
+-
+- find_package(KF5Wayland ${KF5_MIN_VERSION} CONFIG)
+- set(HAVE_KWAYLAND ${KF5Wayland_FOUND})
+-endif(NOT APPLE)
++ option(WITHOUT_X11 "Build without X11 integration (skips finding X11)" OFF)
++ if(NOT WITHOUT_X11)
++ find_package(X11)
++ set(HAVE_X11 ${X11_FOUND})
++ if(X11_FOUND)
++ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED X11Extras)
++ endif()
++ endif()
++
++ find_package(KF5Wayland ${KF5_MIN_VERSION} CONFIG)
++ set(HAVE_KWAYLAND ${KF5Wayland_FOUND})
++endif()
+
+ add_subdirectory(app)
+ add_subdirectory(data)
+diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
+index 69aedcd..994d36f 100644
+--- a/app/CMakeLists.txt
++++ b/app/CMakeLists.txt
+@@ -63,9 +63,9 @@ target_link_libraries(yakuake
+ KF5::WidgetsAddons
+ KF5::WindowSystem)
+
+-if(X11_FOUND)
+- target_link_libraries(yakuake Qt5::X11Extras ${X11_X11_LIB})
+-endif(X11_FOUND)
++if(HAVE_X11)
++ target_link_libraries(yakuake Qt5::X11Extras)
++endif()
+
+ if(KF5Wayland_FOUND)
+ target_link_libraries(yakuake KF5::WaylandClient)
+--
+2.35.1
+
diff --git a/kde-apps/yakuake/yakuake-22.04.3.ebuild b/kde-apps/yakuake/yakuake-22.04.3.ebuild
index 0db7a4d76d4b..556269d0a620 100644
--- a/kde-apps/yakuake/yakuake-22.04.3.ebuild
+++ b/kde-apps/yakuake/yakuake-22.04.3.ebuild
@@ -48,10 +48,12 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${P}-without_x11.patch" )
+
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package absolute-position KF5Wayland)
- $(cmake_use_find_package X X11)
+ -DWITHOUT_X11=$(usex !X)
)
ecm_src_configure
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 18:04:16 +0000