summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-05-20 15:11:08 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-05-20 15:11:08 +0100
commit4b71c2ce1e782862d9625c080c2fd086a3541b10 (patch)
tree2a41abcbe2b4c5dc21162bede6bfa3f623c765f7
parent8f45316dfa4b0c7306f3edb9ea8c6bf5791e00d3 (diff)
kde-plasma/plasma-pa : drop forced gnome USE flag dep on pulseaudio (aka gconf)
-rw-r--r--kde-plasma/plasma-pa/files/plasma-pa-no-GCONF-we-DONT-need-thx.patch65
-rw-r--r--kde-plasma/plasma-pa/plasma-pa-5.12.5-r1.ebuild (renamed from kde-plasma/plasma-pa/plasma-pa-5.12.5.ebuild)4
2 files changed, 68 insertions, 1 deletions
diff --git a/kde-plasma/plasma-pa/files/plasma-pa-no-GCONF-we-DONT-need-thx.patch b/kde-plasma/plasma-pa/files/plasma-pa-no-GCONF-we-DONT-need-thx.patch
new file mode 100644
index 00000000..bdac8934
--- /dev/null
+++ b/kde-plasma/plasma-pa/files/plasma-pa-no-GCONF-we-DONT-need-thx.patch
@@ -0,0 +1,65 @@
+diff -Naur plasma-pa-5.10.2/CMakeLists.txt plasma-pa-5.10.2-p/CMakeLists.txt
+--- plasma-pa-5.10.2/CMakeLists.txt 2017-06-13 20:39:26.000000000 +0200
++++ plasma-pa-5.10.2-p/CMakeLists.txt 2017-06-26 14:26:36.736579362 +0200
+@@ -19,8 +19,6 @@
+ include(ECMOptionalAddSubdirectory)
+
+ include(FindPkgConfig)
+-pkg_check_modules(GCONF REQUIRED gconf-2.0)
+-pkg_check_modules(GOBJECT REQUIRED gobject-2.0)
+
+ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS
+ Core
+diff -Naur plasma-pa-5.10.2/src/CMakeLists.txt plasma-pa-5.10.2-p/src/CMakeLists.txt
+--- plasma-pa-5.10.2/src/CMakeLists.txt 2017-06-13 20:37:09.000000000 +0200
++++ plasma-pa-5.10.2-p/src/CMakeLists.txt 2017-06-26 14:26:36.736579362 +0200
+@@ -14,8 +14,6 @@
+ pulseobject.cpp
+ sink.cpp
+ sinkinput.cpp
+- modulemanager.cpp
+- gconfitem.cpp
+ source.cpp
+ sourceoutput.cpp
+ stream.cpp
+@@ -47,8 +45,6 @@
+ KF5::GlobalAccel
+ ${PULSEAUDIO_LIBRARY}
+ ${PULSEAUDIO_MAINLOOP_LIBRARY}
+- ${GCONF_LDFLAGS}
+- ${GOBJECT_LDFLAGS}
+ ${CANBERRA_LIBRARIES}
+ )
+
+diff -Naur plasma-pa-5.10.2/src/kcm/package/contents/ui/main.qml plasma-pa-5.10.2-p/src/kcm/package/contents/ui/main.qml
+--- plasma-pa-5.10.2/src/kcm/package/contents/ui/main.qml 2017-06-13 20:37:09.000000000 +0200
++++ plasma-pa-5.10.2-p/src/kcm/package/contents/ui/main.qml 2017-06-26 14:26:26.642305764 +0200
+@@ -68,9 +68,5 @@
+ title: i18nc("@title:tab", "Applications")
+ Applications {}
+ }
+- Tab {
+- title: i18nc("@title:tab", "Advanced")
+- Advanced {}
+- }
+ }
+ }
+diff -Naur plasma-pa-5.10.2/src/qml/plugin.cpp plasma-pa-5.10.2-p/src/qml/plugin.cpp
+--- plasma-pa-5.10.2/src/qml/plugin.cpp 2017-06-13 20:37:09.000000000 +0200
++++ plasma-pa-5.10.2-p/src/qml/plugin.cpp 2017-06-26 14:26:36.737579389 +0200
+@@ -27,7 +27,6 @@
+ #include "sink.h"
+ #include "source.h"
+ #include "context.h"
+-#include "modulemanager.h"
+ #include "port.h"
+
+ #include "globalactioncollection.h"
+@@ -51,7 +50,6 @@
+ qmlRegisterType<QPulseAudio::SinkModel>(uri, 0, 1, "SinkModel");
+ qmlRegisterType<QPulseAudio::SinkInputModel>(uri, 0, 1, "SinkInputModel");
+ qmlRegisterType<QPulseAudio::SourceModel>(uri, 0, 1, "SourceModel");
+- qmlRegisterType<QPulseAudio::ModuleManager>(uri, 0, 1, "ModuleManager");
+ qmlRegisterType<QPulseAudio::SourceOutputModel>(uri, 0, 1, "SourceOutputModel");
+ qmlRegisterType<QPulseAudio::StreamRestoreModel>(uri, 0, 1, "StreamRestoreModel");
+ qmlRegisterType<QPulseAudio::ModuleModel>(uri, 0, 1, "ModuleModel");
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.12.5.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.12.5-r1.ebuild
index aae43ea1..7a229b54 100644
--- a/kde-plasma/plasma-pa/plasma-pa-5.12.5.ebuild
+++ b/kde-plasma/plasma-pa/plasma-pa-5.12.5-r1.ebuild
@@ -23,7 +23,9 @@ DEPEND="
dev-libs/glib:2
gnome-base/gconf:2
media-libs/libcanberra
- media-sound/pulseaudio[gnome]
+ media-sound/pulseaudio
"
RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/plasma-pa-no-GCONF-we-DONT-need-thx.patch )