Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/audiocd-kio/files/, kde-apps/audiocd-kio/
Date: Sun, 21 Apr 2019 11:18:37
Message-Id: 1555844675.fb9637ca678bf9efc7ac7453464e6cb7cfa6d364.asturm@gentoo
1 commit: fb9637ca678bf9efc7ac7453464e6cb7cfa6d364
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Apr 21 11:02:12 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Apr 21 11:04:35 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=fb9637ca
7
8 kde-apps/audiocd-kio: Fix cmake configure with USE -handbook
9
10 Package-Manager: Portage-2.3.64, Repoman-2.3.12
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 .../audiocd-kio/audiocd-kio-19.04.49.9999.ebuild | 2 ++
14 kde-apps/audiocd-kio/audiocd-kio-9999.ebuild | 2 ++
15 .../files/audiocd-kio-19.04.0-handbook.patch | 24 ++++++++++++++++++++++
16 3 files changed, 28 insertions(+)
17
18 diff --git a/kde-apps/audiocd-kio/audiocd-kio-19.04.49.9999.ebuild b/kde-apps/audiocd-kio/audiocd-kio-19.04.49.9999.ebuild
19 index d62579e45d..8fc361f8b8 100644
20 --- a/kde-apps/audiocd-kio/audiocd-kio-19.04.49.9999.ebuild
21 +++ b/kde-apps/audiocd-kio/audiocd-kio-19.04.49.9999.ebuild
22 @@ -31,6 +31,8 @@ DEPEND="
23 "
24 RDEPEND="${DEPEND}"
25
26 +PATCHES=( "${FILESDIR}/${PN}-19.04.0-handbook.patch" )
27 +
28 src_configure() {
29 local mycmakeargs=(
30 $(cmake-utils_use_find_package flac FLAC)
31
32 diff --git a/kde-apps/audiocd-kio/audiocd-kio-9999.ebuild b/kde-apps/audiocd-kio/audiocd-kio-9999.ebuild
33 index d62579e45d..8fc361f8b8 100644
34 --- a/kde-apps/audiocd-kio/audiocd-kio-9999.ebuild
35 +++ b/kde-apps/audiocd-kio/audiocd-kio-9999.ebuild
36 @@ -31,6 +31,8 @@ DEPEND="
37 "
38 RDEPEND="${DEPEND}"
39
40 +PATCHES=( "${FILESDIR}/${PN}-19.04.0-handbook.patch" )
41 +
42 src_configure() {
43 local mycmakeargs=(
44 $(cmake-utils_use_find_package flac FLAC)
45
46 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
47 new file mode 100644
48 index 0000000000..f89e4e6d66
49 --- /dev/null
50 +++ b/kde-apps/audiocd-kio/files/audiocd-kio-19.04.0-handbook.patch
51 @@ -0,0 +1,24 @@
52 +From 205f9336485b161bedb0f4fc4292247040166111 Mon Sep 17 00:00:00 2001
53 +From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com>
54 +Date: Sat, 20 Apr 2019 23:18:17 +0200
55 +Subject: [PATCH] Add kcmaudiocd doc subdir only if KF5DocTools_FOUND
56 +
57 +---
58 + kcmaudiocd/CMakeLists.txt | 4 +++-
59 + 1 file changed, 3 insertions(+), 1 deletion(-)
60 +
61 +diff --git a/kcmaudiocd/CMakeLists.txt b/kcmaudiocd/CMakeLists.txt
62 +index 2e0ce60..7b94b46 100644
63 +--- a/kcmaudiocd/CMakeLists.txt
64 ++++ b/kcmaudiocd/CMakeLists.txt
65 +@@ -26,4 +26,6 @@ install(FILES audiocd.desktop DESTINATION ${SERVICES_INSTALL_DIR})
66 +
67 + ########### add handbook ################
68 +
69 +-add_subdirectory(doc)
70 ++if(KF5DocTools_FOUND)
71 ++ add_subdirectory(doc)
72 ++endif()
73 +--
74 +2.21.0
75 +