From 4b71c2ce1e782862d9625c080c2fd086a3541b10 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 May 2018 15:11:08 +0100 Subject: kde-plasma/plasma-pa : drop forced gnome USE flag dep on pulseaudio (aka gconf) --- .../plasma-pa-no-GCONF-we-DONT-need-thx.patch | 65 ++++++++++++++++++++++ kde-plasma/plasma-pa/plasma-pa-5.12.5-r1.ebuild | 31 +++++++++++ kde-plasma/plasma-pa/plasma-pa-5.12.5.ebuild | 29 ---------- 3 files changed, 96 insertions(+), 29 deletions(-) create mode 100644 kde-plasma/plasma-pa/files/plasma-pa-no-GCONF-we-DONT-need-thx.patch create mode 100644 kde-plasma/plasma-pa/plasma-pa-5.12.5-r1.ebuild delete mode 100644 kde-plasma/plasma-pa/plasma-pa-5.12.5.ebuild (limited to 'kde-plasma') 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(uri, 0, 1, "SinkModel"); + qmlRegisterType(uri, 0, 1, "SinkInputModel"); + qmlRegisterType(uri, 0, 1, "SourceModel"); +- qmlRegisterType(uri, 0, 1, "ModuleManager"); + qmlRegisterType(uri, 0, 1, "SourceOutputModel"); + qmlRegisterType(uri, 0, 1, "StreamRestoreModel"); + qmlRegisterType(uri, 0, 1, "ModuleModel"); diff --git a/kde-plasma/plasma-pa/plasma-pa-5.12.5-r1.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.12.5-r1.ebuild new file mode 100644 index 00000000..7a229b54 --- /dev/null +++ b/kde-plasma/plasma-pa/plasma-pa-5.12.5-r1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +KDE_HANDBOOK="forceoptional" +inherit kde5 + +DESCRIPTION="Plasma applet for audio volume management using PulseAudio" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +DEPEND=" + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kdeclarative) + $(add_frameworks_dep kglobalaccel) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep plasma) + $(add_qt_dep qtdbus) + $(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 +" + +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}"/plasma-pa-no-GCONF-we-DONT-need-thx.patch ) diff --git a/kde-plasma/plasma-pa/plasma-pa-5.12.5.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.12.5.ebuild deleted file mode 100644 index aae43ea1..00000000 --- a/kde-plasma/plasma-pa/plasma-pa-5.12.5.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_HANDBOOK="forceoptional" -inherit kde5 - -DESCRIPTION="Plasma applet for audio volume management using PulseAudio" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="" - -DEPEND=" - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdeclarative) - $(add_frameworks_dep kglobalaccel) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep plasma) - $(add_qt_dep qtdbus) - $(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] -" - -RDEPEND="${DEPEND}" -- cgit v1.2.3