From 85b4dac8f08d6690d531e17fafe23f30ecb4064f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:24:29 +0100 Subject: gentoo resync : 14.07.2018 --- kde-plasma/plasma-pa/Manifest | 5 +- .../files/plasma-pa-5.13.3-wrong-port-avail.patch | 100 +++++++++++++++++++++ kde-plasma/plasma-pa/plasma-pa-5.13.2.ebuild | 29 ------ kde-plasma/plasma-pa/plasma-pa-5.13.3.ebuild | 31 +++++++ 4 files changed, 134 insertions(+), 31 deletions(-) create mode 100644 kde-plasma/plasma-pa/files/plasma-pa-5.13.3-wrong-port-avail.patch delete mode 100644 kde-plasma/plasma-pa/plasma-pa-5.13.2.ebuild create mode 100644 kde-plasma/plasma-pa/plasma-pa-5.13.3.ebuild (limited to 'kde-plasma/plasma-pa') diff --git a/kde-plasma/plasma-pa/Manifest b/kde-plasma/plasma-pa/Manifest index 99aac2973ada..8d990e1454e9 100644 --- a/kde-plasma/plasma-pa/Manifest +++ b/kde-plasma/plasma-pa/Manifest @@ -1,7 +1,8 @@ +AUX plasma-pa-5.13.3-wrong-port-avail.patch 2797 BLAKE2B d17cb7f3220219ebed54db3fa5d6f9b2dede0d90bef21237cd4f48d961bad56109a5ae459e6691305bd8de73e6e9a500c46c745e991f9fcaefea6db27da23cca SHA512 67811d1427aa38265fb1d62cdf7a864318c150f7fc29ba7226deed529d76ae220db1469958563bf5b3ea30bcb07537f08f4982276b41ed1d9b55bf51a585d5fe 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.2.tar.xz 90264 BLAKE2B ba4bad272f8e29e04d305f112c2b2374b4ed8cb1e17fe6fb0af225aac6c810c5940520b337c61390d93115cec6e74c14fe4913f5a8a68ec3777c8ee76a00b6fc SHA512 27506a7fb8bd5ab505f139336711302e06fbcd04cb2d9b5b29e23a777098228da59420e0ca48d2737cee9e5d69153ba5cd42833e048bf50a29b1afc5e3cf85f8 +DIST plasma-pa-5.13.3.tar.xz 89888 BLAKE2B 5942e736d17097c098a809461f6829fe392df71edbe8e727b7cb94d6cc1109b301569a9d3d56ac8a5c77db8e9c818716273b431d06429a02ff774527744dbd03 SHA512 deee784b383e4f7118d652b48fd9041dc6d099c2ad78a7dfbfb0a044f7a5fd934e7f3a446158b0e88bc2cbb58185f5c162aedb637def11092050ee187d61e1c6 EBUILD plasma-pa-5.12.5.ebuild 654 BLAKE2B 92ab0bdf33a2abbeff636da7fd356b4bd94c2c7d3bc73adf0867c3563e6ed06bff4ff1706c49eb5d6730f16667c29b8d234899a24a1016b7af51b98400778ed8 SHA512 7aadaba73defe948c5eaeab2a08810ccc02bdfbc32acdc9b6729185c8c0c1c3f05a6bf93137c46dea46fe2ec2c1fd92388b47dc117f6d3688b211355751a0040 EBUILD plasma-pa-5.12.6.ebuild 656 BLAKE2B 983c94164589679c8600b9c09c6e4e1c8c08708c9435f09626e6634fec3644fd5af322290b57f7fbb9d268f3eefabf2460e75140e3899ba4a4d4983d4f733b24 SHA512 caaa8c3ed5652cf042a60ed86134afb1d0034fd8da500008cfdc3469db9b17a6074be1b27d9935f1c866522fce30c656cbcadfdb11919f19ea6111d44f1be1c5 -EBUILD plasma-pa-5.13.2.ebuild 656 BLAKE2B 983c94164589679c8600b9c09c6e4e1c8c08708c9435f09626e6634fec3644fd5af322290b57f7fbb9d268f3eefabf2460e75140e3899ba4a4d4983d4f733b24 SHA512 caaa8c3ed5652cf042a60ed86134afb1d0034fd8da500008cfdc3469db9b17a6074be1b27d9935f1c866522fce30c656cbcadfdb11919f19ea6111d44f1be1c5 +EBUILD plasma-pa-5.13.3.ebuild 711 BLAKE2B 0c191688c39821413fed24e59393e66c5267e9e815beeb322a21f5fadf290de93ea6de1d0fe78c953290c1e172a1db06527c4d2f4240ca572ab9b198c4edd9e1 SHA512 934f5645283ba3297801dfb078326d059af98d831dc54c5c257ed64f6fc6f120df60c1020d0f485a940ac5aa3054d4d8a836feb95aba240e0a0f8cad72428c5a MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 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 new file mode 100644 index 000000000000..7670ec7c7d0d --- /dev/null +++ b/kde-plasma/plasma-pa/files/plasma-pa-5.13.3-wrong-port-avail.patch @@ -0,0 +1,100 @@ +From b97846017df57698f9e77c8aab077d5a3f17e7ea Mon Sep 17 00:00:00 2001 +From: Andreas Krutzler +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 + 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 + 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 ++ 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.2.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.13.2.ebuild deleted file mode 100644 index aae43ea14cd3..000000000000 --- a/kde-plasma/plasma-pa/plasma-pa-5.13.2.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}" diff --git a/kde-plasma/plasma-pa/plasma-pa-5.13.3.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.13.3.ebuild new file mode 100644 index 000000000000..5b563ea9d021 --- /dev/null +++ b/kde-plasma/plasma-pa/plasma-pa-5.13.3.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[gnome] +" + +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${P}-wrong-port-avail.patch" ) -- cgit v1.2.3