summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-08-07 08:55:29 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2018-08-07 09:05:40 +0200
commit23729181844ced1334c14b869fce731471565b71 (patch)
tree8e8d4287ef8c14aeb53fe14dc83857ac5cf143cc /kde-plasma/plasma-pa
parentkde-apps/spectacle: Add missing DEPEND (diff)
downloadgentoo-23729181844ced1334c14b869fce731471565b71.tar.gz
gentoo-23729181844ced1334c14b869fce731471565b71.tar.bz2
gentoo-23729181844ced1334c14b869fce731471565b71.zip
kde-plasma: Drop KDE Plasma 5.13.3
Package-Manager: Portage-2.3.44, Repoman-2.3.10
Diffstat (limited to 'kde-plasma/plasma-pa')
-rw-r--r--kde-plasma/plasma-pa/Manifest1
-rw-r--r--kde-plasma/plasma-pa/files/plasma-pa-5.13.3-optional_gconf.patch280
-rw-r--r--kde-plasma/plasma-pa/files/plasma-pa-5.13.3-wrong-port-avail.patch100
-rw-r--r--kde-plasma/plasma-pa/plasma-pa-5.13.3-r2.ebuild33
-rw-r--r--kde-plasma/plasma-pa/plasma-pa-5.13.3.ebuild31
5 files changed, 0 insertions, 445 deletions
diff --git a/kde-plasma/plasma-pa/Manifest b/kde-plasma/plasma-pa/Manifest
index 64ccc10a76f0..753a98329574 100644
--- a/kde-plasma/plasma-pa/Manifest
+++ b/kde-plasma/plasma-pa/Manifest
@@ -1,4 +1,3 @@
DIST plasma-pa-5.12.5.tar.xz 86068 BLAKE2B 5133b667527e083d390b8d0e4352fdbb2d6ccc7abf6676e07b5f141787372bd8c00cb600f08e4fd20707476108fe661c779820645f06e895c53e4aa1411bc3a1 SHA512 7fedeaaeafaba7e2d7568fddcaff1793640979090aaf8ab7131c462b2bc0c2766f76d37cd0133c02c05a23efeb9e11b11350848d59b9869bf7bfcbd55924163e
DIST plasma-pa-5.12.6.tar.xz 87396 BLAKE2B 9fdb9426e1e9ba1e92d8e9bd724930de6f5f4055ebb6f74e2b5f6abf4efcc012ef9a6193762232abc063dd17bb7cd1d7e3b12e2a7250d3e9a9f6fdbb270fa24f SHA512 6d5cb3c5ab911d286782b84c7904e6317d2346e2fdcef5611704aa64967dbe0fd3b5794f35c4744ce1a5617d9c873d0ac39c30bfaf0e56fbbbe64cfa55a1df22
-DIST plasma-pa-5.13.3.tar.xz 89888 BLAKE2B 5942e736d17097c098a809461f6829fe392df71edbe8e727b7cb94d6cc1109b301569a9d3d56ac8a5c77db8e9c818716273b431d06429a02ff774527744dbd03 SHA512 deee784b383e4f7118d652b48fd9041dc6d099c2ad78a7dfbfb0a044f7a5fd934e7f3a446158b0e88bc2cbb58185f5c162aedb637def11092050ee187d61e1c6
DIST plasma-pa-5.13.4.tar.xz 90504 BLAKE2B 1413d0424742d6dfed9a4d902e6d0685d94eba5ce7e615f95f1775d30c629bf93117670ac3e72e2aef0517755de6db1ee4cabea56abf0160d86412d18700255d SHA512 347ec79201403eeb5859c54d29e7d1daee273972afce1014e3b8c81ae6256877e945c0748ab10e4ca1b195f085248c9f03c3db0c27d978506e8eb71fb5bc37a0
diff --git a/kde-plasma/plasma-pa/files/plasma-pa-5.13.3-optional_gconf.patch b/kde-plasma/plasma-pa/files/plasma-pa-5.13.3-optional_gconf.patch
deleted file mode 100644
index f14fd180c249..000000000000
--- a/kde-plasma/plasma-pa/files/plasma-pa-5.13.3-optional_gconf.patch
+++ /dev/null
@@ -1,280 +0,0 @@
-From c9fae1fb3f8e8a820fd480ce227d7fabf87bd045 Mon Sep 17 00:00:00 2001
-From: David Rosca <nowrep@gmail.com>
-Date: Tue, 26 Jun 2018 10:56:04 +0200
-Subject: [PATCH] Make GConf optional dependency
-
-When building without GConf, Advanded Output Configuration will be hidden in KCM.
-
-BUG: 386665
-FIXED-IN: 5.13.4
-
-Differential Revision: https://phabricator.kde.org/D13734
----
- CMakeLists.txt | 9 ++++--
- config.h.cmake | 3 ++
- src/CMakeLists.txt | 18 ++++++++----
- src/kcm/package/contents/ui/Advanced.qml | 5 +++-
- src/modulemanager.cpp | 47 ++++++++++++++++++++++++++------
- src/modulemanager.h | 3 ++
- 6 files changed, 68 insertions(+), 17 deletions(-)
- create mode 100644 config.h.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e494ced..2505696 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -19,8 +19,11 @@ include(KDECompilerSettings NO_POLICY_SCOPE)
- include(ECMOptionalAddSubdirectory)
-
- include(FindPkgConfig)
--pkg_check_modules(GCONF REQUIRED gconf-2.0)
--pkg_check_modules(GOBJECT REQUIRED gobject-2.0)
-+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()
-
- find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS
- Core
-@@ -41,6 +44,8 @@ find_package(PulseAudio 5.0.0 REQUIRED)
- find_package(Canberra REQUIRED)
- find_package(GLIB2 REQUIRED)
-
-+configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
-+
- add_subdirectory(applet)
- add_subdirectory(src)
- add_subdirectory(data)
-diff --git a/config.h.cmake b/config.h.cmake
-new file mode 100644
-index 0000000..1643e50
---- /dev/null
-+++ b/config.h.cmake
-@@ -0,0 +1,3 @@
-+/* config.h. Generated by cmake from config.h.cmake */
-+
-+#cmakedefine01 HAVE_GCONF
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index e6cddfc..09d108c 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -1,5 +1,4 @@
--include_directories(${PULSEAUDIO_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR} ${GCONF_INCLUDE_DIRS}
-- ${GOBJECT_INCLUDE_DIRS})
-+include_directories(${PULSEAUDIO_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR})
-
- set(cpp_SRCS
- card.cpp
-@@ -15,7 +14,6 @@ set(cpp_SRCS
- sink.cpp
- sinkinput.cpp
- modulemanager.cpp
-- gconfitem.cpp
- source.cpp
- sourceoutput.cpp
- stream.cpp
-@@ -38,6 +36,11 @@ set(qml_SRCS
- set_property(SOURCE qml/dbus/osdService.xml APPEND PROPERTY CLASSNAME OsdServiceInterface)
- qt5_add_dbus_interface(dbus_SRCS qml/dbus/osdService.xml osdservice)
-
-+if (HAVE_GCONF)
-+ include_directories(${GCONF_INCLUDE_DIRS} ${GOBJECT_INCLUDE_DIRS})
-+ set(cpp_SRCS ${cpp_SRCS} gconfitem.cpp)
-+endif()
-+
- add_library(plasma-volume-declarative SHARED ${dbus_SRCS} ${cpp_SRCS} ${qml_SRCS})
- target_link_libraries(plasma-volume-declarative
- Qt5::Core
-@@ -47,11 +50,16 @@ target_link_libraries(plasma-volume-declarative
- KF5::GlobalAccel
- ${PULSEAUDIO_LIBRARY}
- ${PULSEAUDIO_MAINLOOP_LIBRARY}
-- ${GCONF_LDFLAGS}
-- ${GOBJECT_LDFLAGS}
- ${CANBERRA_LIBRARIES}
- )
-
-+if (HAVE_GCONF)
-+ target_link_libraries(plasma-volume-declarative
-+ ${GCONF_LDFLAGS}
-+ ${GOBJECT_LDFLAGS}
-+ )
-+endif()
-+
- set(PRIVATE_QML_INSTALL_DIR ${QML_INSTALL_DIR}/org/kde/plasma/private/volume)
- install(TARGETS plasma-volume-declarative DESTINATION ${PRIVATE_QML_INSTALL_DIR})
- install(FILES ${qml_SRCS} DESTINATION ${PRIVATE_QML_INSTALL_DIR})
-diff --git a/src/kcm/package/contents/ui/Advanced.qml b/src/kcm/package/contents/ui/Advanced.qml
-index b305cf1..0cd9eb9 100644
---- a/src/kcm/package/contents/ui/Advanced.qml
-+++ b/src/kcm/package/contents/ui/Advanced.qml
-@@ -56,6 +56,7 @@ ScrollView {
- Header {
- Layout.fillWidth: true
- text: i18n("Advanced Output Configuration")
-+ visible: moduleManager.settingsSupported
- }
-
- ModuleManager {
-@@ -71,6 +72,7 @@ ScrollView {
- checked: moduleManager.combineSinks
- onCheckedChanged: moduleManager.combineSinks = checked;
- enabled: moduleManager.loadedModules.indexOf("module-gconf") != -1
-+ visible: moduleManager.settingsSupported
- }
-
- CheckBox {
-@@ -81,6 +83,7 @@ ScrollView {
- checked: moduleManager.switchOnConnect
- onCheckedChanged: moduleManager.switchOnConnect = checked;
- enabled: moduleManager.loadedModules.indexOf("module-gconf") != -1
-+ visible: moduleManager.settingsSupported
- }
-
- Label {
-@@ -88,7 +91,7 @@ ScrollView {
- enabled: false
- font.italic: true
- text: i18n("Requires 'module-gconf' PulseAudio module")
-- visible: moduleManager.loadedModules.indexOf("module-gconf") == -1
-+ visible: moduleManager.settingsSupported && moduleManager.loadedModules.indexOf("module-gconf") == -1
- }
- }
- }
-diff --git a/src/modulemanager.cpp b/src/modulemanager.cpp
-index 635adc8..5245ac5 100644
---- a/src/modulemanager.cpp
-+++ b/src/modulemanager.cpp
-@@ -21,20 +21,22 @@
-
- #include "modulemanager.h"
- #include "module.h"
-+#include "../config.h"
-
-+#if HAVE_GCONF
-+#include "gconfitem.h"
- #define PA_GCONF_ROOT "/system/pulseaudio"
- #define PA_GCONF_PATH_MODULES PA_GCONF_ROOT"/modules"
--
--#include "gconfitem.h"
-+#endif
-
- #include <QTimer>
-
- namespace QPulseAudio
- {
-
-+#if HAVE_GCONF
- class GConfModule : public GConfItem
- {
-- Q_OBJECT
- public:
- GConfModule(const QString &configName, const QString &moduleName, QObject *parent);
- bool isEnabled() const;
-@@ -67,17 +69,21 @@ void GConfModule::setEnabled(bool enabled, const QVariant &args)
- }
- set(QStringLiteral("locked"), false);
- }
-+#endif
-
-
- ModuleManager::ModuleManager(QObject *parent) :
-- QObject(parent),
-- m_combineSinks(new GConfModule(QStringLiteral("combine"), QStringLiteral("module-combine"), this)),
-- m_switchOnConnect(new GConfModule(QStringLiteral("switch-on-connect"), QStringLiteral("module-switch-on-connect"), this)),
-- m_deviceManager(new GConfModule(QStringLiteral("device-manager"), QStringLiteral("module-device-manager"), this))
-+ QObject(parent)
- {
-+#if HAVE_GCONF
-+ m_combineSinks = new GConfModule(QStringLiteral("combine"), QStringLiteral("module-combine"), this);
-+ m_switchOnConnect = new GConfModule(QStringLiteral("switch-on-connect"), QStringLiteral("module-switch-on-connect"), this);
-+ m_deviceManager = new GConfModule(QStringLiteral("device-manager"), QStringLiteral("module-device-manager"), this);
-+
- connect(m_combineSinks, &GConfItem::subtreeChanged, this, &ModuleManager::combineSinksChanged);
- connect(m_switchOnConnect, &GConfItem::subtreeChanged, this, &ModuleManager::switchOnConnectChanged);
- connect(m_deviceManager, &GConfItem::subtreeChanged, this, &ModuleManager::switchOnConnectChanged);
-+#endif
-
- QTimer *updateModulesTimer = new QTimer(this);
- updateModulesTimer->setInterval(500);
-@@ -92,14 +98,31 @@ ModuleManager::~ModuleManager()
- {
- };
-
-+bool ModuleManager::settingsSupported() const
-+{
-+#if HAVE_GCONF
-+ return true;
-+#else
-+ return false;
-+#endif
-+}
-+
- bool ModuleManager::combineSinks() const
- {
-+#if HAVE_GCONF
- return m_combineSinks->isEnabled();
-+#else
-+ return false;
-+#endif
- }
-
- void ModuleManager::setCombineSinks(bool combineSinks)
- {
-+#if HAVE_GCONF
- m_combineSinks->setEnabled(combineSinks);
-+#else
-+ Q_UNUSED(combineSinks)
-+#endif
- }
-
- bool ModuleManager::switchOnConnect() const
-@@ -109,13 +132,21 @@ bool ModuleManager::switchOnConnect() const
- //Note on the first run m_deviceManager will appear to be disabled even though it's actually running
- //because there is no gconf entry, however m_switchOnConnect will only exist if set by Plasma PA
- //hence only check this entry
-+#if HAVE_GCONF
- return m_switchOnConnect->isEnabled() ;
-+#else
-+ return false;
-+#endif
- }
-
- void ModuleManager::setSwitchOnConnect(bool switchOnConnect)
- {
-+#if HAVE_GCONF
- m_deviceManager->setEnabled(!switchOnConnect);
- m_switchOnConnect->setEnabled(switchOnConnect);
-+#else
-+ Q_UNUSED(switchOnConnect)
-+#endif
- }
-
- QStringList ModuleManager::loadedModules() const
-@@ -134,5 +165,3 @@ void ModuleManager::updateLoadedModules()
- }
-
- }
--
--#include "modulemanager.moc"
-diff --git a/src/modulemanager.h b/src/modulemanager.h
-index b8fcd0b..8108fe0 100644
---- a/src/modulemanager.h
-+++ b/src/modulemanager.h
-@@ -38,12 +38,15 @@ class GConfModule;
- class ModuleManager : public QObject
- {
- Q_OBJECT
-+ Q_PROPERTY(bool settingsSupported READ settingsSupported CONSTANT)
- Q_PROPERTY(bool combineSinks READ combineSinks WRITE setCombineSinks NOTIFY combineSinksChanged)
- Q_PROPERTY(bool switchOnConnect READ switchOnConnect WRITE setSwitchOnConnect NOTIFY switchOnConnectChanged)
- Q_PROPERTY(QStringList loadedModules READ loadedModules NOTIFY loadedModulesChanged)
- public:
- ModuleManager(QObject *parent = nullptr);
- ~ModuleManager();
-+
-+ bool settingsSupported() const;
- bool combineSinks() const;
- void setCombineSinks(bool combineSinks);
- bool switchOnConnect() const;
diff --git a/kde-plasma/plasma-pa/files/plasma-pa-5.13.3-wrong-port-avail.patch b/kde-plasma/plasma-pa/files/plasma-pa-5.13.3-wrong-port-avail.patch
deleted file mode 100644
index 7670ec7c7d0d..000000000000
--- a/kde-plasma/plasma-pa/files/plasma-pa-5.13.3-wrong-port-avail.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From b97846017df57698f9e77c8aab077d5a3f17e7ea Mon Sep 17 00:00:00 2001
-From: Andreas Krutzler <andi.krutzler@gmail.com>
-Date: Fri, 29 Jun 2018 09:39:28 +0200
-Subject: Fix wrong availability of profiles and ports.
-
-Summary: Fixed bug where available ports are displayed as unavailable/unplugged and vice versa. It seems that this bug was introduced with D9671.
-
-Reviewers: nicolasfella, broulik, drosca
-
-Subscribers: plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D13694
----
- src/port.h | 13 ++++++++++++-
- src/profile.h | 30 ++++++++++++++++++------------
- 2 files changed, 30 insertions(+), 13 deletions(-)
-
-diff --git a/src/port.h b/src/port.h
-index 8a8126e..bbf32db 100644
---- a/src/port.h
-+++ b/src/port.h
-@@ -40,7 +40,18 @@ public:
- template<typename PAInfo>
- void setInfo(const PAInfo *info)
- {
-- Profile::setInfo(info);
-+ Availability newAvailability;
-+ switch (info->available) {
-+ case PA_PORT_AVAILABLE_NO:
-+ newAvailability = Unavailable;
-+ break;
-+ case PA_PORT_AVAILABLE_YES:
-+ newAvailability = Available;
-+ break;
-+ default:
-+ newAvailability = Unknown;
-+ }
-+ setCommonInfo(info, newAvailability);
- }
- };
-
-diff --git a/src/profile.h b/src/profile.h
-index d8188a2..cd29c62 100644
---- a/src/profile.h
-+++ b/src/profile.h
-@@ -49,6 +49,24 @@ public:
- template<typename PAInfo>
- void setInfo(const PAInfo *info)
- {
-+ setCommonInfo(info, info->available ? Available : Unavailable);
-+ }
-+
-+ QString name() const;
-+ QString description() const;
-+ quint32 priority() const;
-+ Availability availability() const;
-+
-+signals:
-+ void nameChanged();
-+ void descriptionChanged();
-+ void priorityChanged();
-+ void availabilityChanged();
-+
-+protected:
-+ template<typename PAInfo>
-+ void setCommonInfo(const PAInfo *info, Availability newAvailability)
-+ {
- // Description is optional. Name not so much as we need some ID.
- Q_ASSERT(info->name);
- QString infoName = QString::fromUtf8(info->name);
-@@ -68,24 +86,12 @@ public:
- emit priorityChanged();
- }
-
-- Availability newAvailability = info->available ? Available : Unavailable;
- if (m_availability != newAvailability) {
- m_availability = newAvailability;
- emit availabilityChanged();
- }
- }
-
-- QString name() const;
-- QString description() const;
-- quint32 priority() const;
-- Availability availability() const;
--
--signals:
-- void nameChanged();
-- void descriptionChanged();
-- void priorityChanged();
-- void availabilityChanged();
--
- private:
- QString m_name;
- QString m_description;
---
-cgit v0.11.2
-
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.13.3-r2.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.13.3-r2.ebuild
deleted file mode 100644
index 3c1d7097d87d..000000000000
--- a/kde-plasma/plasma-pa/plasma-pa-5.13.3-r2.ebuild
+++ /dev/null
@@ -1,33 +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)
- media-libs/libcanberra
- media-sound/pulseaudio
-"
-
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${P}-wrong-port-avail.patch"
- "${FILESDIR}/${P}-optional_gconf.patch"
- "${FILESDIR}/${P}-automagic_gconf.patch"
-)
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.13.3.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.13.3.ebuild
deleted file mode 100644
index 5b563ea9d021..000000000000
--- a/kde-plasma/plasma-pa/plasma-pa-5.13.3.ebuild
+++ /dev/null
@@ -1,31 +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}"
-
-PATCHES=( "${FILESDIR}/${P}-wrong-port-avail.patch" )