Date: Wednesday, October 16, 2013 @ 00:22:07 Author: heftig Revision: 196641
archrelease: copy trunk to extra-i686, extra-x86_64 Added: gnome-settings-daemon/repos/extra-i686/PKGBUILD (from rev 196640, gnome-settings-daemon/trunk/PKGBUILD) gnome-settings-daemon/repos/extra-i686/gnome-settings-daemon.install (from rev 196640, gnome-settings-daemon/trunk/gnome-settings-daemon.install) gnome-settings-daemon/repos/extra-x86_64/PKGBUILD (from rev 196640, gnome-settings-daemon/trunk/PKGBUILD) gnome-settings-daemon/repos/extra-x86_64/gnome-settings-daemon.install (from rev 196640, gnome-settings-daemon/trunk/gnome-settings-daemon.install) Deleted: gnome-settings-daemon/repos/extra-i686/0001-power-Use-logind-to-discover-critical-action-availab.patch gnome-settings-daemon/repos/extra-i686/PKGBUILD gnome-settings-daemon/repos/extra-i686/gnome-settings-daemon.install gnome-settings-daemon/repos/extra-x86_64/0001-power-Use-logind-to-discover-critical-action-availab.patch gnome-settings-daemon/repos/extra-x86_64/PKGBUILD gnome-settings-daemon/repos/extra-x86_64/gnome-settings-daemon.install ------------------------------------------------------------------------------+ /PKGBUILD | 70 +++++++++ /gnome-settings-daemon.install | 24 +++ extra-i686/0001-power-Use-logind-to-discover-critical-action-availab.patch | 77 ---------- extra-i686/PKGBUILD | 35 ---- extra-i686/gnome-settings-daemon.install | 12 - extra-x86_64/0001-power-Use-logind-to-discover-critical-action-availab.patch | 77 ---------- extra-x86_64/PKGBUILD | 35 ---- extra-x86_64/gnome-settings-daemon.install | 12 - 8 files changed, 94 insertions(+), 248 deletions(-) Deleted: extra-i686/0001-power-Use-logind-to-discover-critical-action-availab.patch =================================================================== --- extra-i686/0001-power-Use-logind-to-discover-critical-action-availab.patch 2013-10-15 22:21:11 UTC (rev 196640) +++ extra-i686/0001-power-Use-logind-to-discover-critical-action-availab.patch 2013-10-15 22:22:07 UTC (rev 196641) @@ -1,77 +0,0 @@ -From 1271864ddfc053a1567d046b5fcdf8351da3f438 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com> -Date: Mon, 5 Aug 2013 18:15:00 +0200 -Subject: [PATCH] power: Use logind to discover critical action availability - -The upower functionality is deprecated and will return an -error unless upower is built with --enable-deprecated. - -Follows a similar patch to gnome-control-center. ---- - plugins/power/gsd-power-manager.c | 42 ++++++++++++++++++++++++++++----------- - 1 file changed, 30 insertions(+), 12 deletions(-) - -diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c -index fde90ef..8bd124f 100644 ---- a/plugins/power/gsd-power-manager.c -+++ b/plugins/power/gsd-power-manager.c -@@ -27,7 +27,6 @@ - #include <string.h> - #include <glib/gi18n.h> - #include <gtk/gtk.h> --#define UPOWER_ENABLE_DEPRECATED 1 - #include <libupower-glib/upower.h> - #include <libnotify/notify.h> - #include <canberra-gtk.h> -@@ -1164,18 +1163,37 @@ static GsdPowerActionType - manager_critical_action_get (GsdPowerManager *manager, - gboolean is_ups) - { -- GsdPowerActionType policy; -+ GsdPowerActionType policy = GSD_POWER_ACTION_SHUTDOWN; -+ GsdPowerActionType setpolicy; -+ GVariant *result = NULL; -+ gchar *s; - -- policy = g_settings_get_enum (manager->priv->settings, "critical-battery-action"); -- if (policy == GSD_POWER_ACTION_SUSPEND) { -- if (is_ups == FALSE && -- up_client_get_can_suspend (manager->priv->up_client)) -- return policy; -- return GSD_POWER_ACTION_SHUTDOWN; -- } else if (policy == GSD_POWER_ACTION_HIBERNATE) { -- if (up_client_get_can_hibernate (manager->priv->up_client)) -- return policy; -- return GSD_POWER_ACTION_SHUTDOWN; -+ setpolicy = g_settings_get_enum (manager->priv->settings, "critical-battery-action"); -+ -+ if (setpolicy == GSD_POWER_ACTION_SUSPEND) { -+ if (is_ups == FALSE) { -+ result = g_dbus_proxy_call_sync (manager->priv->logind_proxy, -+ "CanSuspend", -+ NULL, -+ G_DBUS_CALL_FLAGS_NONE, -+ -1, NULL, NULL); -+ } -+ } else if (setpolicy == GSD_POWER_ACTION_HIBERNATE) { -+ result = g_dbus_proxy_call_sync (manager->priv->logind_proxy, -+ "CanHibernate", -+ NULL, -+ G_DBUS_CALL_FLAGS_NONE, -+ -1, NULL, NULL); -+ } else { -+ /* Other actions need no check */ -+ return setpolicy; -+ } -+ -+ if (result) { -+ g_variant_get (result, "(s)", &s); -+ if (g_strcmp0 (s, "yes") == 0) -+ policy = setpolicy; -+ g_variant_unref (result); - } - - return policy; --- -1.8.3.4 - Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2013-10-15 22:21:11 UTC (rev 196640) +++ extra-i686/PKGBUILD 2013-10-15 22:22:07 UTC (rev 196641) @@ -1,35 +0,0 @@ -# $Id$ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> - -pkgname=gnome-settings-daemon -pkgver=3.10.0 -pkgrel=1 -pkgdesc="The GNOME Settings daemon" -arch=('i686' 'x86_64') -license=('GPL') -depends=('dconf' 'gnome-desktop' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'libcanberra-pulse' 'libnotify' - 'libsystemd' 'libwacom' 'pulseaudio' 'pulseaudio-alsa' 'upower' 'ibus' 'librsvg' 'libgweather' 'geocode-glib' 'geoclue2') -makedepends=('intltool' 'xf86-input-wacom' 'libxslt' 'docbook-xsl') -options=('!emptydirs' '!libtool') -install=gnome-settings-daemon.install -url="http://www.gnome.org" -groups=('gnome') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('9b9fb21603b28f080de16a96986269f3a6b61bbbcc4dda0272159aa3e4d67005') - -build() { - cd $pkgname-$pkgver - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib/$pkgname --disable-static - - #https://bugzilla.gnome.org/show_bug.cgi?id=656231 - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} Copied: gnome-settings-daemon/repos/extra-i686/PKGBUILD (from rev 196640, gnome-settings-daemon/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2013-10-15 22:22:07 UTC (rev 196641) @@ -0,0 +1,35 @@ +# $Id$ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> + +pkgname=gnome-settings-daemon +pkgver=3.10.1 +pkgrel=1 +pkgdesc="The GNOME Settings daemon" +arch=('i686' 'x86_64') +license=('GPL') +depends=('dconf' 'gnome-desktop' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'libcanberra-pulse' 'libnotify' + 'libsystemd' 'libwacom' 'pulseaudio' 'pulseaudio-alsa' 'upower' 'ibus' 'librsvg' 'libgweather' 'geocode-glib' 'geoclue2') +makedepends=('intltool' 'xf86-input-wacom' 'libxslt' 'docbook-xsl') +options=('!emptydirs' '!libtool') +install=gnome-settings-daemon.install +url="http://www.gnome.org" +groups=('gnome') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('a97b202ad22d68cc17100f0770b9a72c08c95b67f03299cbe5d6dcda0d909b31') + +build() { + cd $pkgname-$pkgver + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/$pkgname --disable-static + + #https://bugzilla.gnome.org/show_bug.cgi?id=656231 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} Deleted: extra-i686/gnome-settings-daemon.install =================================================================== --- extra-i686/gnome-settings-daemon.install 2013-10-15 22:21:11 UTC (rev 196640) +++ extra-i686/gnome-settings-daemon.install 2013-10-15 22:22:07 UTC (rev 196641) @@ -1,12 +0,0 @@ -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Copied: gnome-settings-daemon/repos/extra-i686/gnome-settings-daemon.install (from rev 196640, gnome-settings-daemon/trunk/gnome-settings-daemon.install) =================================================================== --- extra-i686/gnome-settings-daemon.install (rev 0) +++ extra-i686/gnome-settings-daemon.install 2013-10-15 22:22:07 UTC (rev 196641) @@ -0,0 +1,12 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Deleted: extra-x86_64/0001-power-Use-logind-to-discover-critical-action-availab.patch =================================================================== --- extra-x86_64/0001-power-Use-logind-to-discover-critical-action-availab.patch 2013-10-15 22:21:11 UTC (rev 196640) +++ extra-x86_64/0001-power-Use-logind-to-discover-critical-action-availab.patch 2013-10-15 22:22:07 UTC (rev 196641) @@ -1,77 +0,0 @@ -From 1271864ddfc053a1567d046b5fcdf8351da3f438 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com> -Date: Mon, 5 Aug 2013 18:15:00 +0200 -Subject: [PATCH] power: Use logind to discover critical action availability - -The upower functionality is deprecated and will return an -error unless upower is built with --enable-deprecated. - -Follows a similar patch to gnome-control-center. ---- - plugins/power/gsd-power-manager.c | 42 ++++++++++++++++++++++++++++----------- - 1 file changed, 30 insertions(+), 12 deletions(-) - -diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c -index fde90ef..8bd124f 100644 ---- a/plugins/power/gsd-power-manager.c -+++ b/plugins/power/gsd-power-manager.c -@@ -27,7 +27,6 @@ - #include <string.h> - #include <glib/gi18n.h> - #include <gtk/gtk.h> --#define UPOWER_ENABLE_DEPRECATED 1 - #include <libupower-glib/upower.h> - #include <libnotify/notify.h> - #include <canberra-gtk.h> -@@ -1164,18 +1163,37 @@ static GsdPowerActionType - manager_critical_action_get (GsdPowerManager *manager, - gboolean is_ups) - { -- GsdPowerActionType policy; -+ GsdPowerActionType policy = GSD_POWER_ACTION_SHUTDOWN; -+ GsdPowerActionType setpolicy; -+ GVariant *result = NULL; -+ gchar *s; - -- policy = g_settings_get_enum (manager->priv->settings, "critical-battery-action"); -- if (policy == GSD_POWER_ACTION_SUSPEND) { -- if (is_ups == FALSE && -- up_client_get_can_suspend (manager->priv->up_client)) -- return policy; -- return GSD_POWER_ACTION_SHUTDOWN; -- } else if (policy == GSD_POWER_ACTION_HIBERNATE) { -- if (up_client_get_can_hibernate (manager->priv->up_client)) -- return policy; -- return GSD_POWER_ACTION_SHUTDOWN; -+ setpolicy = g_settings_get_enum (manager->priv->settings, "critical-battery-action"); -+ -+ if (setpolicy == GSD_POWER_ACTION_SUSPEND) { -+ if (is_ups == FALSE) { -+ result = g_dbus_proxy_call_sync (manager->priv->logind_proxy, -+ "CanSuspend", -+ NULL, -+ G_DBUS_CALL_FLAGS_NONE, -+ -1, NULL, NULL); -+ } -+ } else if (setpolicy == GSD_POWER_ACTION_HIBERNATE) { -+ result = g_dbus_proxy_call_sync (manager->priv->logind_proxy, -+ "CanHibernate", -+ NULL, -+ G_DBUS_CALL_FLAGS_NONE, -+ -1, NULL, NULL); -+ } else { -+ /* Other actions need no check */ -+ return setpolicy; -+ } -+ -+ if (result) { -+ g_variant_get (result, "(s)", &s); -+ if (g_strcmp0 (s, "yes") == 0) -+ policy = setpolicy; -+ g_variant_unref (result); - } - - return policy; --- -1.8.3.4 - Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2013-10-15 22:21:11 UTC (rev 196640) +++ extra-x86_64/PKGBUILD 2013-10-15 22:22:07 UTC (rev 196641) @@ -1,35 +0,0 @@ -# $Id$ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> - -pkgname=gnome-settings-daemon -pkgver=3.10.0 -pkgrel=1 -pkgdesc="The GNOME Settings daemon" -arch=('i686' 'x86_64') -license=('GPL') -depends=('dconf' 'gnome-desktop' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'libcanberra-pulse' 'libnotify' - 'libsystemd' 'libwacom' 'pulseaudio' 'pulseaudio-alsa' 'upower' 'ibus' 'librsvg' 'libgweather' 'geocode-glib' 'geoclue2') -makedepends=('intltool' 'xf86-input-wacom' 'libxslt' 'docbook-xsl') -options=('!emptydirs' '!libtool') -install=gnome-settings-daemon.install -url="http://www.gnome.org" -groups=('gnome') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('9b9fb21603b28f080de16a96986269f3a6b61bbbcc4dda0272159aa3e4d67005') - -build() { - cd $pkgname-$pkgver - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib/$pkgname --disable-static - - #https://bugzilla.gnome.org/show_bug.cgi?id=656231 - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} Copied: gnome-settings-daemon/repos/extra-x86_64/PKGBUILD (from rev 196640, gnome-settings-daemon/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2013-10-15 22:22:07 UTC (rev 196641) @@ -0,0 +1,35 @@ +# $Id$ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> + +pkgname=gnome-settings-daemon +pkgver=3.10.1 +pkgrel=1 +pkgdesc="The GNOME Settings daemon" +arch=('i686' 'x86_64') +license=('GPL') +depends=('dconf' 'gnome-desktop' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'libcanberra-pulse' 'libnotify' + 'libsystemd' 'libwacom' 'pulseaudio' 'pulseaudio-alsa' 'upower' 'ibus' 'librsvg' 'libgweather' 'geocode-glib' 'geoclue2') +makedepends=('intltool' 'xf86-input-wacom' 'libxslt' 'docbook-xsl') +options=('!emptydirs' '!libtool') +install=gnome-settings-daemon.install +url="http://www.gnome.org" +groups=('gnome') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('a97b202ad22d68cc17100f0770b9a72c08c95b67f03299cbe5d6dcda0d909b31') + +build() { + cd $pkgname-$pkgver + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/$pkgname --disable-static + + #https://bugzilla.gnome.org/show_bug.cgi?id=656231 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} Deleted: extra-x86_64/gnome-settings-daemon.install =================================================================== --- extra-x86_64/gnome-settings-daemon.install 2013-10-15 22:21:11 UTC (rev 196640) +++ extra-x86_64/gnome-settings-daemon.install 2013-10-15 22:22:07 UTC (rev 196641) @@ -1,12 +0,0 @@ -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Copied: gnome-settings-daemon/repos/extra-x86_64/gnome-settings-daemon.install (from rev 196640, gnome-settings-daemon/trunk/gnome-settings-daemon.install) =================================================================== --- extra-x86_64/gnome-settings-daemon.install (rev 0) +++ extra-x86_64/gnome-settings-daemon.install 2013-10-15 22:22:07 UTC (rev 196641) @@ -0,0 +1,12 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}