| 1 |
commit: 886dcb9e5320402c64b9d45aaafe0ec345b4b5db |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 7 07:02:11 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 7 08:05:03 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=886dcb9e |
| 7 |
|
| 8 |
kde-plasma/plasma-pa: Do not automagically depend on gconf |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/658660 |
| 11 |
Package-Manager: Portage-2.3.43, Repoman-2.3.10 |
| 12 |
|
| 13 |
.../files/plasma-pa-5.13.3-automagic_gconf.patch | 18 ++++++++++++++++++ |
| 14 |
kde-plasma/plasma-pa/plasma-pa-5.13.49.9999.ebuild | 6 +++--- |
| 15 |
kde-plasma/plasma-pa/plasma-pa-9999.ebuild | 6 +++--- |
| 16 |
3 files changed, 24 insertions(+), 6 deletions(-) |
| 17 |
|
| 18 |
diff --git a/kde-plasma/plasma-pa/files/plasma-pa-5.13.3-automagic_gconf.patch b/kde-plasma/plasma-pa/files/plasma-pa-5.13.3-automagic_gconf.patch |
| 19 |
new file mode 100644 |
| 20 |
index 0000000000..8e58077d47 |
| 21 |
--- /dev/null |
| 22 |
+++ b/kde-plasma/plasma-pa/files/plasma-pa-5.13.3-automagic_gconf.patch |
| 23 |
@@ -0,0 +1,18 @@ |
| 24 |
+--- plasma-pa-5.13.3/CMakeLists.txt |
| 25 |
++++ plasma-pa-5.13.3/CMakeLists.txt |
| 26 |
+@@ -18,12 +18,9 @@ |
| 27 |
+ include(KDECompilerSettings NO_POLICY_SCOPE) |
| 28 |
+ include(ECMOptionalAddSubdirectory) |
| 29 |
+ |
| 30 |
+-include(FindPkgConfig) |
| 31 |
+-pkg_check_modules(GCONF gconf-2.0) |
| 32 |
+-pkg_check_modules(GOBJECT gobject-2.0) |
| 33 |
+-if (GCONF_FOUND AND GOBJECT_FOUND) |
| 34 |
+- set(HAVE_GCONF TRUE) |
| 35 |
+-endif() |
| 36 |
++# Don't even try to use gconf. |
| 37 |
++# >=pulseaudio-12.0 recommends to no longer use it anyway. |
| 38 |
++set(HAVE_GCONF FALSE) |
| 39 |
+ |
| 40 |
+ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS |
| 41 |
+ Core |
| 42 |
|
| 43 |
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.13.49.9999.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.13.49.9999.ebuild |
| 44 |
index 0bf9a5ab73..2681cfe759 100644 |
| 45 |
--- a/kde-plasma/plasma-pa/plasma-pa-5.13.49.9999.ebuild |
| 46 |
+++ b/kde-plasma/plasma-pa/plasma-pa-5.13.49.9999.ebuild |
| 47 |
@@ -20,10 +20,10 @@ DEPEND=" |
| 48 |
$(add_qt_dep qtdeclarative) |
| 49 |
$(add_qt_dep qtgui) |
| 50 |
$(add_qt_dep qtwidgets) |
| 51 |
- dev-libs/glib:2 |
| 52 |
- gnome-base/gconf:2 |
| 53 |
media-libs/libcanberra |
| 54 |
- media-sound/pulseaudio[gnome(+)] |
| 55 |
+ media-sound/pulseaudio |
| 56 |
" |
| 57 |
|
| 58 |
RDEPEND="${DEPEND}" |
| 59 |
+ |
| 60 |
+PATCHES=( "${FILESDIR}/${PN}-5.13.3-automagic_gconf.patch" ) |
| 61 |
|
| 62 |
diff --git a/kde-plasma/plasma-pa/plasma-pa-9999.ebuild b/kde-plasma/plasma-pa/plasma-pa-9999.ebuild |
| 63 |
index 0bf9a5ab73..2681cfe759 100644 |
| 64 |
--- a/kde-plasma/plasma-pa/plasma-pa-9999.ebuild |
| 65 |
+++ b/kde-plasma/plasma-pa/plasma-pa-9999.ebuild |
| 66 |
@@ -20,10 +20,10 @@ DEPEND=" |
| 67 |
$(add_qt_dep qtdeclarative) |
| 68 |
$(add_qt_dep qtgui) |
| 69 |
$(add_qt_dep qtwidgets) |
| 70 |
- dev-libs/glib:2 |
| 71 |
- gnome-base/gconf:2 |
| 72 |
media-libs/libcanberra |
| 73 |
- media-sound/pulseaudio[gnome(+)] |
| 74 |
+ media-sound/pulseaudio |
| 75 |
" |
| 76 |
|
| 77 |
RDEPEND="${DEPEND}" |
| 78 |
+ |
| 79 |
+PATCHES=( "${FILESDIR}/${PN}-5.13.3-automagic_gconf.patch" ) |
Archives