| 1 |
commit: f6d5bec93b6044d64e928d0dce57b97745439adb |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Nov 29 08:17:07 2021 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 31 15:35:55 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f6d5bec9 |
| 7 |
|
| 8 |
kde-apps/kruler: Fix build with USE -X |
| 9 |
|
| 10 |
Upstream commit 7a29873231061948408b36089a683ab4e0fc8a69 |
| 11 |
|
| 12 |
Bug: https://bugs.gentoo.org/813450 |
| 13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 14 |
|
| 15 |
.../kruler/files/kruler-22.04.3-without_x11.patch | 64 ++++++++++++++++++++++ |
| 16 |
kde-apps/kruler/kruler-22.07.80.ebuild | 4 +- |
| 17 |
kde-apps/kruler/kruler-22.08.49.9999.ebuild | 4 +- |
| 18 |
3 files changed, 70 insertions(+), 2 deletions(-) |
| 19 |
|
| 20 |
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 |
| 21 |
new file mode 100644 |
| 22 |
index 0000000000..79bd597d93 |
| 23 |
--- /dev/null |
| 24 |
+++ b/kde-apps/kruler/files/kruler-22.04.3-without_x11.patch |
| 25 |
@@ -0,0 +1,64 @@ |
| 26 |
+From 7a29873231061948408b36089a683ab4e0fc8a69 Mon Sep 17 00:00:00 2001 |
| 27 |
+From: Andreas Sturmlechner <asturm@g.o> |
| 28 |
+Date: Sun, 31 Jul 2022 14:59:24 +0200 |
| 29 |
+Subject: [PATCH] Add CMake option to build WITHOUT_X11, drop unused X11 |
| 30 |
+ dependency |
| 31 |
+ |
| 32 |
+We want to be able to build without X11 support even if some of the |
| 33 |
+used libraries may not work w/o X11 themselves yet or need to be built |
| 34 |
+with X11 support for other reverse dependencies. |
| 35 |
+ |
| 36 |
+KRULER_HAVE_X11 already exists and is set automagically so far, but |
| 37 |
+using -DCMAKE_DISABLE_FIND_PACKAGE_X11 will break if any dependencies |
| 38 |
+list X11 as required in their cmake config. |
| 39 |
+ |
| 40 |
+X11 dependency (introduced in 4c7cab8e90f8f360fb1c6b21c73f4acba609e0fe) |
| 41 |
+was not actually used at build time, so the new option will replace it |
| 42 |
+to determine if the feature is enabled, however libXCB remains |
| 43 |
+non-required. |
| 44 |
+ |
| 45 |
+Signed-off-by: Andreas Sturmlechner <asturm@g.o> |
| 46 |
+--- |
| 47 |
+ CMakeLists.txt | 18 ++++++++++-------- |
| 48 |
+ 1 file changed, 10 insertions(+), 8 deletions(-) |
| 49 |
+ |
| 50 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 51 |
+index 86a5dc7..a5839ff 100644 |
| 52 |
+--- a/CMakeLists.txt |
| 53 |
++++ b/CMakeLists.txt |
| 54 |
+@@ -41,14 +41,16 @@ set_package_properties(KF5DocTools PROPERTIES DESCRIPTION |
| 55 |
+ TYPE OPTIONAL |
| 56 |
+ ) |
| 57 |
+ if (NOT APPLE) |
| 58 |
+- find_package(X11) |
| 59 |
+- set (KRULER_HAVE_X11 ${X11_FOUND}) |
| 60 |
+- if (X11_FOUND) |
| 61 |
++ option(WITHOUT_X11 "Build without X11 integration (skips finding X11)" OFF) |
| 62 |
++ if (NOT WITHOUT_X11) |
| 63 |
+ find_package(XCB COMPONENTS XCB) |
| 64 |
+- if (QT_MAJOR_VERSION STREQUAL "5") |
| 65 |
+- find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras) |
| 66 |
+- else() |
| 67 |
+- # qtx11extras_p.h is in Qt6Gui, which implied by the Qt6Gui above |
| 68 |
++ set (KRULER_HAVE_X11 ${XCB_FOUND}) |
| 69 |
++ if (XCB_FOUND) |
| 70 |
++ if (QT_MAJOR_VERSION STREQUAL "5") |
| 71 |
++ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras) |
| 72 |
++ else() |
| 73 |
++ # qtx11extras_p.h is in Qt6Gui, which implied by the Qt6Gui above |
| 74 |
++ endif() |
| 75 |
+ endif() |
| 76 |
+ endif() |
| 77 |
+ endif() |
| 78 |
+@@ -101,7 +103,7 @@ target_link_libraries(kruler |
| 79 |
+ KF5::WindowSystem |
| 80 |
+ KF5::XmlGui |
| 81 |
+ ) |
| 82 |
+-if (X11_FOUND) |
| 83 |
++if (KRULER_HAVE_X11) |
| 84 |
+ target_link_libraries(kruler |
| 85 |
+ ${XCB_LIBRARIES} |
| 86 |
+ ) |
| 87 |
+-- |
| 88 |
+GitLab |
| 89 |
+ |
| 90 |
|
| 91 |
diff --git a/kde-apps/kruler/kruler-22.07.80.ebuild b/kde-apps/kruler/kruler-22.07.80.ebuild |
| 92 |
index fd82b4364c..0e360ca4f1 100644 |
| 93 |
--- a/kde-apps/kruler/kruler-22.07.80.ebuild |
| 94 |
+++ b/kde-apps/kruler/kruler-22.07.80.ebuild |
| 95 |
@@ -34,9 +34,11 @@ DEPEND=" |
| 96 |
" |
| 97 |
RDEPEND="${DEPEND}" |
| 98 |
|
| 99 |
+PATCHES=( "${FILESDIR}/${PN}-22.04.3-without_x11.patch" ) |
| 100 |
+ |
| 101 |
src_configure() { |
| 102 |
local mycmakeargs=( |
| 103 |
- $(cmake_use_find_package X X11) |
| 104 |
+ -DWITHOUT_X11=$(usex !X) |
| 105 |
) |
| 106 |
|
| 107 |
ecm_src_configure |
| 108 |
|
| 109 |
diff --git a/kde-apps/kruler/kruler-22.08.49.9999.ebuild b/kde-apps/kruler/kruler-22.08.49.9999.ebuild |
| 110 |
index 54ff896d29..a71920cae3 100644 |
| 111 |
--- a/kde-apps/kruler/kruler-22.08.49.9999.ebuild |
| 112 |
+++ b/kde-apps/kruler/kruler-22.08.49.9999.ebuild |
| 113 |
@@ -34,9 +34,11 @@ DEPEND=" |
| 114 |
" |
| 115 |
RDEPEND="${DEPEND}" |
| 116 |
|
| 117 |
+PATCHES=( "${FILESDIR}/${PN}-22.04.3-without_x11.patch" ) |
| 118 |
+ |
| 119 |
src_configure() { |
| 120 |
local mycmakeargs=( |
| 121 |
- $(cmake_use_find_package X X11) |
| 122 |
+ -DWITHOUT_X11=$(usex !X) |
| 123 |
) |
| 124 |
|
| 125 |
ecm_src_configure |
Archives