| 1 |
commit: c715608c66dc78a2556b5f2561be6e337ccd0c8c |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Nov 27 12:30:03 2021 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 6 07:44:06 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c715608c |
| 7 |
|
| 8 |
kde-apps/kalarm: Fix build with USE -X |
| 9 |
|
| 10 |
Upstream commit 308aa74653acc86cd6a206599a56500c827927ef |
| 11 |
|
| 12 |
Bug: https://bugs.gentoo.org/813450 |
| 13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 14 |
|
| 15 |
.../kalarm/files/kalarm-22.04.3-without_x11.patch | 73 ++++++++++++++++++++++ |
| 16 |
...arm-22.04.3.ebuild => kalarm-22.04.3-r1.ebuild} | 7 ++- |
| 17 |
2 files changed, 77 insertions(+), 3 deletions(-) |
| 18 |
|
| 19 |
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 |
| 20 |
new file mode 100644 |
| 21 |
index 000000000000..2f904201566b |
| 22 |
--- /dev/null |
| 23 |
+++ b/kde-apps/kalarm/files/kalarm-22.04.3-without_x11.patch |
| 24 |
@@ -0,0 +1,73 @@ |
| 25 |
+From f8646ef6db5b4d0e6add5c9a83a13707f6175b13 Mon Sep 17 00:00:00 2001 |
| 26 |
+From: Andreas Sturmlechner <asturm@g.o> |
| 27 |
+Date: Sat, 27 Nov 2021 12:59:32 +0100 |
| 28 |
+Subject: [PATCH] Add CMake option to build WITHOUT_X11 |
| 29 |
+ |
| 30 |
+We want to be able to build without X11 support even if some of the used |
| 31 |
+libraries may not work w/o X11 themselves yet or need to be built with |
| 32 |
+X11 support for other reverse dependencies. |
| 33 |
+ |
| 34 |
+KDEPIM_HAVE_X11 already exists and is set automagically so far, but using |
| 35 |
+-DCMAKE_DISABLE_FIND_PACKAGE_X11 will break if any dependencies list X11 |
| 36 |
+as required in their cmake config. |
| 37 |
+ |
| 38 |
+Introducing this option means there is no behavior change by default, |
| 39 |
+cmake will just skip finding X11 or adding unwanted features if the |
| 40 |
+option is enabled. |
| 41 |
+ |
| 42 |
+* backported to release/22.04 |
| 43 |
+ |
| 44 |
+Signed-off-by: Andreas Sturmlechner <asturm@g.o> |
| 45 |
+--- |
| 46 |
+ CMakeLists.txt | 17 +++++++++-------- |
| 47 |
+ src/CMakeLists.txt | 2 +- |
| 48 |
+ 2 files changed, 10 insertions(+), 9 deletions(-) |
| 49 |
+ |
| 50 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 51 |
+index 06623ad9..3446a87c 100644 |
| 52 |
+--- a/CMakeLists.txt |
| 53 |
++++ b/CMakeLists.txt |
| 54 |
+@@ -114,18 +114,19 @@ find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED) |
| 55 |
+ configure_file(kalarm-version-string.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kalarm-version-string.h @ONLY) |
| 56 |
+ |
| 57 |
+ if (NOT APPLE) |
| 58 |
+- find_package(X11) |
| 59 |
+-endif() |
| 60 |
+-if (X11_FOUND) |
| 61 |
+- if (QT_MAJOR_VERSION STREQUAL "5") |
| 62 |
+- find_package(Qt5X11Extras ${QT_REQUIRED_VERSION} REQUIRED NO_MODULE) |
| 63 |
+- else() |
| 64 |
+- #TODO X11 on Qt6 |
| 65 |
++ option(WITHOUT_X11 "Build without X11 integration (skips finding X11)" OFF) |
| 66 |
++ if (NOT WITHOUT_X11) |
| 67 |
++ find_package(X11) |
| 68 |
++ set(KDEPIM_HAVE_X11 ${X11_FOUND}) |
| 69 |
++ if (X11_FOUND) |
| 70 |
++ find_package(Qt5X11Extras ${QT_REQUIRED_VERSION} REQUIRED NO_MODULE) |
| 71 |
++ endif() |
| 72 |
+ endif() |
| 73 |
+ endif() |
| 74 |
++add_feature_info(WITHOUT_X11 ${WITHOUT_X11} "Build without X11 integration") |
| 75 |
++ |
| 76 |
+ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) |
| 77 |
+ |
| 78 |
+-set(KDEPIM_HAVE_X11 ${X11_FOUND}) |
| 79 |
+ configure_file(src/config-kalarm.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kalarm.h) |
| 80 |
+ |
| 81 |
+ include_directories(${kalarm_SOURCE_DIR} ${kalarm_BINARY_DIR}) |
| 82 |
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
| 83 |
+index e8d70203..3aee2965 100644 |
| 84 |
+--- a/src/CMakeLists.txt |
| 85 |
++++ b/src/CMakeLists.txt |
| 86 |
+@@ -298,7 +298,7 @@ target_link_libraries(kalarm_bin |
| 87 |
+ KF5::PimCommon |
| 88 |
+ ) |
| 89 |
+ |
| 90 |
+-if (Qt${QT_MAJOR_VERSION}X11Extras_FOUND) |
| 91 |
++if(KDEPIM_HAVE_X11) |
| 92 |
+ target_link_libraries(kalarm_bin Qt${QT_MAJOR_VERSION}::X11Extras ${X11_X11_LIB}) |
| 93 |
+ endif() |
| 94 |
+ |
| 95 |
+-- |
| 96 |
+2.35.1 |
| 97 |
+ |
| 98 |
|
| 99 |
diff --git a/kde-apps/kalarm/kalarm-22.04.3.ebuild b/kde-apps/kalarm/kalarm-22.04.3-r1.ebuild |
| 100 |
similarity index 95% |
| 101 |
rename from kde-apps/kalarm/kalarm-22.04.3.ebuild |
| 102 |
rename to kde-apps/kalarm/kalarm-22.04.3-r1.ebuild |
| 103 |
index 6a291cf0cc6b..ef402863f33c 100644 |
| 104 |
--- a/kde-apps/kalarm/kalarm-22.04.3.ebuild |
| 105 |
+++ b/kde-apps/kalarm/kalarm-22.04.3-r1.ebuild |
| 106 |
@@ -57,7 +57,7 @@ DEPEND=" |
| 107 |
>=kde-frameworks/kservice-${KFMIN}:5 |
| 108 |
>=kde-frameworks/ktextwidgets-${KFMIN}:5 |
| 109 |
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5 |
| 110 |
- >=kde-frameworks/kwindowsystem-${KFMIN}:5 |
| 111 |
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5[X?] |
| 112 |
>=kde-frameworks/kxmlgui-${KFMIN}:5 |
| 113 |
>=media-libs/phonon-4.11.0 |
| 114 |
X? ( |
| 115 |
@@ -70,10 +70,11 @@ RDEPEND="${DEPEND} |
| 116 |
>=kde-apps/kdepim-runtime-${PVCUT}:5 |
| 117 |
" |
| 118 |
|
| 119 |
+PATCHES=( "${FILESDIR}/${P}-without_x11.patch" ) |
| 120 |
+ |
| 121 |
src_configure() { |
| 122 |
local mycmakeargs=( |
| 123 |
- $(cmake_use_find_package X Qt5X11Extras) |
| 124 |
- $(cmake_use_find_package X X11) |
| 125 |
+ -DWITHOUT_X11=$(usex !X) |
| 126 |
) |
| 127 |
|
| 128 |
ecm_src_configure |
Archives