[arch-commits] Commit in gnome-screensaver/repos (18 files)
Balló György
bgyorgy at nymeria.archlinux.org
Tue Aug 27 14:10:08 UTC 2013
Date: Tuesday, August 27, 2013 @ 16:10:08
Author: bgyorgy
Revision: 96399
archrelease: copy trunk to community-i686, community-x86_64
Added:
gnome-screensaver/repos/community-i686/PKGBUILD
(from rev 96398, gnome-screensaver/trunk/PKGBUILD)
gnome-screensaver/repos/community-i686/fix-autoconf.patch
(from rev 96398, gnome-screensaver/trunk/fix-autoconf.patch)
gnome-screensaver/repos/community-i686/gnome-screensaver.pam
(from rev 96398, gnome-screensaver/trunk/gnome-screensaver.pam)
gnome-screensaver/repos/community-i686/lock_screen_on_suspend.patch
(from rev 96398, gnome-screensaver/trunk/lock_screen_on_suspend.patch)
gnome-screensaver/repos/community-i686/move-desktop-file.patch
(from rev 96398, gnome-screensaver/trunk/move-desktop-file.patch)
gnome-screensaver/repos/community-x86_64/PKGBUILD
(from rev 96398, gnome-screensaver/trunk/PKGBUILD)
gnome-screensaver/repos/community-x86_64/fix-autoconf.patch
(from rev 96398, gnome-screensaver/trunk/fix-autoconf.patch)
gnome-screensaver/repos/community-x86_64/gnome-screensaver.pam
(from rev 96398, gnome-screensaver/trunk/gnome-screensaver.pam)
gnome-screensaver/repos/community-x86_64/lock_screen_on_suspend.patch
(from rev 96398, gnome-screensaver/trunk/lock_screen_on_suspend.patch)
gnome-screensaver/repos/community-x86_64/move-desktop-file.patch
(from rev 96398, gnome-screensaver/trunk/move-desktop-file.patch)
Deleted:
gnome-screensaver/repos/community-i686/PKGBUILD
gnome-screensaver/repos/community-i686/fix-autoconf.patch
gnome-screensaver/repos/community-i686/gnome-screensaver.pam
gnome-screensaver/repos/community-i686/move-desktop-file.patch
gnome-screensaver/repos/community-x86_64/PKGBUILD
gnome-screensaver/repos/community-x86_64/fix-autoconf.patch
gnome-screensaver/repos/community-x86_64/gnome-screensaver.pam
gnome-screensaver/repos/community-x86_64/move-desktop-file.patch
-----------------------------------------------+
/PKGBUILD | 100 ++++++++++++++++++++++++
/fix-autoconf.patch | 24 +++++
/gnome-screensaver.pam | 6 +
/move-desktop-file.patch | 68 ++++++++++++++++
community-i686/PKGBUILD | 45 ----------
community-i686/fix-autoconf.patch | 12 --
community-i686/gnome-screensaver.pam | 3
community-i686/lock_screen_on_suspend.patch | 51 ++++++++++++
community-i686/move-desktop-file.patch | 34 --------
community-x86_64/PKGBUILD | 45 ----------
community-x86_64/fix-autoconf.patch | 12 --
community-x86_64/gnome-screensaver.pam | 3
community-x86_64/lock_screen_on_suspend.patch | 51 ++++++++++++
community-x86_64/move-desktop-file.patch | 34 --------
14 files changed, 300 insertions(+), 188 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2013-08-27 14:09:55 UTC (rev 96398)
+++ community-i686/PKGBUILD 2013-08-27 14:10:08 UTC (rev 96399)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-
-pkgname=gnome-screensaver
-pkgver=3.6.1
-pkgrel=4
-pkgdesc="Legacy GNOME screensaver"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://live.gnome.org/GnomeScreensaver"
-backup=(etc/pam.d/gnome-screensaver)
-depends=('dbus-glib' 'libgnomekbd' 'gnome-desktop')
-makedepends=('intltool' 'gnome-common')
-optdepends=('gnome-themes-standard: default background')
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
- gnome-screensaver.pam
- move-desktop-file.patch
- fix-autoconf.patch)
-sha256sums=('f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0'
- 'b6ea9e2eb586d94bcabb617a8f1c2958111df87afdbb51f645882bccdc15cbda'
- '4bb96f62aa069c83b629204a79a3f63b146bcaf773569aee8b5dd23fbcd88974'
- 'c4da9c18b543ecbc781c1f103321b324a855bdd0979fd36b437f6033736ad4bb')
-
-build() {
- cd "$pkgname-$pkgver"
-
- # Upstream patch that moves gnome-screensaver desktop file out of autostart
- patch -Np1 -i "$srcdir/move-desktop-file.patch"
-
- # Fix build
- patch -Np1 -i "$srcdir/fix-autoconf.patch"
-
- autoreconf -fi
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
- --with-mit-ext
- make
-}
-
-package() {
- cd "$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
- install -Dm644 ../gnome-screensaver.pam "$pkgdir/etc/pam.d/gnome-screensaver"
-}
Copied: gnome-screensaver/repos/community-i686/PKGBUILD (from rev 96398, gnome-screensaver/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-08-27 14:10:08 UTC (rev 96399)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+pkgname=gnome-screensaver
+pkgver=3.6.1
+pkgrel=5
+pkgdesc="Legacy GNOME screensaver"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://live.gnome.org/GnomeScreensaver"
+backup=(etc/pam.d/gnome-screensaver)
+depends=('dbus-glib' 'libgnomekbd' 'gnome-desktop')
+makedepends=('intltool' 'gnome-common')
+optdepends=('gnome-themes-standard: default background')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+ gnome-screensaver.pam
+ move-desktop-file.patch
+ fix-autoconf.patch
+ lock_screen_on_suspend.patch)
+sha256sums=('f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0'
+ 'b6ea9e2eb586d94bcabb617a8f1c2958111df87afdbb51f645882bccdc15cbda'
+ '4bb96f62aa069c83b629204a79a3f63b146bcaf773569aee8b5dd23fbcd88974'
+ 'c4da9c18b543ecbc781c1f103321b324a855bdd0979fd36b437f6033736ad4bb'
+ '516c479558576c6c5a2509abfcbf4fdafb5953d252e7a4ab972f9db6137daca8')
+
+build() {
+ cd "$pkgname-$pkgver"
+
+ # Upstream patch that moves gnome-screensaver desktop file out of autostart
+ patch -Np1 -i "$srcdir/move-desktop-file.patch"
+
+ # Fix build
+ patch -Np1 -i "$srcdir/fix-autoconf.patch"
+
+ # Lock screen on suspend with systemd
+ patch -Np1 -i "$srcdir/lock_screen_on_suspend.patch"
+
+ autoreconf -fi
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
+ --with-mit-ext
+ make
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+ install -Dm644 ../gnome-screensaver.pam "$pkgdir/etc/pam.d/gnome-screensaver"
+}
Deleted: community-i686/fix-autoconf.patch
===================================================================
--- community-i686/fix-autoconf.patch 2013-08-27 14:09:55 UTC (rev 96398)
+++ community-i686/fix-autoconf.patch 2013-08-27 14:10:08 UTC (rev 96399)
@@ -1,12 +0,0 @@
-diff -Naur gnome-screensaver-3.6.1.orig/configure.ac gnome-screensaver-3.6.1/configure.ac
---- gnome-screensaver-3.6.1.orig/configure.ac 2012-10-16 04:28:59.000000000 +0200
-+++ gnome-screensaver-3.6.1/configure.ac 2013-04-10 14:24:44.844833193 +0200
-@@ -10,7 +10,7 @@
- AM_INIT_AUTOMAKE([1.10 no-dist-gzip dist-xz tar-ustar])
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
-
- AM_MAINTAINER_MODE([enable])
-
Copied: gnome-screensaver/repos/community-i686/fix-autoconf.patch (from rev 96398, gnome-screensaver/trunk/fix-autoconf.patch)
===================================================================
--- community-i686/fix-autoconf.patch (rev 0)
+++ community-i686/fix-autoconf.patch 2013-08-27 14:10:08 UTC (rev 96399)
@@ -0,0 +1,12 @@
+diff -Naur gnome-screensaver-3.6.1.orig/configure.ac gnome-screensaver-3.6.1/configure.ac
+--- gnome-screensaver-3.6.1.orig/configure.ac 2012-10-16 04:28:59.000000000 +0200
++++ gnome-screensaver-3.6.1/configure.ac 2013-04-10 14:24:44.844833193 +0200
+@@ -10,7 +10,7 @@
+ AM_INIT_AUTOMAKE([1.10 no-dist-gzip dist-xz tar-ustar])
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+
+ AM_MAINTAINER_MODE([enable])
+
Deleted: community-i686/gnome-screensaver.pam
===================================================================
--- community-i686/gnome-screensaver.pam 2013-08-27 14:09:55 UTC (rev 96398)
+++ community-i686/gnome-screensaver.pam 2013-08-27 14:10:08 UTC (rev 96399)
@@ -1,3 +0,0 @@
-#%PAM-1.0
-auth substack system-login
--auth optional pam_gnome_keyring.so
Copied: gnome-screensaver/repos/community-i686/gnome-screensaver.pam (from rev 96398, gnome-screensaver/trunk/gnome-screensaver.pam)
===================================================================
--- community-i686/gnome-screensaver.pam (rev 0)
+++ community-i686/gnome-screensaver.pam 2013-08-27 14:10:08 UTC (rev 96399)
@@ -0,0 +1,3 @@
+#%PAM-1.0
+auth substack system-login
+-auth optional pam_gnome_keyring.so
Copied: gnome-screensaver/repos/community-i686/lock_screen_on_suspend.patch (from rev 96398, gnome-screensaver/trunk/lock_screen_on_suspend.patch)
===================================================================
--- community-i686/lock_screen_on_suspend.patch (rev 0)
+++ community-i686/lock_screen_on_suspend.patch 2013-08-27 14:10:08 UTC (rev 96399)
@@ -0,0 +1,51 @@
+From f8f9beb6a3bf81240d36bfec43e5db9b102ea91e Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martinpitt at gnome.org>
+Date: Wed, 1 May 2013 10:55:49 -0700
+Subject: [PATCH] Lock screen on suspend
+
+Listen for logind's PrepareForSleep signal, and lock the screen (if configured
+to do so). This mirrors what gnome-shell's screensaver does.
+---
+ src/gs-listener-dbus.c | 28 ++++++++++++++++++++++++++++
+ src/gs-listener-dbus.h | 1 +
+ src/gs-monitor.c | 20 ++++++++++++++++++++
+ 3 files changed, 49 insertions(+)
+
+diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c
+index 7f718fa..49586fd 100644
+--- a/src/gs-listener-dbus.c
++++ b/src/gs-listener-dbus.c
+@@ -871,6 +872,17 @@ listener_dbus_handle_system_message (DBusConnection *connection,
+ }
+
+ return DBUS_HANDLER_RESULT_HANDLED;
++ } else if (dbus_message_is_signal (message, SYSTEMD_LOGIND_INTERFACE, "PrepareForSleep")) {
++ gboolean active;
++ if (dbus_message_get_args (message, NULL,
++ DBUS_TYPE_BOOLEAN, &active,
++ DBUS_TYPE_INVALID) && active) {
++ gs_debug ("systemd notified that system is about to sleep");
++ g_signal_emit (listener, signals [LOCK], 0);
++ } else {
++ gs_debug ("cannot parse PrepareForSleep");
++ }
++ return DBUS_HANDLER_RESULT_HANDLED;
+ } else if (dbus_message_is_signal (message, DBUS_INTERFACE_PROPERTIES, "PropertiesChanged")) {
+
+ if (_listener_message_path_is_our_session (listener, message)) {
+@@ -1370,6 +1392,12 @@ gs_listener_acquire (GSListener *listener,
+ ",interface='"DBUS_INTERFACE_PROPERTIES"'"
+ ",member='PropertiesChanged'",
+ NULL);
++ dbus_bus_add_match (listener->priv->system_connection,
++ "type='signal'"
++ ",sender='"SYSTEMD_LOGIND_SERVICE"'"
++ ",interface='"SYSTEMD_LOGIND_INTERFACE"'"
++ ",member='PrepareForSleep'",
++ NULL);
+
+ return (res != -1);
+ }
+--
+1.8.1.2
+
Deleted: community-i686/move-desktop-file.patch
===================================================================
--- community-i686/move-desktop-file.patch 2013-08-27 14:09:55 UTC (rev 96398)
+++ community-i686/move-desktop-file.patch 2013-08-27 14:10:08 UTC (rev 96399)
@@ -1,34 +0,0 @@
-From 1940dc6bc8ad5ee2c029714efb1276c05ca80bd4 Mon Sep 17 00:00:00 2001
-From: Tim Lunn <tim at feathertop.org>
-Date: Thu, 18 Oct 2012 23:08:56 +0000
-Subject: move gnome-screensaver desktop file out of autostart
-
-https://bugzilla.gnome.org/show_bug.cgi?id=683060
----
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 1dd5d46..97ffa07 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -47,7 +47,7 @@ noinst_PROGRAMS = \
- test-window \
- $(NULL)
-
--desktopdir = $(sysconfdir)/xdg/autostart
-+desktopdir = $(datadir)/applications
- desktop_in_files = gnome-screensaver.desktop.in
- desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
- @INTLTOOL_DESKTOP_RULE@
-diff --git a/src/gnome-screensaver.desktop.in.in b/src/gnome-screensaver.desktop.in.in
-index fae80c4..82d6d6f 100644
---- a/src/gnome-screensaver.desktop.in.in
-+++ b/src/gnome-screensaver.desktop.in.in
-@@ -5,7 +5,6 @@ _Comment=Launch screensaver and locker program
- Icon=preferences-desktop-screensaver
- Exec=gnome-screensaver
- OnlyShowIn=GNOME;
--AutostartCondition=GNOME3 if-session gnome-fallback
- NoDisplay=true
- X-GNOME-Autostart-Phase=Application
- X-GNOME-Autostart-Notify=true
---
-cgit v0.9.1
Copied: gnome-screensaver/repos/community-i686/move-desktop-file.patch (from rev 96398, gnome-screensaver/trunk/move-desktop-file.patch)
===================================================================
--- community-i686/move-desktop-file.patch (rev 0)
+++ community-i686/move-desktop-file.patch 2013-08-27 14:10:08 UTC (rev 96399)
@@ -0,0 +1,34 @@
+From 1940dc6bc8ad5ee2c029714efb1276c05ca80bd4 Mon Sep 17 00:00:00 2001
+From: Tim Lunn <tim at feathertop.org>
+Date: Thu, 18 Oct 2012 23:08:56 +0000
+Subject: move gnome-screensaver desktop file out of autostart
+
+https://bugzilla.gnome.org/show_bug.cgi?id=683060
+---
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 1dd5d46..97ffa07 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -47,7 +47,7 @@ noinst_PROGRAMS = \
+ test-window \
+ $(NULL)
+
+-desktopdir = $(sysconfdir)/xdg/autostart
++desktopdir = $(datadir)/applications
+ desktop_in_files = gnome-screensaver.desktop.in
+ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+ @INTLTOOL_DESKTOP_RULE@
+diff --git a/src/gnome-screensaver.desktop.in.in b/src/gnome-screensaver.desktop.in.in
+index fae80c4..82d6d6f 100644
+--- a/src/gnome-screensaver.desktop.in.in
++++ b/src/gnome-screensaver.desktop.in.in
+@@ -5,7 +5,6 @@ _Comment=Launch screensaver and locker program
+ Icon=preferences-desktop-screensaver
+ Exec=gnome-screensaver
+ OnlyShowIn=GNOME;
+-AutostartCondition=GNOME3 if-session gnome-fallback
+ NoDisplay=true
+ X-GNOME-Autostart-Phase=Application
+ X-GNOME-Autostart-Notify=true
+--
+cgit v0.9.1
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2013-08-27 14:09:55 UTC (rev 96398)
+++ community-x86_64/PKGBUILD 2013-08-27 14:10:08 UTC (rev 96399)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-
-pkgname=gnome-screensaver
-pkgver=3.6.1
-pkgrel=4
-pkgdesc="Legacy GNOME screensaver"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://live.gnome.org/GnomeScreensaver"
-backup=(etc/pam.d/gnome-screensaver)
-depends=('dbus-glib' 'libgnomekbd' 'gnome-desktop')
-makedepends=('intltool' 'gnome-common')
-optdepends=('gnome-themes-standard: default background')
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
- gnome-screensaver.pam
- move-desktop-file.patch
- fix-autoconf.patch)
-sha256sums=('f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0'
- 'b6ea9e2eb586d94bcabb617a8f1c2958111df87afdbb51f645882bccdc15cbda'
- '4bb96f62aa069c83b629204a79a3f63b146bcaf773569aee8b5dd23fbcd88974'
- 'c4da9c18b543ecbc781c1f103321b324a855bdd0979fd36b437f6033736ad4bb')
-
-build() {
- cd "$pkgname-$pkgver"
-
- # Upstream patch that moves gnome-screensaver desktop file out of autostart
- patch -Np1 -i "$srcdir/move-desktop-file.patch"
-
- # Fix build
- patch -Np1 -i "$srcdir/fix-autoconf.patch"
-
- autoreconf -fi
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
- --with-mit-ext
- make
-}
-
-package() {
- cd "$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
- install -Dm644 ../gnome-screensaver.pam "$pkgdir/etc/pam.d/gnome-screensaver"
-}
Copied: gnome-screensaver/repos/community-x86_64/PKGBUILD (from rev 96398, gnome-screensaver/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-08-27 14:10:08 UTC (rev 96399)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+pkgname=gnome-screensaver
+pkgver=3.6.1
+pkgrel=5
+pkgdesc="Legacy GNOME screensaver"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://live.gnome.org/GnomeScreensaver"
+backup=(etc/pam.d/gnome-screensaver)
+depends=('dbus-glib' 'libgnomekbd' 'gnome-desktop')
+makedepends=('intltool' 'gnome-common')
+optdepends=('gnome-themes-standard: default background')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+ gnome-screensaver.pam
+ move-desktop-file.patch
+ fix-autoconf.patch
+ lock_screen_on_suspend.patch)
+sha256sums=('f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0'
+ 'b6ea9e2eb586d94bcabb617a8f1c2958111df87afdbb51f645882bccdc15cbda'
+ '4bb96f62aa069c83b629204a79a3f63b146bcaf773569aee8b5dd23fbcd88974'
+ 'c4da9c18b543ecbc781c1f103321b324a855bdd0979fd36b437f6033736ad4bb'
+ '516c479558576c6c5a2509abfcbf4fdafb5953d252e7a4ab972f9db6137daca8')
+
+build() {
+ cd "$pkgname-$pkgver"
+
+ # Upstream patch that moves gnome-screensaver desktop file out of autostart
+ patch -Np1 -i "$srcdir/move-desktop-file.patch"
+
+ # Fix build
+ patch -Np1 -i "$srcdir/fix-autoconf.patch"
+
+ # Lock screen on suspend with systemd
+ patch -Np1 -i "$srcdir/lock_screen_on_suspend.patch"
+
+ autoreconf -fi
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
+ --with-mit-ext
+ make
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+ install -Dm644 ../gnome-screensaver.pam "$pkgdir/etc/pam.d/gnome-screensaver"
+}
Deleted: community-x86_64/fix-autoconf.patch
===================================================================
--- community-x86_64/fix-autoconf.patch 2013-08-27 14:09:55 UTC (rev 96398)
+++ community-x86_64/fix-autoconf.patch 2013-08-27 14:10:08 UTC (rev 96399)
@@ -1,12 +0,0 @@
-diff -Naur gnome-screensaver-3.6.1.orig/configure.ac gnome-screensaver-3.6.1/configure.ac
---- gnome-screensaver-3.6.1.orig/configure.ac 2012-10-16 04:28:59.000000000 +0200
-+++ gnome-screensaver-3.6.1/configure.ac 2013-04-10 14:24:44.844833193 +0200
-@@ -10,7 +10,7 @@
- AM_INIT_AUTOMAKE([1.10 no-dist-gzip dist-xz tar-ustar])
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
-
- AM_MAINTAINER_MODE([enable])
-
Copied: gnome-screensaver/repos/community-x86_64/fix-autoconf.patch (from rev 96398, gnome-screensaver/trunk/fix-autoconf.patch)
===================================================================
--- community-x86_64/fix-autoconf.patch (rev 0)
+++ community-x86_64/fix-autoconf.patch 2013-08-27 14:10:08 UTC (rev 96399)
@@ -0,0 +1,12 @@
+diff -Naur gnome-screensaver-3.6.1.orig/configure.ac gnome-screensaver-3.6.1/configure.ac
+--- gnome-screensaver-3.6.1.orig/configure.ac 2012-10-16 04:28:59.000000000 +0200
++++ gnome-screensaver-3.6.1/configure.ac 2013-04-10 14:24:44.844833193 +0200
+@@ -10,7 +10,7 @@
+ AM_INIT_AUTOMAKE([1.10 no-dist-gzip dist-xz tar-ustar])
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+
+ AM_MAINTAINER_MODE([enable])
+
Deleted: community-x86_64/gnome-screensaver.pam
===================================================================
--- community-x86_64/gnome-screensaver.pam 2013-08-27 14:09:55 UTC (rev 96398)
+++ community-x86_64/gnome-screensaver.pam 2013-08-27 14:10:08 UTC (rev 96399)
@@ -1,3 +0,0 @@
-#%PAM-1.0
-auth substack system-login
--auth optional pam_gnome_keyring.so
Copied: gnome-screensaver/repos/community-x86_64/gnome-screensaver.pam (from rev 96398, gnome-screensaver/trunk/gnome-screensaver.pam)
===================================================================
--- community-x86_64/gnome-screensaver.pam (rev 0)
+++ community-x86_64/gnome-screensaver.pam 2013-08-27 14:10:08 UTC (rev 96399)
@@ -0,0 +1,3 @@
+#%PAM-1.0
+auth substack system-login
+-auth optional pam_gnome_keyring.so
Copied: gnome-screensaver/repos/community-x86_64/lock_screen_on_suspend.patch (from rev 96398, gnome-screensaver/trunk/lock_screen_on_suspend.patch)
===================================================================
--- community-x86_64/lock_screen_on_suspend.patch (rev 0)
+++ community-x86_64/lock_screen_on_suspend.patch 2013-08-27 14:10:08 UTC (rev 96399)
@@ -0,0 +1,51 @@
+From f8f9beb6a3bf81240d36bfec43e5db9b102ea91e Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martinpitt at gnome.org>
+Date: Wed, 1 May 2013 10:55:49 -0700
+Subject: [PATCH] Lock screen on suspend
+
+Listen for logind's PrepareForSleep signal, and lock the screen (if configured
+to do so). This mirrors what gnome-shell's screensaver does.
+---
+ src/gs-listener-dbus.c | 28 ++++++++++++++++++++++++++++
+ src/gs-listener-dbus.h | 1 +
+ src/gs-monitor.c | 20 ++++++++++++++++++++
+ 3 files changed, 49 insertions(+)
+
+diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c
+index 7f718fa..49586fd 100644
+--- a/src/gs-listener-dbus.c
++++ b/src/gs-listener-dbus.c
+@@ -871,6 +872,17 @@ listener_dbus_handle_system_message (DBusConnection *connection,
+ }
+
+ return DBUS_HANDLER_RESULT_HANDLED;
++ } else if (dbus_message_is_signal (message, SYSTEMD_LOGIND_INTERFACE, "PrepareForSleep")) {
++ gboolean active;
++ if (dbus_message_get_args (message, NULL,
++ DBUS_TYPE_BOOLEAN, &active,
++ DBUS_TYPE_INVALID) && active) {
++ gs_debug ("systemd notified that system is about to sleep");
++ g_signal_emit (listener, signals [LOCK], 0);
++ } else {
++ gs_debug ("cannot parse PrepareForSleep");
++ }
++ return DBUS_HANDLER_RESULT_HANDLED;
+ } else if (dbus_message_is_signal (message, DBUS_INTERFACE_PROPERTIES, "PropertiesChanged")) {
+
+ if (_listener_message_path_is_our_session (listener, message)) {
+@@ -1370,6 +1392,12 @@ gs_listener_acquire (GSListener *listener,
+ ",interface='"DBUS_INTERFACE_PROPERTIES"'"
+ ",member='PropertiesChanged'",
+ NULL);
++ dbus_bus_add_match (listener->priv->system_connection,
++ "type='signal'"
++ ",sender='"SYSTEMD_LOGIND_SERVICE"'"
++ ",interface='"SYSTEMD_LOGIND_INTERFACE"'"
++ ",member='PrepareForSleep'",
++ NULL);
+
+ return (res != -1);
+ }
+--
+1.8.1.2
+
Deleted: community-x86_64/move-desktop-file.patch
===================================================================
--- community-x86_64/move-desktop-file.patch 2013-08-27 14:09:55 UTC (rev 96398)
+++ community-x86_64/move-desktop-file.patch 2013-08-27 14:10:08 UTC (rev 96399)
@@ -1,34 +0,0 @@
-From 1940dc6bc8ad5ee2c029714efb1276c05ca80bd4 Mon Sep 17 00:00:00 2001
-From: Tim Lunn <tim at feathertop.org>
-Date: Thu, 18 Oct 2012 23:08:56 +0000
-Subject: move gnome-screensaver desktop file out of autostart
-
-https://bugzilla.gnome.org/show_bug.cgi?id=683060
----
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 1dd5d46..97ffa07 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -47,7 +47,7 @@ noinst_PROGRAMS = \
- test-window \
- $(NULL)
-
--desktopdir = $(sysconfdir)/xdg/autostart
-+desktopdir = $(datadir)/applications
- desktop_in_files = gnome-screensaver.desktop.in
- desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
- @INTLTOOL_DESKTOP_RULE@
-diff --git a/src/gnome-screensaver.desktop.in.in b/src/gnome-screensaver.desktop.in.in
-index fae80c4..82d6d6f 100644
---- a/src/gnome-screensaver.desktop.in.in
-+++ b/src/gnome-screensaver.desktop.in.in
-@@ -5,7 +5,6 @@ _Comment=Launch screensaver and locker program
- Icon=preferences-desktop-screensaver
- Exec=gnome-screensaver
- OnlyShowIn=GNOME;
--AutostartCondition=GNOME3 if-session gnome-fallback
- NoDisplay=true
- X-GNOME-Autostart-Phase=Application
- X-GNOME-Autostart-Notify=true
---
-cgit v0.9.1
Copied: gnome-screensaver/repos/community-x86_64/move-desktop-file.patch (from rev 96398, gnome-screensaver/trunk/move-desktop-file.patch)
===================================================================
--- community-x86_64/move-desktop-file.patch (rev 0)
+++ community-x86_64/move-desktop-file.patch 2013-08-27 14:10:08 UTC (rev 96399)
@@ -0,0 +1,34 @@
+From 1940dc6bc8ad5ee2c029714efb1276c05ca80bd4 Mon Sep 17 00:00:00 2001
+From: Tim Lunn <tim at feathertop.org>
+Date: Thu, 18 Oct 2012 23:08:56 +0000
+Subject: move gnome-screensaver desktop file out of autostart
+
+https://bugzilla.gnome.org/show_bug.cgi?id=683060
+---
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 1dd5d46..97ffa07 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -47,7 +47,7 @@ noinst_PROGRAMS = \
+ test-window \
+ $(NULL)
+
+-desktopdir = $(sysconfdir)/xdg/autostart
++desktopdir = $(datadir)/applications
+ desktop_in_files = gnome-screensaver.desktop.in
+ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+ @INTLTOOL_DESKTOP_RULE@
+diff --git a/src/gnome-screensaver.desktop.in.in b/src/gnome-screensaver.desktop.in.in
+index fae80c4..82d6d6f 100644
+--- a/src/gnome-screensaver.desktop.in.in
++++ b/src/gnome-screensaver.desktop.in.in
+@@ -5,7 +5,6 @@ _Comment=Launch screensaver and locker program
+ Icon=preferences-desktop-screensaver
+ Exec=gnome-screensaver
+ OnlyShowIn=GNOME;
+-AutostartCondition=GNOME3 if-session gnome-fallback
+ NoDisplay=true
+ X-GNOME-Autostart-Phase=Application
+ X-GNOME-Autostart-Notify=true
+--
+cgit v0.9.1
More information about the arch-commits
mailing list