Accepting request 695721 from GNOME:Factory

Scripted push of project GNOME:Next (forwarded request 695622 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/695721
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-session?expand=0&rev=183
This commit is contained in:
Dominique Leuenberger 2019-05-03 20:13:00 +00:00 committed by Git OBS Bridge
commit 6a76054a7d
6 changed files with 93 additions and 6 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:eafe85972689186c7c6b5fe1d3bb4dc204a1e0e6b6e763e24b8fb43a40c07739
size 485996

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bbd4c4ead32f0b805d0e372a63207e4e0c756dd16e1d456b2a211a40da9d3f7f
size 485916

View File

@ -0,0 +1,43 @@
From 8676d77beb46e5a1f52ca0196ebebcd9890be5c2 Mon Sep 17 00:00:00 2001
From: xiaoguang wang <xwang@suse.com>
Date: Tue, 12 Mar 2019 10:59:46 +0800
Subject: [PATCH] presence: Enable idle detection while screensaver is active
Dim screen function depends on signal STATUS_CHANGED. To dim screen when
screensaver is active, need to enable idle detection at that time.
https://gitlab.gnome.org/GNOME/gnome-shell/issues/900
---
gnome-session/gsm-presence.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/gnome-session/gsm-presence.c b/gnome-session/gsm-presence.c
index fa476abc..cdfa3ccd 100644
--- a/gnome-session/gsm-presence.c
+++ b/gnome-session/gsm-presence.c
@@ -173,10 +173,7 @@ idle_became_idle_cb (GnomeIdleMonitor *idle_monitor,
gpointer user_data)
{
GsmPresence *presence = user_data;
- /* We should already be idle,
- * see on_screensaver_active_changed() */
- if (!presence->priv->screensaver_active)
- set_session_idle (presence, TRUE);
+ set_session_idle (presence, TRUE);
}
static void
@@ -185,9 +182,7 @@ idle_became_active_cb (GnomeIdleMonitor *idle_monitor,
gpointer user_data)
{
GsmPresence *presence = user_data;
- /* We can only be non-idle if the screensaver is gone */
- if (!presence->priv->screensaver_active)
- set_session_idle (presence, FALSE);
+ set_session_idle (presence, FALSE);
}
static void
--
2.16.4

View File

@ -0,0 +1,9 @@
Index: gnome-session-3.32.0/data/gnome.session.desktop.in.in
===================================================================
--- gnome-session-3.32.0.orig/data/gnome.session.desktop.in.in
+++ gnome-session-3.32.0/data/gnome.session.desktop.in.in
@@ -1,3 +1,3 @@
[GNOME Session]
Name=GNOME
-RequiredComponents=org.gnome.Shell;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;
+RequiredComponents=org.gnome.Shell;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.XSettings;

View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Fri Mar 29 06:50:54 UTC 2019 - Yifan Jiang <yfjiang@suse.com>
- Add gnome-session-s390-not-require-g-s-d_wacom.patch: Remove the
gnome session runtime requirement of g-s-d Wacom plugin because
it is not build on s390 (bsc#1129412).
-------------------------------------------------------------------
Fri Mar 29 06:41:22 UTC 2019 - xwang@suse.com
- Add
gnome-session-presence-Enable-idle-detection-when-screen-locked.patch:
Enable dimming screen when screen is locked (bsc#1118286,
glgo#GNOME/gnome-shell#900).
-------------------------------------------------------------------
Wed Mar 13 16:07:02 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 3.32.0:
+ Updated translations.
-------------------------------------------------------------------
Tue Jan 8 13:19:49 UTC 2019 - bjorn.lie@gmail.com
- Update to version 3.31.4:
+ Updated translations.
-------------------------------------------------------------------
Wed Sep 26 11:01:28 UTC 2018 - bjorn.lie@gmail.com

View File

@ -1,7 +1,7 @@
#
# spec file for package gnome-session
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,18 +17,22 @@
Name: gnome-session
Version: 3.30.1
Version: 3.32.0
Release: 0
Summary: Session Tools for the GNOME Desktop
License: GPL-2.0-or-later
Group: System/GUI/GNOME
URL: https://www.gnome.org
Source0: https://download.gnome.org/sources/gnome-session/3.30/%{name}-%{version}.tar.xz
Source0: https://download.gnome.org/sources/gnome-session/3.32/%{name}-%{version}.tar.xz
Source1: gnome
Source2: gnome.desktop
# PATCH-FIX-UPSTREAM gnome-session-better-handle-empty-xdg_session_type.patch bsc#1084756 bgo#794256 yfjiang@suse.com -- solution provided by msrb@suse.com using a more reasonable way to handle gpu acceleration check
Patch0: gnome-session-better-handle-empty-xdg_session_type.patch
# PATCH-FIX-UPSTREAM gnome-session-presence-Enable-idle-detection-when-screen-locked.patch bsc#1118286 glgo#GNOME/gnome-shell#900 xwang@suse.com -- Enable dimming screen when screen is locked
Patch1: gnome-session-presence-Enable-idle-detection-when-screen-locked.patch
# PATCH-FIX-OPENSUSE gnome-session-s390-not-require-g-s-d_wacom.patch bsc#1129412 yfjiang@suse.com -- Remove the runtime requirement of g-s-d Wacom plugin
Patch2: gnome-session-s390-not-require-g-s-d_wacom.patch
BuildRequires: docbook-xsl-stylesheets
BuildRequires: fdupes
@ -104,6 +108,10 @@ functional GNOME desktop.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%ifarch s390 s390x
%patch2 -p1
%endif
translation-update-upstream po gnome-session-3.0
%build