diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-10-28 11:35:50 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-10-28 11:35:50 -0300 |
| commit | 8856e6fe26ce35b4caf6beeac324f583ec1b6133 (patch) | |
| tree | c42a03e2b7610a39d167af36357607399aa40045 /extra/gnome-settings-daemon | |
| parent | 5100458465d1ed420073c3213349bf430075ddbc (diff) | |
| parent | 0424b5fc47f106db6498c4cda3476e1d49fe0f82 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/esmtp/PKGBUILD
community/geany-plugins/PKGBUILD
community/giggle/PKGBUILD
community/guichan/PKGBUILD
community/mxml/PKGBUILD
community/ruby-gtk2/PKGBUILD
core/libtool/PKGBUILD
core/mkinitcpio-busybox/PKGBUILD
core/udev/PKGBUILD
extra/audacious/PKGBUILD
extra/conky/PKGBUILD
extra/gnome-control-center/PKGBUILD
extra/gtk2/PKGBUILD
extra/gtk3/PKGBUILD
extra/gvfs/PKGBUILD
extra/kdeutils/PKGBUILD
extra/kino/PKGBUILD
extra/mkvtoolnix/PKGBUILD
extra/poppler/PKGBUILD
extra/postfix/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/qtcurve-gtk2/PKGBUILD
extra/transmission/PKGBUILD
extra/xfburn/PKGBUILD
extra/xfce4-xkb-plugin/PKGBUILD
extra/xorg-server/PKGBUILD
extra/yelp/PKGBUILD
kde-unstable/calligra/PKGBUILD
multilib/lib32-gtk2/PKGBUILD
multilib/lib32-libpulse/PKGBUILD
multilib/libtool-multilib/PKGBUILD
multilib/wine/PKGBUILD
multilib/wine/wine.install
Diffstat (limited to 'extra/gnome-settings-daemon')
| -rw-r--r-- | extra/gnome-settings-daemon/PKGBUILD | 15 | ||||
| -rw-r--r-- | extra/gnome-settings-daemon/upower.patch | 28 |
2 files changed, 37 insertions, 6 deletions
diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD index a69a3ff75..377a7c9bb 100644 --- a/extra/gnome-settings-daemon/PKGBUILD +++ b/extra/gnome-settings-daemon/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139631 2011-10-03 21:04:24Z ibiru $ +# $Id: PKGBUILD 140969 2011-10-20 06:58:10Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-settings-daemon -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=2 pkgdesc="The GNOME Settings daemon" arch=('i686' 'x86_64' 'mips64el') @@ -16,13 +16,16 @@ groups=('gnome') replaces=(gnome-settings-daemon-pulse) conflicts=(gnome-settings-daemon-pulse) source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz -fix_color_crash.patch) -sha256sums=('a85242ce60b9c9bb3fbad124ee06430a408f39fa31d2d4ea29dc179db724447b' - 'b249d21702d4cf9a3a8dc177ba17c00d33e8e742e548811552d79ddeff1e91e3') + upower.patch) +sha256sums=('1015b8a12483e91ddc67e891b66207a70339a341a051507aad9a6a15fbfcb78d' + 'f7a66e9ff7f415be34873fd6d03843a20732158bd65b382b114d100aaddeb223') build() { cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "$srcdir/fix_color_crash.patch" + + # Fix suspend via key + patch -Np1 -i "$srcdir/upower.patch" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib/gnome-settings-daemon --disable-static --enable-pulse \ --with-pnpids=/usr/share/libgnome-desktop-3.0/pnp.ids diff --git a/extra/gnome-settings-daemon/upower.patch b/extra/gnome-settings-daemon/upower.patch new file mode 100644 index 000000000..36dad59e3 --- /dev/null +++ b/extra/gnome-settings-daemon/upower.patch @@ -0,0 +1,28 @@ +diff -u -r gnome-settings-daemon-3.2.1-orig/plugins/media-keys/gsd-media-keys-manager.c gnome-settings-daemon-3.2.1/plugins/media-keys/gsd-media-keys-manager.c +--- gnome-settings-daemon-3.2.1-orig/plugins/media-keys/gsd-media-keys-manager.c 2011-10-20 08:19:31.818642262 +0200 ++++ gnome-settings-daemon-3.2.1/plugins/media-keys/gsd-media-keys-manager.c 2011-10-20 08:23:55.127492221 +0200 +@@ -2066,15 +2066,15 @@ + (GAsyncReadyCallback) power_keyboard_ready_cb, + manager); + +- g_dbus_proxy_new (manager->priv->connection, +- G_DBUS_PROXY_FLAGS_NONE, +- NULL, +- "org.freedesktop.UPower", +- "/org/freedesktop/UPower", +- "org.freedesktop.UPower", +- NULL, +- (GAsyncReadyCallback) upower_ready_cb, +- manager); ++ g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM, ++ G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, ++ NULL, ++ "org.freedesktop.UPower", ++ "/org/freedesktop/UPower", ++ "org.freedesktop.UPower", ++ NULL, ++ (GAsyncReadyCallback) upower_ready_cb, ++ manager); + } + + static void |