diff options
| author | Andreas Sturmlechner <asturm@gentoo.org> | 2025-10-02 22:27:17 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2025-10-02 22:33:11 +0200 |
| commit | 4389abbcde587f58b81ae5e881888e7deb19284c (patch) | |
| tree | a4df5ee5023c9a20d9d5c9948ae3ff40cd5edc24 | |
| parent | ed243210a54abadc07de454d5c3a9ed72e891ce8 (diff) | |
| download | kde-4389abbcde587f58b81ae5e881888e7deb19284c.tar.gz kde-4389abbcde587f58b81ae5e881888e7deb19284c.tar.bz2 kde-4389abbcde587f58b81ae5e881888e7deb19284c.zip | |
kde-apps/audiocd-kio: Use upstreamed patch for KF6 handbook fix
Upstream commit 7e6c8e08c919216b8d456a8c2fb0b4c9484f5d4c
Thanks-to: Alfred Wingate <parona@protonmail.com>
Part-of: https://github.com/gentoo/kde/pull/1071
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
3 files changed, 25 insertions, 25 deletions
diff --git a/kde-apps/audiocd-kio/audiocd-kio-25.08.49.9999.ebuild b/kde-apps/audiocd-kio/audiocd-kio-25.08.49.9999.ebuild index 845da16a493..7ff0588fa97 100644 --- a/kde-apps/audiocd-kio/audiocd-kio-25.08.49.9999.ebuild +++ b/kde-apps/audiocd-kio/audiocd-kio-25.08.49.9999.ebuild @@ -37,7 +37,7 @@ DEPEND=" " RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/${PN}-19.04.0-handbook.patch" ) +PATCHES=( "${FILESDIR}/${PN}-25.08.1-handbook.patch" ) # in git master src_configure() { local mycmakeargs=( diff --git a/kde-apps/audiocd-kio/files/audiocd-kio-19.04.0-handbook.patch b/kde-apps/audiocd-kio/files/audiocd-kio-19.04.0-handbook.patch deleted file mode 100644 index f89e4e6d663..00000000000 --- a/kde-apps/audiocd-kio/files/audiocd-kio-19.04.0-handbook.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 205f9336485b161bedb0f4fc4292247040166111 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> -Date: Sat, 20 Apr 2019 23:18:17 +0200 -Subject: [PATCH] Add kcmaudiocd doc subdir only if KF5DocTools_FOUND - ---- - kcmaudiocd/CMakeLists.txt | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/kcmaudiocd/CMakeLists.txt b/kcmaudiocd/CMakeLists.txt -index 2e0ce60..7b94b46 100644 ---- a/kcmaudiocd/CMakeLists.txt -+++ b/kcmaudiocd/CMakeLists.txt -@@ -26,4 +26,6 @@ install(FILES audiocd.desktop DESTINATION ${SERVICES_INSTALL_DIR}) - - ########### add handbook ################ - --add_subdirectory(doc) -+if(KF5DocTools_FOUND) -+ add_subdirectory(doc) -+endif() --- -2.21.0 - diff --git a/kde-apps/audiocd-kio/files/audiocd-kio-25.08.1-handbook.patch b/kde-apps/audiocd-kio/files/audiocd-kio-25.08.1-handbook.patch new file mode 100644 index 00000000000..3035a86478f --- /dev/null +++ b/kde-apps/audiocd-kio/files/audiocd-kio-25.08.1-handbook.patch @@ -0,0 +1,24 @@ +From 7e6c8e08c919216b8d456a8c2fb0b4c9484f5d4c Mon Sep 17 00:00:00 2001 +From: Matthieu Carteron <rubisetcie@gmail.com> +Date: Fri, 13 Jun 2025 20:14:15 +0200 +Subject: [PATCH] Fixed building when DocTools is disabled. + +--- + kcmaudiocd/CMakeLists.txt | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/kcmaudiocd/CMakeLists.txt b/kcmaudiocd/CMakeLists.txt +index e7e5e781..c87a469f 100644 +--- a/kcmaudiocd/CMakeLists.txt ++++ b/kcmaudiocd/CMakeLists.txt +@@ -22,4 +22,6 @@ target_link_libraries(kcm_audiocd + + ########### add handbook ################ + +-add_subdirectory(doc) ++if(KF6DocTools_FOUND) ++ add_subdirectory(doc) ++endif() +-- +GitLab + |