Date: Wednesday, January 16, 2013 @ 08:36:16 Author: jgc Revision: 175197
Adjust patch to apply with 3.6.4. upgpkg: gnome-settings-daemon 3.6.4-1 Modified: gnome-settings-daemon/trunk/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch gnome-settings-daemon/trunk/PKGBUILD -----------------------------------------------------------------+ 0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch | 6 ++--- PKGBUILD | 12 +++++----- 2 files changed, 10 insertions(+), 8 deletions(-) Modified: 0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch =================================================================== --- 0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch 2013-01-16 11:12:55 UTC (rev 175196) +++ 0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch 2013-01-16 13:36:16 UTC (rev 175197) @@ -1412,9 +1412,9 @@ g_signal_connect (manager->priv->up_client, "device-added", G_CALLBACK (engine_device_added_cb), manager); @@ -3895,6 +4119,9 @@ gsd_power_manager_start (GsdPowerManager *manager, - manager->priv->x11_screen = gnome_rr_screen_new (gdk_screen_get_default (), error); - if (manager->priv->x11_screen == NULL) - return FALSE; + G_CALLBACK (idle_idletime_reset_cb), manager); + g_signal_connect (manager->priv->idletime, "alarm-expired", + G_CALLBACK (idle_idletime_alarm_expired_cb), manager); + g_signal_connect (manager->priv->x11_screen, "changed", G_CALLBACK (on_randr_event), manager); + /* set up initial state */ + on_randr_event (manager->priv->x11_screen, manager); Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-01-16 11:12:55 UTC (rev 175196) +++ PKGBUILD 2013-01-16 13:36:16 UTC (rev 175197) @@ -2,8 +2,8 @@ # Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> pkgname=gnome-settings-daemon -pkgver=3.6.3 -pkgrel=2 +pkgver=3.6.4 +pkgrel=1 pkgdesc="The GNOME Settings daemon" arch=('i686' 'x86_64') license=('GPL') @@ -16,8 +16,8 @@ groups=('gnome') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz 0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch) -sha256sums=('606aaaba9cc7f51035702aead46c8bb595917a09cb947b396a579ea443328cdc' - 'c4aab9b45346fbae18808358346208f989cce8bf9c9eb753e2af7eca73715109') +sha256sums=('3db993f2dbabc0c9d06a309bb12c9a7104b9cdda414ac4b1c301f5114a441c15' + '5572b5b3f554ce361353a8db42c26a8f789606f65acc5943a286271603fcb8eb') build() { cd $pkgname-$pkgver @@ -25,8 +25,10 @@ # logind key handling FS#31801, patch from Fedora # rebased onto screensaver.patch patch -Np1 -i ../0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch + aclocal - automake + autoconf + automake --add-missing ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib/gnome-settings-daemon --disable-static \