diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-12-08 13:14:39 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-12-08 13:14:39 +0100 |
| commit | 31ccd8fa213350d61560c16caac29e5c0bb0f54f (patch) | |
| tree | ea0288a26a5d9c325da1502ed4450936c52b8272 /extra/gnome-control-center | |
| parent | 3734b1ff855a5738195c6ff3def244d7b2e23e50 (diff) | |
| parent | b8c6ff8db00ce5eec5e6f20a90e8f8ec993ef3d5 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/codeblocks/PKGBUILD
community/siege/PKGBUILD
extra/opus/PKGBUILD
extra/rtmpdump/PKGBUILD
Diffstat (limited to 'extra/gnome-control-center')
| -rw-r--r-- | extra/gnome-control-center/PKGBUILD | 12 | ||||
| -rw-r--r-- | extra/gnome-control-center/pulse3.0.patch | 25 |
2 files changed, 33 insertions, 4 deletions
diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD index df659050e..8adae687b 100644 --- a/extra/gnome-control-center/PKGBUILD +++ b/extra/gnome-control-center/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 170990 2012-11-14 14:28:31Z ibiru $ +# $Id: PKGBUILD 172933 2012-12-07 12:12:32Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-control-center pkgver=3.6.3 -pkgrel=2 +pkgrel=3 pkgdesc="The Control Center for GNOME" arch=('i686' 'x86_64' 'mips64el') depends=('accountsservice' 'cups-pk-helper' 'gnome-bluetooth' 'gnome-desktop' 'gnome-menus' @@ -18,11 +18,15 @@ groups=('gnome') 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 \ diff --git a/extra/gnome-control-center/pulse3.0.patch b/extra/gnome-control-center/pulse3.0.patch new file mode 100644 index 000000000..203547940 --- /dev/null +++ b/extra/gnome-control-center/pulse3.0.patch @@ -0,0 +1,25 @@ +From 10a0c18b8e3058144586880019b68ab4ea40ce78 Mon Sep 17 00:00:00 2001 +From: David Henningsson <david.henningsson@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 |