* [gentoo-commits] repo/gentoo:master commit in: kde-apps/kalarm/files/
@ 2021-12-05 21:45 Conrad Kostecki
0 siblings, 0 replies; 3+ messages in thread
From: Conrad Kostecki @ 2021-12-05 21:45 UTC (permalink / raw
To: gentoo-commits
commit: 6d4e288f1e3b0f60982f0aa98fdcb909d8008584
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Dec 3 16:39:21 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Dec 5 21:45:17 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d4e288f
kde-apps/kalarm: remove unused patch(es)
Closes: https://github.com/gentoo/gentoo/pull/23165
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../kalarm/files/kalarm-21.08.3-x11-optional.patch | 34 ----------------------
1 file changed, 34 deletions(-)
diff --git a/kde-apps/kalarm/files/kalarm-21.08.3-x11-optional.patch b/kde-apps/kalarm/files/kalarm-21.08.3-x11-optional.patch
deleted file mode 100644
index 0b92c6fe5803..000000000000
--- a/kde-apps/kalarm/files/kalarm-21.08.3-x11-optional.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 1e5edd84cea5cac4dea2c488cea47766c1a33745 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Thu, 25 Nov 2021 18:33:30 +0100
-Subject: [PATCH] Add WITH_X11 switch
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fa699213..f928bf8b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -58,6 +58,7 @@ find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED DBus Gui Network Widgets
- set(CALENDARUTILS_LIB_VERSION "5.19.40")
-
- option(FILE_RESOURCES "Use file system resources instead of Akonadi resources." TRUE)
-+option(WITH_X11 "Build with X11 support" TRUE)
-
- # Find KF5 packages
- find_package(KF5Auth ${KF5_MIN_VERSION} CONFIG REQUIRED)
-@@ -106,7 +107,7 @@ 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)
-+if (NOT APPLE AND WITH_X11)
- find_package(X11)
- endif()
- if (X11_FOUND)
---
-2.33.1
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/kalarm/files/
@ 2022-08-23 11:05 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2022-08-23 11:05 UTC (permalink / raw
To: gentoo-commits
commit: 462eed65e8bfa0380704852d616e2d210e9c41b7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 23 11:01:04 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 23 11:01:04 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=462eed65
kde-apps/kalarm: Add missing patch
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../kalarm/files/kalarm-22.07.90-without_x11.patch | 75 ++++++++++++++++++++++
1 file changed, 75 insertions(+)
diff --git a/kde-apps/kalarm/files/kalarm-22.07.90-without_x11.patch b/kde-apps/kalarm/files/kalarm-22.07.90-without_x11.patch
new file mode 100644
index 000000000000..6dc0d4e02d0d
--- /dev/null
+++ b/kde-apps/kalarm/files/kalarm-22.07.90-without_x11.patch
@@ -0,0 +1,75 @@
+From 308aa74653acc86cd6a206599a56500c827927ef 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.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 21 +++++++++++++--------
+ src/CMakeLists.txt | 2 +-
+ 2 files changed, 14 insertions(+), 9 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 05ef5181..c1849f2a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -127,18 +127,23 @@ endif()
+ 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()
+- find_package(Qt${QT_MAJOR_VERSION} ${QT_REQUIRED_VERSION} CONFIG REQUIRED Gui) # qtx11extras_p.h for Qt6 < 6.2
++ 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)
++ if (QT_MAJOR_VERSION STREQUAL "5")
++ find_package(Qt5X11Extras ${QT_REQUIRED_VERSION} REQUIRED NO_MODULE)
++ else()
++ find_package(Qt${QT_MAJOR_VERSION} ${QT_REQUIRED_VERSION} CONFIG REQUIRED Gui) # qtx11extras_p.h for Qt6 < 6.2
++ endif()
++ endif()
+ endif()
++ add_feature_info(WITHOUT_X11 ${WITHOUT_X11} "Build without X11 integration")
+ endif()
++
+ 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 6bb3e5ba..9a3fb73c 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -335,7 +335,7 @@ if (ENABLE_WAKE_FROM_SUSPEND)
+ target_link_libraries(kalarm_bin KF5::AuthCore)
+ endif()
+
+-if(X11_FOUND)
++if(KDEPIM_HAVE_X11)
+ if (QT_MAJOR_VERSION STREQUAL "5")
+ target_link_libraries(kalarm_bin Qt${QT_MAJOR_VERSION}::X11Extras ${X11_X11_LIB})
+ elseif (Qt6_VERSION_MINOR LESS 2)
+--
+GitLab
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/kalarm/files/
@ 2022-12-03 10:51 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2022-12-03 10:51 UTC (permalink / raw
To: gentoo-commits
commit: b64f3378599e8c9aa4beeb50b01153a003b5b891
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 3 10:49:32 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 3 10:50:47 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b64f3378
kde-apps/kalarm: Drop obsolete patch
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../kalarm/files/kalarm-22.04.3-without_x11.patch | 73 ----------------------
1 file changed, 73 deletions(-)
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
deleted file mode 100644
index 2f904201566b..000000000000
--- a/kde-apps/kalarm/files/kalarm-22.04.3-without_x11.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-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
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-12-03 10:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-03 10:51 [gentoo-commits] repo/gentoo:master commit in: kde-apps/kalarm/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2022-08-23 11:05 Andreas Sturmlechner
2021-12-05 21:45 Conrad Kostecki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox