Tue Apr 23 01:16:16 PDT 2013

2 files changed, 19 insertions, 48 deletions

diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD
index ffd0a2d26..1e7d79a2e 100644
--- a/extra/gnome-control-center/PKGBUILD
+++ b/extra/gnome-control-center/PKGBUILD
@@ -1,38 +1,34 @@
-# $Id: PKGBUILD 178089 2013-02-15 23:34:30Z heftig $
+# $Id: PKGBUILD 183375 2013-04-21 22:09:45Z 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=4
+pkgver=3.8.1
+pkgrel=1
 pkgdesc="The Control Center for GNOME"
-arch=('i686' 'x86_64')
-depends=('accountsservice' 'cups-pk-helper' 'gnome-bluetooth' 'gnome-desktop' 'gnome-menus'
-         'gnome-online-accounts' 'gnome-settings-daemon' 'gsettings-desktop-schemas' 'gtk3'
-         'libgtop' 'libsocialweb' 'network-manager-applet' 'sound-theme-freedesktop' 'upower' 'libpwquality' 'libsystemd')
-optdepends=('mesa-demos: provides glxinfo for graphics information'
-            'gnome-color-manager: for color management tasks')
-makedepends=('gnome-doc-utils' 'intltool' 'docbook-xsl')
+license=(GPL)
+arch=(i686 x86_64)
+depends=(accountsservice cups-pk-helper gnome-bluetooth gnome-desktop gnome-menus
+         gnome-online-accounts gnome-settings-daemon gsettings-desktop-schemas gtk3
+         libgtop network-manager-applet sound-theme-freedesktop upower libpwquality
+         gnome-color-manager smbclient modemmanager)
+makedepends=(gnome-doc-utils intltool docbook-xsl)
+optdepends=('gnome-user-share: Bluetooth and WebDAV file sharing'
+            'rygel: media sharing'
+            'vino: screen sharing'
+            'openssh: remote login')
+groups=(gnome)
 url="http://www.gnome.org"
-groups=('gnome')
 install=gnome-control-center.install
-license=('GPL')
 options=('!libtool' '!emptydirs')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        pulse3.0.patch)
-sha256sums=('2ae23972bc64f62b4facd12dd5adce212bda02491eb6e56bbf195332157d21fb'
-            '27f1d518df91ad9687e3e217023d83726c0d44f65b30942e79106e4aad53c916')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('07d7d8e08af6a9ef01754814ecf2d006c58b94a096f0c6ad549c9d0051e4e57a')
 
 build() {
   cd $pkgname-$pkgver
 
-  patch -Np1 -i ../pulse3.0.patch
-  
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --enable-systemd --with-libsocialweb \
-      --disable-update-mimedb \
-      --without-cheese
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --libexecdir=/usr/lib/$pkgname --disable-static
 
   #https://bugzilla.gnome.org/show_bug.cgi?id=656229
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
diff --git a/extra/gnome-control-center/pulse3.0.patch b/extra/gnome-control-center/pulse3.0.patch
deleted file mode 100644
index 203547940..000000000
--- a/extra/gnome-control-center/pulse3.0.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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