From 6140767b943e22f7cc211fdb3db6d7b0a51eb56c Mon Sep 17 00:00:00 2001 From: Juan RP <xtraeme@gmail.com> Date: Wed, 16 Jan 2013 15:43:52 +0100 Subject: [PATCH] gnome-settings-daemon: update to 3.6.4. --- .../gnome-settings-daemon-devel.template | 6 +----- ...r-and-media-keys-Use-logind-for-suspending-and-r.patch | 6 +++--- srcpkgs/gnome-settings-daemon/template | 8 +++----- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/srcpkgs/gnome-settings-daemon/gnome-settings-daemon-devel.template b/srcpkgs/gnome-settings-daemon/gnome-settings-daemon-devel.template index bc9ed11302..611ca4accc 100644 --- a/srcpkgs/gnome-settings-daemon/gnome-settings-daemon-devel.template +++ b/srcpkgs/gnome-settings-daemon/gnome-settings-daemon-devel.template @@ -1,11 +1,7 @@ # Template file for 'gnome-settings-daemon-devel'. # depends="glib-devel" -short_desc="${sourcepkg} - development files" -long_desc="${long_desc} - - This package contains files for development, headers, static libs, etc." - +short_desc="${short_desc} - development files" noarch=yes do_install() { diff --git a/srcpkgs/gnome-settings-daemon/patches/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch b/srcpkgs/gnome-settings-daemon/patches/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch index a7887c26f7..ceee6db82e 100644 --- a/srcpkgs/gnome-settings-daemon/patches/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch +++ b/srcpkgs/gnome-settings-daemon/patches/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch @@ -1412,9 +1412,9 @@ index 1c594d8..bb7224c 100644 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); diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template index aa18075877..fceec54eda 100644 --- a/srcpkgs/gnome-settings-daemon/template +++ b/srcpkgs/gnome-settings-daemon/template @@ -1,6 +1,6 @@ # Template file for 'gnome-settings-daemon' pkgname=gnome-settings-daemon -version=3.6.3 +version=3.6.4 revision=1 patch_args="-Np1" build_style=gnu-configure @@ -20,12 +20,10 @@ maintainer="Juan RP <xtraeme@gmail.com>" homepage="http://www.gnome.org" license="GPL-3" distfiles="${GNOME_SITE}/$pkgname/3.6/$pkgname-$version.tar.xz" -checksum=606aaaba9cc7f51035702aead46c8bb595917a09cb947b396a579ea443328cdc -long_desc=" - This package provides a daemon to handle settings on the GNOME desktop." +checksum=3db993f2dbabc0c9d06a309bb12c9a7104b9cdda414ac4b1c301f5114a441c15 pre_configure() { - aclocal && automake + aclocal && automake -a } post_install() {