| 1 |
commit: 5f321cc6ff55af50a2f39d7e3f97cf6584f62a11 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jul 28 11:33:13 2018 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 28 11:33:28 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f321cc6 |
| 7 |
|
| 8 |
kde-plasma/plasma-pa: Revbump to not automagically depend on gconf. |
| 9 |
|
| 10 |
Bug: 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 |
...-pa-5.13.3-r1.ebuild => plasma-pa-5.13.3-r2.ebuild} | 1 + |
| 15 |
2 files changed, 19 insertions(+) |
| 16 |
|
| 17 |
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 |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..8e58077d478 |
| 20 |
--- /dev/null |
| 21 |
+++ b/kde-plasma/plasma-pa/files/plasma-pa-5.13.3-automagic_gconf.patch |
| 22 |
@@ -0,0 +1,18 @@ |
| 23 |
+--- plasma-pa-5.13.3/CMakeLists.txt |
| 24 |
++++ plasma-pa-5.13.3/CMakeLists.txt |
| 25 |
+@@ -18,12 +18,9 @@ |
| 26 |
+ include(KDECompilerSettings NO_POLICY_SCOPE) |
| 27 |
+ include(ECMOptionalAddSubdirectory) |
| 28 |
+ |
| 29 |
+-include(FindPkgConfig) |
| 30 |
+-pkg_check_modules(GCONF gconf-2.0) |
| 31 |
+-pkg_check_modules(GOBJECT gobject-2.0) |
| 32 |
+-if (GCONF_FOUND AND GOBJECT_FOUND) |
| 33 |
+- set(HAVE_GCONF TRUE) |
| 34 |
+-endif() |
| 35 |
++# Don't even try to use gconf. |
| 36 |
++# >=pulseaudio-12.0 recommends to no longer use it anyway. |
| 37 |
++set(HAVE_GCONF FALSE) |
| 38 |
+ |
| 39 |
+ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS |
| 40 |
+ Core |
| 41 |
|
| 42 |
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.13.3-r1.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.13.3-r2.ebuild |
| 43 |
similarity index 94% |
| 44 |
rename from kde-plasma/plasma-pa/plasma-pa-5.13.3-r1.ebuild |
| 45 |
rename to kde-plasma/plasma-pa/plasma-pa-5.13.3-r2.ebuild |
| 46 |
index 12b95df456c..3c1d7097d87 100644 |
| 47 |
--- a/kde-plasma/plasma-pa/plasma-pa-5.13.3-r1.ebuild |
| 48 |
+++ b/kde-plasma/plasma-pa/plasma-pa-5.13.3-r2.ebuild |
| 49 |
@@ -29,4 +29,5 @@ RDEPEND="${DEPEND}" |
| 50 |
PATCHES=( |
| 51 |
"${FILESDIR}/${P}-wrong-port-avail.patch" |
| 52 |
"${FILESDIR}/${P}-optional_gconf.patch" |
| 53 |
+ "${FILESDIR}/${P}-automagic_gconf.patch" |
| 54 |
) |
Archives