[arch-commits] Commit in gnome-control-center/trunk (PKGBUILD pulse3.0.patch)

Jan Steffens heftig at archlinux.org
Fri Dec 7 11:55:46 UTC 2012


    Date: Friday, December 7, 2012 @ 06:55:45
  Author: heftig
Revision: 172930

Fix a problem exposed by pulse 3

Added:
  gnome-control-center/trunk/pulse3.0.patch
Modified:
  gnome-control-center/trunk/PKGBUILD

----------------+
 PKGBUILD       |   10 +++++++---
 pulse3.0.patch |   25 +++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-12-07 05:50:58 UTC (rev 172929)
+++ PKGBUILD	2012-12-07 11:55:45 UTC (rev 172930)
@@ -4,7 +4,7 @@
 
 pkgname=gnome-control-center
 pkgver=3.6.3
-pkgrel=2
+pkgrel=3
 pkgdesc="The Control Center for GNOME"
 arch=('i686' 'x86_64')
 depends=('accountsservice' 'cups-pk-helper' 'gnome-bluetooth' 'gnome-desktop' 'gnome-menus'
@@ -18,11 +18,15 @@
 install=gnome-control-center.install
 license=('GPL')
 options=('!libtool' '!emptydirs')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('2ae23972bc64f62b4facd12dd5adce212bda02491eb6e56bbf195332157d21fb')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+        pulse3.0.patch)
+sha256sums=('2ae23972bc64f62b4facd12dd5adce212bda02491eb6e56bbf195332157d21fb'
+            '27f1d518df91ad9687e3e217023d83726c0d44f65b30942e79106e4aad53c916')
 
 build() {
   cd $pkgname-$pkgver
+
+  patch -Np1 -i ../pulse3.0.patch
   
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \

Added: pulse3.0.patch
===================================================================
--- pulse3.0.patch	                        (rev 0)
+++ pulse3.0.patch	2012-12-07 11:55:45 UTC (rev 172930)
@@ -0,0 +1,25 @@
+From 10a0c18b8e3058144586880019b68ab4ea40ce78 Mon Sep 17 00:00:00 2001
+From: David Henningsson <david.henningsson at canonical.com>
+Date: Fri, 07 Dec 2012 10:52:09 +0000
+Subject: sound: Fix port handling for the unknown availability case
+
+The current code assumes that port availability transitions will be
+between YES and NO, and doesn't account for the fact that it may also be
+UNKNOWN. This causes spurious entries if the port availability
+transitions between YES and UNKNOWN.
+---
+diff --git a/panels/sound/gvc-mixer-control.c b/panels/sound/gvc-mixer-control.c
+index 34ddc0c..2f6cf34 100644
+--- a/panels/sound/gvc-mixer-control.c
++++ b/panels/sound/gvc-mixer-control.c
+@@ -2138,7 +2138,7 @@ update_card (GvcMixerControl      *control,
+                 else {
+                         for (i = 0; i < info->n_ports; i++) {
+                                 if (g_strcmp0 (card_port->port, info->ports[i]->name) == 0) {
+-                                        if (card_port->available != info->ports[i]->available) {
++                                        if ((card_port->available == PA_PORT_AVAILABLE_NO) !=  (info->ports[i]->available == PA_PORT_AVAILABLE_NO)) {
+                                                 card_port->available = info->ports[i]->available;
+                                                 g_debug ("sync port availability on card %i, card port name '%s', new available value %i",
+                                                           gvc_mixer_card_get_index (card),
+--
+cgit v0.9.0.2




More information about the arch-commits mailing list