fix update to pulseaudio 12

This commit is contained in:
odrling 2018-07-15 01:12:20 +02:00
parent 448da33fec
commit 13e882e2cf
4 changed files with 143 additions and 0 deletions

View file

@ -0,0 +1,4 @@
AUX plasma-pa-5.13.3-wrong-port-avail.patch 2797 BLAKE2B d17cb7f3220219ebed54db3fa5d6f9b2dede0d90bef21237cd4f48d961bad56109a5ae459e6691305bd8de73e6e9a500c46c745e991f9fcaefea6db27da23cca SHA512 67811d1427aa38265fb1d62cdf7a864318c150f7fc29ba7226deed529d76ae220db1469958563bf5b3ea30bcb07537f08f4982276b41ed1d9b55bf51a585d5fe
DIST plasma-pa-5.13.3.tar.xz 89888 BLAKE2B 5942e736d17097c098a809461f6829fe392df71edbe8e727b7cb94d6cc1109b301569a9d3d56ac8a5c77db8e9c818716273b431d06429a02ff774527744dbd03 SHA512 deee784b383e4f7118d652b48fd9041dc6d099c2ad78a7dfbfb0a044f7a5fd934e7f3a446158b0e88bc2cbb58185f5c162aedb637def11092050ee187d61e1c6
EBUILD plasma-pa-5.13.3.ebuild 711 BLAKE2B 5fffb007a17c46b62124d86cc64bdf467e049a1b7091d92918df762a02335a025b4199138d3bcc5d0cb56ab2f087278717b173f1594a1e072552e0a711deaa2b SHA512 051cef6d5848f0a123f3f3bcbe5d8009cf86248ab2880bfc83a28f4a88a884a603d285ea98f80b20a2cf7ade10963195f630ba477eb924a9e6210545a3f58a3f
MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3

View file

@ -0,0 +1,100 @@
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

View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>kde@gentoo.org</email>
<name>Gentoo KDE Project</name>
</maintainer>
</pkgmetadata>

View file

@ -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[gconf]
"
RDEPEND="${DEPEND}"
PATCHES=( "${FILESDIR}/${P}-wrong-port-avail.patch" )