[arch-commits] Commit in pavucontrol/trunk (PKGBUILD unavail.patch)

[Jan Steffens]

    Date: Saturday, December 26, 2015 @ 02:39:49
  Author: heftig
Revision: 257277

Remove gnome-icon-theme dep; cherry-pick a patch

Added:
  pavucontrol/trunk/unavail.patch
Modified:
  pavucontrol/trunk/PKGBUILD

---------------+
 PKGBUILD      |   14 +++++++++----
 unavail.patch |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-12-26 01:38:17 UTC (rev 257276)
+++ PKGBUILD	2015-12-26 01:39:49 UTC (rev 257277)
@@ -7,15 +7,21 @@
 pkgname=pavucontrol
 pkgdesc="A GTK volume control for PulseAudio"
 pkgver=3.0
-pkgrel=2
+pkgrel=3
 arch=(i686 x86_64)
 url="http://freedesktop.org/software/pulseaudio/pavucontrol/"
 license=(GPL)
-depends=(gnome-icon-theme libcanberra-pulse gtkmm3 libsigc++)
+depends=(libcanberra-pulse gtkmm3 libsigc++)
 makedepends=(intltool lynx)
-source=($url/$pkgname-$pkgver.tar.xz)
-sha256sums=('b3d2ea5a25fc88dcee80c396014f72df1b4742f8cfbbc5349c39d64a0d338890')
+source=($url/$pkgname-$pkgver.tar.xz unavail.patch)
+sha256sums=('b3d2ea5a25fc88dcee80c396014f72df1b4742f8cfbbc5349c39d64a0d338890'
+            'c184782275e90ff24b647a8d690b46e12bd9d52bdb263689e2469a2dbd164235')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../unavail.patch
+}
+
 build() {
   cd $pkgname-$pkgver
   CXXFLAGS+=' -std=c++11'

Added: unavail.patch
===================================================================
--- unavail.patch	                        (rev 0)
+++ unavail.patch	2015-12-26 01:39:49 UTC (rev 257277)
@@ -0,0 +1,60 @@
+From c4fcb1c772bd695a1b820ba656bb4149ab595c6e Mon Sep 17 00:00:00 2001
+From: David Kreuter <dkreuter at gmail.com>
+Date: Wed, 25 Mar 2015 20:48:24 +0100
+Subject: mainwindow: unavailable profiles are marked as such in their
+ description
+
+
+diff --git a/src/mainwindow.cc b/src/mainwindow.cc
+index b45ab59..d440e9e 100644
+--- a/src/mainwindow.cc
++++ b/src/mainwindow.cc
+@@ -37,7 +37,7 @@
+ 
+ /* Used for profile sorting */
+ struct profile_prio_compare {
+-    bool operator() (const pa_card_profile_info& lhs, const pa_card_profile_info& rhs) const {
++    bool operator() (const pa_card_profile_info2& lhs, const pa_card_profile_info2& rhs) const {
+ 
+         if (lhs.priority == rhs.priority)
+             return strcmp(lhs.name, rhs.name) > 0;
+@@ -333,7 +333,7 @@ void MainWindow::updateCard(const pa_card_info &info) {
+     CardWidget *w;
+     bool is_new = false;
+     const char *description, *icon;
+-    std::set<pa_card_profile_info,profile_prio_compare> profile_priorities;
++    std::set<pa_card_profile_info2,profile_prio_compare> profile_priorities;
+ 
+     if (cardWidgets.count(info.index))
+         w = cardWidgets[info.index];
+@@ -359,7 +359,7 @@ void MainWindow::updateCard(const pa_card_info &info) {
+     for (uint32_t i=0; i<info.n_profiles; ++i) {
+         w->hasSinks = w->hasSinks || (info.profiles[i].n_sinks > 0);
+         w->hasSources = w->hasSources || (info.profiles[i].n_sources > 0);
+-        profile_priorities.insert(info.profiles[i]);
++        profile_priorities.insert(*info.profiles2[i]);
+     }
+ 
+     w->ports.clear();
+@@ -379,7 +379,7 @@ void MainWindow::updateCard(const pa_card_info &info) {
+     }
+ 
+     w->profiles.clear();
+-    for (std::set<pa_card_profile_info>::iterator profileIt = profile_priorities.begin(); profileIt != profile_priorities.end(); ++profileIt) {
++    for (std::set<pa_card_profile_info2>::iterator profileIt = profile_priorities.begin(); profileIt != profile_priorities.end(); ++profileIt) {
+         bool hasNo = false, hasOther = false;
+         std::map<Glib::ustring, PortInfo>::iterator portIt;
+         Glib::ustring desc = profileIt->description;
+@@ -400,6 +400,9 @@ void MainWindow::updateCard(const pa_card_info &info) {
+         if (hasNo && !hasOther)
+             desc += _(" (unplugged)");
+ 
++        if (!profileIt->available)
++            desc += _(" (unavailable)");
++
+         w->profiles.push_back(std::pair<Glib::ustring,Glib::ustring>(profileIt->name, desc));
+     }
+ 
+-- 
+cgit v0.10.2
+