[arch-commits] Commit in gnome-settings-daemon/repos (6 files)
Jan Steffens
heftig at archlinux.org
Thu Oct 20 06:58:10 UTC 2011
Date: Thursday, October 20, 2011 @ 02:58:10
Author: heftig
Revision: 140969
db-move: moved gnome-settings-daemon from [testing] to [extra] (x86_64)
Added:
gnome-settings-daemon/repos/extra-x86_64/PKGBUILD
(from rev 140967, gnome-settings-daemon/repos/testing-x86_64/PKGBUILD)
gnome-settings-daemon/repos/extra-x86_64/gnome-settings-daemon.install
(from rev 140967, gnome-settings-daemon/repos/testing-x86_64/gnome-settings-daemon.install)
gnome-settings-daemon/repos/extra-x86_64/upower.patch
(from rev 140967, gnome-settings-daemon/repos/testing-x86_64/upower.patch)
Deleted:
gnome-settings-daemon/repos/extra-x86_64/PKGBUILD
gnome-settings-daemon/repos/extra-x86_64/gnome-settings-daemon.install
gnome-settings-daemon/repos/testing-x86_64/
-------------------------------+
PKGBUILD | 74 +++++++++++++++++++++-------------------
gnome-settings-daemon.install | 36 +++++++++----------
upower.patch | 28 +++++++++++++++
3 files changed, 86 insertions(+), 52 deletions(-)
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2011-10-20 06:58:09 UTC (rev 140968)
+++ extra-x86_64/PKGBUILD 2011-10-20 06:58:10 UTC (rev 140969)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=gnome-settings-daemon
-pkgver=3.2.1
-pkgrel=1
-pkgdesc="The GNOME Settings daemon"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libgnomekbd' 'gnome-desktop' 'libnotify' 'hicolor-icon-theme' 'libcanberra-pulse' 'gsettings-desktop-schemas' 'nss' 'gconf' 'dconf' 'pulseaudio' 'pulseaudio-alsa' 'upower')
-makedepends=('intltool' 'gtk-doc' 'gnome-desktop')
-options=('!emptydirs' '!libtool')
-install=gnome-settings-daemon.install
-url="http://www.gnome.org"
-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)
-sha256sums=('1015b8a12483e91ddc67e891b66207a70339a341a051507aad9a6a15fbfcb78d')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- ./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
- #https://bugzilla.gnome.org/show_bug.cgi?id=656231
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
Copied: gnome-settings-daemon/repos/extra-x86_64/PKGBUILD (from rev 140967, gnome-settings-daemon/repos/testing-x86_64/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2011-10-20 06:58:10 UTC (rev 140969)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=gnome-settings-daemon
+pkgver=3.2.1
+pkgrel=2
+pkgdesc="The GNOME Settings daemon"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('libgnomekbd' 'gnome-desktop' 'libnotify' 'hicolor-icon-theme' 'libcanberra-pulse' 'gsettings-desktop-schemas' 'nss' 'gconf' 'dconf' 'pulseaudio' 'pulseaudio-alsa' 'upower')
+makedepends=('intltool' 'gtk-doc' 'gnome-desktop')
+options=('!emptydirs' '!libtool')
+install=gnome-settings-daemon.install
+url="http://www.gnome.org"
+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
+ upower.patch)
+sha256sums=('1015b8a12483e91ddc67e891b66207a70339a341a051507aad9a6a15fbfcb78d'
+ 'f7a66e9ff7f415be34873fd6d03843a20732158bd65b382b114d100aaddeb223')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # 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
+ #https://bugzilla.gnome.org/show_bug.cgi?id=656231
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-x86_64/gnome-settings-daemon.install
===================================================================
--- extra-x86_64/gnome-settings-daemon.install 2011-10-20 06:58:09 UTC (rev 140968)
+++ extra-x86_64/gnome-settings-daemon.install 2011-10-20 06:58:10 UTC (rev 140969)
@@ -1,18 +0,0 @@
-post_install() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
- if (( $(vercmp $2 2.90.0) < 0 )); then
- usr/sbin/gconfpkg --uninstall gnome-settings-daemon
- fi
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: gnome-settings-daemon/repos/extra-x86_64/gnome-settings-daemon.install (from rev 140967, gnome-settings-daemon/repos/testing-x86_64/gnome-settings-daemon.install)
===================================================================
--- extra-x86_64/gnome-settings-daemon.install (rev 0)
+++ extra-x86_64/gnome-settings-daemon.install 2011-10-20 06:58:10 UTC (rev 140969)
@@ -0,0 +1,18 @@
+post_install() {
+ usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+pre_upgrade() {
+ if (( $(vercmp $2 2.90.0) < 0 )); then
+ usr/sbin/gconfpkg --uninstall gnome-settings-daemon
+ fi
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: gnome-settings-daemon/repos/extra-x86_64/upower.patch (from rev 140967, gnome-settings-daemon/repos/testing-x86_64/upower.patch)
===================================================================
--- extra-x86_64/upower.patch (rev 0)
+++ extra-x86_64/upower.patch 2011-10-20 06:58:10 UTC (rev 140969)
@@ -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
More information about the arch-commits
mailing list