Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=059dba9ceb8b9a047578f3c38df5d1918bb16589

commit 059dba9ceb8b9a047578f3c38df5d1918bb16589
Author: Baste <ba...@frugalware.org>
Date:   Fri Oct 14 15:14:19 2016 +0200

gnome-session-3.22.1-1-x86_64
- 3.22.0 -> 3.22.1

diff --git a/source/gnome/gnome-session/FrugalBuild 
b/source/gnome/gnome-session/FrugalBuild
index 47cb6b0..530fa47 100644
--- a/source/gnome/gnome-session/FrugalBuild
+++ b/source/gnome/gnome-session/FrugalBuild
@@ -5,8 +5,8 @@
USE_DEBUG=${USE_DEBUG:-"y"}

pkgname=gnome-session
-pkgver=3.22.0
-pkgrel=2
+pkgver=3.22.1
+pkgrel=1
pkgdesc="GNOME session manager"
depends=('gnome-desktop>=3.22.0' 'upower' 'json-glib' 'gconf' 'systemd>=231-7' \
'dbus-glib' 'gsettings-desktop-schemas>=3.22.0' 'dconf' 'dbus-x11' 'libgles')
@@ -21,11 +21,10 @@ _F_gnome_desktop="y"
_F_gnome_devel="n"
_F_gnome_ext=".tar.xz"
Finclude gnome gnome-scriptlet
-source=($source gnome.desktop logout.patch)
+source=($source gnome.desktop)
Fconfopts+=" --with-gtk=3.0 --enable-systemd --disable-docbook-docs"
-sha1sums=('01a00011451415e1f55e2cc3124e7cc5ab3ef7a1' \
-          '2dd9ecf26e8851f27e9f9e3737cad250cf8b93e9' \
-          '8933d238f1517c5a616843b0c4e410af299206ac')
+sha1sums=('71259cb2ab04fc07d9e6a851707c48f291bd35d5' \
+          '2dd9ecf26e8851f27e9f9e3737cad250cf8b93e9')

build() {
Fcd
diff --git a/source/gnome/gnome-session/logout.patch 
b/source/gnome/gnome-session/logout.patch
deleted file mode 100644
index 9ada6c5..0000000
--- a/source/gnome/gnome-session/logout.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From b3b6d74fd1c916d013fa9cc9f1d61970504da1a7 Mon Sep 17 00:00:00 2001
-From: Michael Catanzaro <mcatanz...@gnome.org>
-Date: Fri, 16 Sep 2016 12:48:01 -0500
-Subject: manager: set phase to running before clearing inhibitors
-
-e83da6fb3c9307895226ae4812ac27b782a57600 introduced a regression where
-clicking cancel on the power off dialog causes the dialog to reopen
-itself in case any JIT inhibitor has been taken, since the inhibitors
-are removed here and removing the inhibitor causing the dialog to reopen
-to support functionality that was removed from gnome-shell three years
-ago. To fix this, set the manager phase to running before removing the
-inhibitors to ensure the power off dialog does not reopen.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=728151
----
- gnome-session/gsm-manager.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/gnome-session/gsm-manager.c b/gnome-session/gsm-manager.c
-index 49aa31e..012f3d3 100644
---- a/gnome-session/gsm-manager.c
-+++ b/gnome-session/gsm-manager.c
-@@ -1071,6 +1071,11 @@ cancel_end_session (GsmManager *manager)
-
-         g_cancellable_cancel (manager->priv->end_session_cancellable);
-
-+        gsm_manager_set_phase (manager, GSM_MANAGER_PHASE_RUNNING);
-+        manager->priv->logout_mode = GSM_MANAGER_LOGOUT_MODE_NORMAL;
-+
-+        manager->priv->logout_type = GSM_MANAGER_LOGOUT_NONE;
-+
-         /* clear all JIT inhibitors */
-         gsm_store_foreach_remove (manager->priv->inhibitors,
-                                   (GsmStoreFunc)inhibitor_is_jit,
-@@ -1080,11 +1085,6 @@ cancel_end_session (GsmManager *manager)
-                            (GsmStoreFunc)_client_cancel_end_session,
-                            NULL);
-
--        gsm_manager_set_phase (manager, GSM_MANAGER_PHASE_RUNNING);
--        manager->priv->logout_mode = GSM_MANAGER_LOGOUT_MODE_NORMAL;
--
--        manager->priv->logout_type = GSM_MANAGER_LOGOUT_NONE;
--
-         start_phase (manager);
- }
-
---
-cgit v0.12
\ No newline at end of file
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to