From 9be2da3dd1c6d7680ba6ecec83163a670d0c01644c55412af12f2d5f03786166 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 20 Mar 2023 12:50:02 +0000 Subject: [PATCH] Accepting request 1073106 from GNOME:Next Subbing RC, in case upstream forgets to do a stable bump.... - 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. OBS-URL: https://build.opensuse.org/request/show/1073106 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-session?expand=0&rev=342 --- gnome-session-43.0.tar.xz | 3 -- gnome-session-44.rc.tar.xz | 3 ++ ...e-session-exit-when-lost-name-on-bus.patch | 40 ------------------- gnome-session.changes | 14 +++++++ gnome-session.spec | 20 +++++----- 5 files changed, 26 insertions(+), 54 deletions(-) delete mode 100644 gnome-session-43.0.tar.xz create mode 100644 gnome-session-44.rc.tar.xz delete mode 100644 gnome-session-exit-when-lost-name-on-bus.patch diff --git a/gnome-session-43.0.tar.xz b/gnome-session-43.0.tar.xz deleted file mode 100644 index 2a331af..0000000 --- a/gnome-session-43.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3fb9949501385c8c14618e78f178d952df98ad8c91080f4c5e1568c7393ae1f2 -size 484196 diff --git a/gnome-session-44.rc.tar.xz b/gnome-session-44.rc.tar.xz new file mode 100644 index 0000000..b02308b --- /dev/null +++ b/gnome-session-44.rc.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:03659950be77c97d8effdda838926a5ffdc7d05fdf98136fc0e9787634e71a41 +size 485348 diff --git a/gnome-session-exit-when-lost-name-on-bus.patch b/gnome-session-exit-when-lost-name-on-bus.patch deleted file mode 100644 index f99c457..0000000 --- a/gnome-session-exit-when-lost-name-on-bus.patch +++ /dev/null @@ -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"); - diff --git a/gnome-session.changes b/gnome-session.changes index bf09f2c..7d061aa 100644 --- a/gnome-session.changes +++ b/gnome-session.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Mon Mar 6 12:32:56 UTC 2023 - Bjørn Lie + +- 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 diff --git a/gnome-session.spec b/gnome-session.spec index 3cfec20..ddf8c2f 100644 --- a/gnome-session.spec +++ b/gnome-session.spec @@ -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.rc 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