Accepting request 945905 from GNOME:Next

Update to 41.3

OBS-URL: https://build.opensuse.org/request/show/945905
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-session?expand=0&rev=336

gnome-session-40.1.1.tar.xz

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

gnome-session-41.3.tar.xz

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

gnome-session-better-handle-empty-xdg_session_type.patch

@@ -1,13 +1,13 @@
-Index: gnome-session-3.28.0/tools/gnome-session-check-accelerated.c
+Index: gnome-session-41.3/tools/gnome-session-check-accelerated.c
 ===================================================================
---- gnome-session-3.28.0.orig/tools/gnome-session-check-accelerated.c
+--- gnome-session-41.3.orig/tools/gnome-session-check-accelerated.c
-+++ gnome-session-3.28.0/tools/gnome-session-check-accelerated.c
++++ gnome-session-41.3/tools/gnome-session-check-accelerated.c
 @@ -147,7 +147,7 @@ main (int argc, char **argv)
           * Also make sure that we don't read cached information about the first GPU
           * when requesting information about the second.
           */
 -        if (is_discrete_gpu_check () || g_strcmp0 (g_getenv ("XDG_SESSION_TYPE"), "x11") != 0) {
 +        if (is_discrete_gpu_check () || g_strcmp0 (g_getenv ("XDG_SESSION_TYPE"), "wayland") == 0) {
-                 renderer_string = get_gtk_gles_renderer ();
+                 g_autofree char *discrete_renderer_string = get_gtk_gles_renderer ();
-                 if (renderer_string) {
+                 if (discrete_renderer_string) {
-                         g_print ("%s", renderer_string);
+                         g_print ("%s", discrete_renderer_string);

gnome-session-exit-when-lost-name-on-bus.patch

@@ -1,38 +0,0 @@
-diff --git a/gnome-session/gsm-manager.c b/gnome-session/gsm-manager.c
-index 6839a02d..67b09d8a 100644
---- a/gnome-session/gsm-manager.c
-+++ b/gnome-session/gsm-manager.c
-@@ -1802,6 +1802,14 @@ gsm_manager_set_failsafe (GsmManager *manager,
-         manager->priv->failsafe = enabled;
- }
- 
-+gboolean
-+gsm_manager_get_dbus_disconnected (GsmManager *manager)
-+{
-+        g_return_val_if_fail (GSM_IS_MANAGER (manager), FALSE);
-+
-+        return manager->priv->dbus_disconnected;
-+}
-+
- gboolean
- gsm_manager_get_failsafe (GsmManager *manager)
- {
-diff --git a/gnome-session/main.c b/gnome-session/main.c
-index 01f56667..51ea6975 100644
---- a/gnome-session/main.c
-+++ b/gnome-session/main.c
-@@ -83,8 +83,12 @@ on_name_lost (GDBusConnection *connection,
-               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");
- 

gnome-session.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Wed Jan 12 17:03:20 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Update to version 41.3:
+  + No changes, just version synching.
+- Changes from version 40.8:
+  + data: Install GNOME on Wayland session for X11 preferred setups
+  + Don't spew as much into log when falling back to non-systemd sessions
+  + Work better with certain versions of meson
+  + Correct screwed up check for gnome-shell
+  + Various cleanups and leak fixes
+  + Updated translations.
+- Rebase gnome-session-better-handle-empty-xdg_session_type.patch.
+- Drop gnome-session-exit-when-lost-name-on-bus.patch: no longer
+  applicable.
+
 -------------------------------------------------------------------
 Thu Sep 16 01:40:38 UTC 2021 - Stanislav Brabec <sbrabec@suse.com>
 

gnome-session.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package gnome-session
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,19 +17,17 @@
 
 
 Name:           gnome-session
-Version:        40.1.1
+Version:        41.3
 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/40/%{name}-%{version}.tar.xz
+Source0:        https://download.gnome.org/sources/gnome-session/41/%{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-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
-Patch1:         gnome-session-exit-when-lost-name-on-bus.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
 
@@ -106,7 +104,6 @@ functional GNOME desktop.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 %ifarch s390 s390x
 %patch2 -p1
 %endif
@@ -126,7 +123,7 @@ install -d -m755 %{buildroot}%{_bindir}
 install -m755 %{SOURCE1} %{buildroot}%{_bindir}/gnome
 install -d -m755 %{buildroot}%{_datadir}/xsessions
 install -m644 %{SOURCE2} %{buildroot}%{_datadir}/xsessions/gnome.desktop
-%find_lang %{name}-40 %{?no_lang_C}
+%find_lang %{name}-41 %{?no_lang_C}
 %fdupes %{buildroot}/%{_prefix}
 # remove wayland files on s390/s390x
 %ifarch s390 s390x
@@ -174,6 +171,7 @@ ln -s %{_sysconfdir}/alternatives/default-waylandsession.desktop %{buildroot}%{_
 %dir %{_datadir}/wayland-sessions
 %{_datadir}/wayland-sessions/default.desktop
 %{_datadir}/wayland-sessions/gnome.desktop
+%{_datadir}/wayland-sessions/gnome-wayland.desktop
 %ghost %{_sysconfdir}/alternatives/default-waylandsession.desktop
 # Disabled as wayland is now the default session again.
 #{_datadir}/wayland-sessions/gnome-wayland.desktop
@@ -224,6 +222,6 @@ ln -s %{_sysconfdir}/alternatives/default-waylandsession.desktop %{buildroot}%{_
 %dir %{_userunitdir}/gnome-session@gnome.target.d
 %{_userunitdir}/gnome-session@gnome.target.d/gnome.session.conf
 
-%files lang -f %{name}-40.lang
+%files lang -f %{name}-41.lang
 
 %changelog