diff options
Diffstat (limited to 'extra/gnome-control-center')
| -rw-r--r-- | extra/gnome-control-center/PKGBUILD | 40 | ||||
| -rw-r--r-- | extra/gnome-control-center/pulse3.0.patch | 25 | ||||
| -rw-r--r-- | extra/gnome-control-center/systemd-fallback.patch | 81 |
3 files changed, 18 insertions, 128 deletions
diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD index 8adae687b..fb2328f0a 100644 --- a/extra/gnome-control-center/PKGBUILD +++ b/extra/gnome-control-center/PKGBUILD @@ -1,38 +1,34 @@ -# $Id: PKGBUILD 172933 2012-12-07 12:12:32Z 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=3 +pkgver=3.8.1 +pkgrel=1 pkgdesc="The Control Center for GNOME" +license=(GPL) arch=('i686' 'x86_64' 'mips64el') -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') +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 --disable-ibus + ./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 diff --git a/extra/gnome-control-center/systemd-fallback.patch b/extra/gnome-control-center/systemd-fallback.patch deleted file mode 100644 index 709e54019..000000000 --- a/extra/gnome-control-center/systemd-fallback.patch +++ /dev/null @@ -1,81 +0,0 @@ -commit 9873a7536844f5c38c2a123be58175c2774e5dcc -Author: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -Date: Mon Mar 12 01:12:11 2012 +0100 - - Fallback to CK if systemd is not available - - Be nice to distributions where systemd is optional. This will select - the code path at runtime depending on whether the system was booted - using systemd. - -diff --git a/configure.ac b/configure.ac -index aee97ac..867f061 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -56,7 +56,7 @@ AC_ARG_ENABLE([systemd], - [with_systemd=$enableval], - [with_systemd=no]) - if test "$with_systemd" = "yes" ; then -- SYSTEMD=libsystemd-login -+ SYSTEMD="libsystemd-login libsystemd-daemon" - AC_DEFINE(HAVE_SYSTEMD, 1, [Define to 1 if systemd is available]) - else - SYSTEMD= -diff --git a/panels/user-accounts/um-user.c b/panels/user-accounts/um-user.c -index f027754..5ebbe29 100644 ---- a/panels/user-accounts/um-user.c -+++ b/panels/user-accounts/um-user.c -@@ -37,6 +37,11 @@ - - #include <gio/gunixoutputstream.h> - -+#ifdef HAVE_SYSTEMD -+# include <systemd/sd-login.h> -+# include <systemd/sd-daemon.h> -+#endif -+ - #include "um-user.h" - #include "um-account-type.h" - #include "um-utils.h" -@@ -1003,25 +1008,18 @@ um_user_set_password (UmUser *user, - } - } - --#ifdef HAVE_SYSTEMD -- --#include <systemd/sd-login.h> -- - gboolean - um_user_is_logged_in (UmUser *user) - { -- int n_sessions; -- -- n_sessions = sd_uid_get_sessions (um_user_get_uid (user), 0, NULL) > 0; -- -- return n_sessions > 0; --} -+#ifdef HAVE_SYSTEMD -+ if (sd_booted () > 0) { -+ int n_sessions; - --#else -+ n_sessions = sd_uid_get_sessions (um_user_get_uid (user), 0, NULL); - --gboolean --um_user_is_logged_in (UmUser *user) --{ -+ return n_sessions > 0; -+ } -+#endif - GVariant *result; - GVariantIter *iter; - gint n_sessions; -@@ -1052,8 +1050,6 @@ um_user_is_logged_in (UmUser *user) - return n_sessions > 0; - } - --#endif -- - void - um_user_set_automatic_login (UmUser *user, - gboolean enabled) |