* [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-pa/, kde-plasma/plasma-pa/files/
@ 2018-08-07 8:05 Andreas Sturmlechner
0 siblings, 0 replies; only message in thread
From: Andreas Sturmlechner @ 2018-08-07 8:05 UTC (permalink / raw
To: gentoo-commits
commit: 886dcb9e5320402c64b9d45aaafe0ec345b4b5db
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 7 07:02:11 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 7 08:05:03 2018 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=886dcb9e
kde-plasma/plasma-pa: Do not automagically depend on gconf
Closes: https://bugs.gentoo.org/658660
Package-Manager: Portage-2.3.43, Repoman-2.3.10
.../files/plasma-pa-5.13.3-automagic_gconf.patch | 18 ++++++++++++++++++
kde-plasma/plasma-pa/plasma-pa-5.13.49.9999.ebuild | 6 +++---
kde-plasma/plasma-pa/plasma-pa-9999.ebuild | 6 +++---
3 files changed, 24 insertions(+), 6 deletions(-)
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
new file mode 100644
index 0000000000..8e58077d47
--- /dev/null
+++ b/kde-plasma/plasma-pa/files/plasma-pa-5.13.3-automagic_gconf.patch
@@ -0,0 +1,18 @@
+--- plasma-pa-5.13.3/CMakeLists.txt
++++ plasma-pa-5.13.3/CMakeLists.txt
+@@ -18,12 +18,9 @@
+ include(KDECompilerSettings NO_POLICY_SCOPE)
+ include(ECMOptionalAddSubdirectory)
+
+-include(FindPkgConfig)
+-pkg_check_modules(GCONF gconf-2.0)
+-pkg_check_modules(GOBJECT gobject-2.0)
+-if (GCONF_FOUND AND GOBJECT_FOUND)
+- set(HAVE_GCONF TRUE)
+-endif()
++# Don't even try to use gconf.
++# >=pulseaudio-12.0 recommends to no longer use it anyway.
++set(HAVE_GCONF FALSE)
+
+ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS
+ Core
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
index 0bf9a5ab73..2681cfe759 100644
--- a/kde-plasma/plasma-pa/plasma-pa-5.13.49.9999.ebuild
+++ b/kde-plasma/plasma-pa/plasma-pa-5.13.49.9999.ebuild
@@ -20,10 +20,10 @@ DEPEND="
$(add_qt_dep qtdeclarative)
$(add_qt_dep qtgui)
$(add_qt_dep qtwidgets)
- dev-libs/glib:2
- gnome-base/gconf:2
media-libs/libcanberra
- media-sound/pulseaudio[gnome(+)]
+ media-sound/pulseaudio
"
RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-5.13.3-automagic_gconf.patch" )
diff --git a/kde-plasma/plasma-pa/plasma-pa-9999.ebuild b/kde-plasma/plasma-pa/plasma-pa-9999.ebuild
index 0bf9a5ab73..2681cfe759 100644
--- a/kde-plasma/plasma-pa/plasma-pa-9999.ebuild
+++ b/kde-plasma/plasma-pa/plasma-pa-9999.ebuild
@@ -20,10 +20,10 @@ DEPEND="
$(add_qt_dep qtdeclarative)
$(add_qt_dep qtgui)
$(add_qt_dep qtwidgets)
- dev-libs/glib:2
- gnome-base/gconf:2
media-libs/libcanberra
- media-sound/pulseaudio[gnome(+)]
+ media-sound/pulseaudio
"
RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-5.13.3-automagic_gconf.patch" )
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2018-08-07 8:05 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-08-07 8:05 [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-pa/, kde-plasma/plasma-pa/files/ Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox