pool/gnome-session
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1073316 from GNOME:Factory

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1073316
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-session?expand=0&rev=203
This commit is contained in:
Dominique Leuenberger 2023-03-24 14:18:03 +00:00 committed by Git OBS Bridge
commit 8564757fba
5 changed files with 32 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnome-session-43.0.tar.xz
View File

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

BIN
gnome-session-44.0.tar.xz (Stored with Git LFS) Normal file
View File

Binary file not shown.

40
gnome-session-exit-when-lost-name-on-bus.patch
View File

@ -1,40 +0,0 @@
Index: gnome-session-41.3/gnome-session/gsm-manager.c
===================================================================
--- gnome-session-41.3.orig/gnome-session/gsm-manager.c
+++ gnome-session-41.3/gnome-session/gsm-manager.c
@@ -1850,6 +1850,16 @@ gsm_manager_set_failsafe (GsmManager *ma
}
gboolean
+gsm_manager_get_dbus_disconnected (GsmManager *manager)
+{
+ GsmManagerPrivate *priv = gsm_manager_get_instance_private (manager);
+
+ g_return_val_if_fail (GSM_IS_MANAGER (manager), FALSE);
+
+ return priv->dbus_disconnected;
+}
+
+gboolean
gsm_manager_get_failsafe (GsmManager *manager)
{
GsmManagerPrivate *priv = gsm_manager_get_instance_private (manager);
Index: gnome-session-41.3/gnome-session/main.c
===================================================================
--- gnome-session-41.3.orig/gnome-session/main.c
+++ gnome-session-41.3/gnome-session/main.c
@@ -83,8 +83,12 @@ on_name_lost (GDBusConnection *connectio
gpointer data)
{
if (connection == NULL) {
- g_warning ("Lost name on bus: %s", name);
- gsm_fail_whale_dialog_we_failed (TRUE, TRUE, NULL);
+ if (gsm_manager_get_dbus_disconnected (manager))
+ gsm_quit ();
+ else {
+ g_warning ("Lost name on bus: %s", name);
+ gsm_fail_whale_dialog_we_failed (TRUE, TRUE, NULL);
+ }
} else {
g_debug ("Calling name lost callback function");

20
gnome-session.changes
View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Mon Mar 20 16:14:17 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 44.0:
+ No changes, stable bump only.
-------------------------------------------------------------------
Mon Mar 6 12:32:56 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 44.rc:
+ Code clean ups
+ Better handling when dbus-daemon dies
+ Improved log output
+ Updated translations.
- Pass systemduserunitdir=%%{_userunitdir} to meson, ensure we set
the correct dir during build.
- Drop gnome-session-exit-when-lost-name-on-bus.patch: Fixed
upstream.
- Bump basever define to 44 following upstream changes.
-------------------------------------------------------------------
Tue Sep 20 17:57:29 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>

20
gnome-session.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package gnome-session
#
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -16,24 +16,22 @@
#
%define basever 43
%define basever 44
Name: gnome-session
Version: 43.0
Version: 44.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/%{basever}/%{name}-%{version}.tar.xz
Source0: https://download.gnome.org/sources/gnome-session/44/%{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-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
# PATCH-FIX-UPSTREAM gnome-session-exit-when-lost-name-on-bus.patch bsc#1175622 glgo!GNOME/gnome-session!60 xwang@suse.com -- gnome-session exit immediately when lost name on bus
Patch3: gnome-session-exit-when-lost-name-on-bus.patch
BuildRequires: docbook-xsl-stylesheets
BuildRequires: fdupes
@ -110,14 +108,14 @@ functional GNOME desktop.
%ifarch s390 s390x
%patch2 -p1
%endif
%patch3 -p1
%build
%meson \
-D docbook=false \
-D systemd=true \
-D systemd_journal=true \
%{nil}
-D docbook=false \
-D systemd=true \
-D systemd_journal=true \
-D systemduserunitdir=%{_userunitdir} \
%{nil}
%meson_build
%install