[arch-commits] Commit in cinnamon-screensaver/trunk (2 files)

[Balló György]

    Date: Wednesday, March 19, 2014 @ 02:06:51
  Author: bgyorgy
Revision: 107736

upgpkg: cinnamon-screensaver 2.0.3-4

Remove the Lock screen on suspend with systemd patch. This functionality is handled within cinnamon-settings-daemon now.

Modified:
  cinnamon-screensaver/trunk/PKGBUILD
Deleted:
  cinnamon-screensaver/trunk/lock_screen_on_suspend.patch

------------------------------+
 PKGBUILD                     |   11 ++------
 lock_screen_on_suspend.patch |   51 -----------------------------------------
 2 files changed, 3 insertions(+), 59 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-19 00:56:51 UTC (rev 107735)
+++ PKGBUILD	2014-03-19 01:06:51 UTC (rev 107736)
@@ -5,7 +5,7 @@
 
 pkgname=cinnamon-screensaver
 pkgver=2.0.3
-pkgrel=3
+pkgrel=4
 pkgdesc="Screensaver designed to integrate well with the Cinnamon desktop."
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -16,13 +16,11 @@
 source=($pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-screensaver/archive/$pkgver.tar.gz
        cinnamon-screensaver.pam
        away-message-fixes.patch
-       fix-systemd-lock.patch
-       lock_screen_on_suspend.patch)
+       fix-systemd-lock.patch)
 sha256sums=('00c866e98994afc8939d1d347de631cebaa6ec34ad59646a7ccd223bd757cc7d'
             'b6ea9e2eb586d94bcabb617a8f1c2958111df87afdbb51f645882bccdc15cbda'
             'f9f3d555b0c325322469be765b488da599fc850f8ff5a74f72fdf69f68e04c96'
-            '14d3301a03883330bf044a40ea4dce74a829b03174833d21efe66ebeb940dc0c'
-            '54f281eeb0e97c8c46250e287719051e0a580f6c0de384760aaa3532b42616f1')
+            '14d3301a03883330bf044a40ea4dce74a829b03174833d21efe66ebeb940dc0c')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -32,9 +30,6 @@
 
   # Use the session path instead of the session id
   patch -Np1 -i ../fix-systemd-lock.patch
-
-  # Lock screen on suspend with systemd
-  patch -Np1 -i ../lock_screen_on_suspend.patch
 }
 
 build() {

Deleted: lock_screen_on_suspend.patch
===================================================================
--- lock_screen_on_suspend.patch	2014-03-19 00:56:51 UTC (rev 107735)
+++ lock_screen_on_suspend.patch	2014-03-19 01:06:51 UTC (rev 107736)
@@ -1,51 +0,0 @@
-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
-