| 1 |
commit: d945698d38bd79ea0737872b8507f506341f1d2b |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Dec 10 19:45:26 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Dec 10 19:45:26 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d945698d |
| 7 |
|
| 8 |
kde-frameworks/knotifyconfig: Fix build with USE -phonon |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/672866 |
| 11 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
| 12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 13 |
|
| 14 |
.../knotifyconfig-5.53.0-phonon-optional.patch | 48 ++++++++++++++++++++++ |
| 15 |
.../knotifyconfig/knotifyconfig-5.53.0.ebuild | 2 + |
| 16 |
2 files changed, 50 insertions(+) |
| 17 |
|
| 18 |
diff --git a/kde-frameworks/knotifyconfig/files/knotifyconfig-5.53.0-phonon-optional.patch b/kde-frameworks/knotifyconfig/files/knotifyconfig-5.53.0-phonon-optional.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..0854b76da84 |
| 21 |
--- /dev/null |
| 22 |
+++ b/kde-frameworks/knotifyconfig/files/knotifyconfig-5.53.0-phonon-optional.patch |
| 23 |
@@ -0,0 +1,48 @@ |
| 24 |
+From 78a1dcc794f57be993ada7c6f129586ebb6b181e Mon Sep 17 00:00:00 2001 |
| 25 |
+From: Heiko Becker <heirecka@×××××××.org> |
| 26 |
+Date: Mon, 10 Dec 2018 16:15:08 +0100 |
| 27 |
+Subject: Fix build without Phonon |
| 28 |
+ |
| 29 |
+Summary: |
| 30 |
+f6d55baf5aa88eaab6b2f96c025064f081d13cea replaced ${PHONON_LIBS} with |
| 31 |
+Phonon's imported target. This breaks in the case when Phonon isn't |
| 32 |
+found or disabled via -DCMAKE_DISABLE_FIND_PACKAGES_Phonon4Qt5=TRUE |
| 33 |
+because the imported target isn't known. It worked previously because |
| 34 |
+${PHONON_LIBS} was just empty when Phonon wasn't available. |
| 35 |
+ |
| 36 |
+Test Plan: |
| 37 |
+Building without phonon works now and and it still builds |
| 38 |
+with phonon available and successfully links to it. |
| 39 |
+ |
| 40 |
+Subscribers: kde-frameworks-devel |
| 41 |
+ |
| 42 |
+Tags: #frameworks |
| 43 |
+ |
| 44 |
+Differential Revision: https://phabricator.kde.org/D17479 |
| 45 |
+--- |
| 46 |
+ src/CMakeLists.txt | 8 +++++++- |
| 47 |
+ 1 file changed, 7 insertions(+), 1 deletion(-) |
| 48 |
+ |
| 49 |
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
| 50 |
+index 3dd0039..b93cabc 100644 |
| 51 |
+--- a/src/CMakeLists.txt |
| 52 |
++++ b/src/CMakeLists.txt |
| 53 |
+@@ -27,9 +27,15 @@ target_link_libraries(KF5NotifyConfig |
| 54 |
+ PRIVATE |
| 55 |
+ KF5::I18n |
| 56 |
+ KF5::KIOWidgets # KUrlRequester |
| 57 |
+- Phonon::phonon4qt5 |
| 58 |
+ Qt5::DBus) |
| 59 |
+ |
| 60 |
++if(HAVE_PHONON) |
| 61 |
++ target_link_libraries(KF5NotifyConfig |
| 62 |
++ PRIVATE |
| 63 |
++ Phonon::phonon4qt5 |
| 64 |
++ ) |
| 65 |
++endif() |
| 66 |
++ |
| 67 |
+ set_target_properties(KF5NotifyConfig PROPERTIES |
| 68 |
+ VERSION ${KNOTIFYCONFIG_VERSION_STRING} |
| 69 |
+ SOVERSION ${KNOTIFYCONFIG_SOVERSION} |
| 70 |
+-- |
| 71 |
+cgit v1.1 |
| 72 |
|
| 73 |
diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-5.53.0.ebuild b/kde-frameworks/knotifyconfig/knotifyconfig-5.53.0.ebuild |
| 74 |
index 7c834ad4baf..65aca3a9a07 100644 |
| 75 |
--- a/kde-frameworks/knotifyconfig/knotifyconfig-5.53.0.ebuild |
| 76 |
+++ b/kde-frameworks/knotifyconfig/knotifyconfig-5.53.0.ebuild |
| 77 |
@@ -22,3 +22,5 @@ RDEPEND=" |
| 78 |
phonon? ( media-libs/phonon[qt5(+)] ) |
| 79 |
" |
| 80 |
DEPEND="${RDEPEND}" |
| 81 |
+ |
| 82 |
+PATCHES=( "${FILESDIR}/${P}-phonon-optional.patch" ) |
Archives