From b8cf289df88c533275840205b7c8520e77e18b1a2754fbac207c4c340e624f37 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 21 Mar 2022 09:04:49 +0000 Subject: [PATCH 1/2] Accepting request 962025 from home:xiaoguang_wang:branches:GNOME:Factory - Add gdm-restart-session-when-X-server-restart.patch: Avoiding the blank screen when X server restarts with GDM_DISABLE_USER_DISPLAY_SERVER=1 (bsc#1196974). OBS-URL: https://build.opensuse.org/request/show/962025 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=494 --- ...estart-session-when-X-server-restart.patch | 30 +++++++++++++++++++ gdm.changes | 7 +++++ gdm.spec | 3 ++ 3 files changed, 40 insertions(+) create mode 100644 gdm-restart-session-when-X-server-restart.patch diff --git a/gdm-restart-session-when-X-server-restart.patch b/gdm-restart-session-when-X-server-restart.patch new file mode 100644 index 0000000..301d098 --- /dev/null +++ b/gdm-restart-session-when-X-server-restart.patch @@ -0,0 +1,30 @@ +Index: gdm-41.3/daemon/gdm-local-display-factory.c +=================================================================== +--- gdm-41.3.orig/daemon/gdm-local-display-factory.c ++++ gdm-41.3/daemon/gdm-local-display-factory.c +@@ -541,8 +541,10 @@ on_display_status_changed (GdmDisplay + * ensures we get a new login screen when the user logs out, + * if there isn't one. + */ ++ g_debug ("GdmLocalDisplayFactory: session_class = %s active_vt = %u", session_class, factory->active_vt); + if (is_local && +- (g_strcmp0 (session_class, "greeter") != 0 || factory->active_vt == GDM_INITIAL_VT)) { ++ (g_strcmp0 (session_class, "greeter") != 0 || factory->active_vt == GDM_INITIAL_VT ++ || factory->active_vt == 0)) { + /* reset num failures */ + factory->num_failures = 0; + +Index: gdm-41.3/daemon/gdm-manager.c +=================================================================== +--- gdm-41.3.orig/daemon/gdm-manager.c ++++ gdm-41.3/daemon/gdm-manager.c +@@ -1548,7 +1548,8 @@ on_display_status_changed (GdmDisplay *d + } + #endif + +- g_object_set_data (G_OBJECT (display), "gdm-user-session", NULL); ++ if (getenv ("GDM_DISABLE_USER_DISPLAY_SERVER") == NULL ) ++ g_object_set_data (G_OBJECT (display), "gdm-user-session", NULL); + + if (display == manager->priv->automatic_login_display) { + g_clear_weak_pointer (&manager->priv->automatic_login_display); diff --git a/gdm.changes b/gdm.changes index 6fd90ba..2ce15b3 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Mar 16 00:53:48 UTC 2022 - Xiaoguang Wang + +- Add gdm-restart-session-when-X-server-restart.patch: + Avoiding the blank screen when X server restarts with + GDM_DISABLE_USER_DISPLAY_SERVER=1 (bsc#1196974). + ------------------------------------------------------------------- Wed Feb 16 08:33:14 UTC 2022 - Dominique Leuenberger diff --git a/gdm.spec b/gdm.spec index d332904..f98e777 100644 --- a/gdm.spec +++ b/gdm.spec @@ -76,6 +76,8 @@ Patch15: gdm-disable-wayland-on-mgag200-chipsets.patch Patch1000: gdm-disable-gnome-initial-setup.patch # PATCH-FIX-SLE gdm-add-runtime-option-to-disable-starting-X-server-as-u.patch bnc#1188912 jsc#SLE-17880 xwang@suse.com -- Add runtime option to start X under root instead of regular user. Patch1001: gdm-add-runtime-option-to-disable-starting-X-server-as-u.patch +# PATCH-FIX-SLE gdm-restart-session-when-X-server-restart.patch bsc#1196974 xwang@suse.com -- Fix blank screen when X restarts with GDM_DISABLE_USER_DISPLAY_SERVER=1. +Patch1002: gdm-restart-session-when-X-server-restart.patch BuildRequires: check-devel # dconf and gnome-session-core are needed for directory ownership BuildRequires: dconf @@ -243,6 +245,7 @@ running display manager. %if 0%{?sle_version} %patch1000 -p1 %patch1001 -p1 +%patch1002 -p1 %endif %build From 3721b964938958731dda6251ec247d9675963d680a152d757aa88f11b39a0782 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Tue, 22 Mar 2022 17:14:39 +0000 Subject: [PATCH 2/2] Accepting request 963986 from GNOME:Next GNOME 42 late-comers OBS-URL: https://build.opensuse.org/request/show/963986 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=495 --- gdm-41.3.tar.xz | 3 --- gdm-42.0.tar.xz | 3 +++ gdm.changes | 17 +++++++++++++++++ gdm.spec | 16 ++++++++++------ 4 files changed, 30 insertions(+), 9 deletions(-) delete mode 100644 gdm-41.3.tar.xz create mode 100644 gdm-42.0.tar.xz diff --git a/gdm-41.3.tar.xz b/gdm-41.3.tar.xz deleted file mode 100644 index e2a4b3b..0000000 --- a/gdm-41.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bb0b650a7cea90f09a33284fbd02975315407efc18e814009852d1bcad3437d4 -size 807452 diff --git a/gdm-42.0.tar.xz b/gdm-42.0.tar.xz new file mode 100644 index 0000000..ce647f8 --- /dev/null +++ b/gdm-42.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a328ac976937bec179971ff07829a1246b98ce724181c128ae32a0ba47ad3855 +size 811200 diff --git a/gdm.changes b/gdm.changes index 2ce15b3..6110689 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Mon Mar 21 22:43:33 UTC 2022 - Luciano Santos + +- Update to version 42.0: + + Improvements to work better on NVidia cards. + + Look in DATADIR for launching environment data files. + + PAM updates on exherbo. + + Updated translations. +- Add pkgconfig(gudev-1.0), with minimal version of 232, as a new + build requirement. +- Add explicit update-alternatives to post(un) requirements to + avoid rare unexpected behaviors due to package order of + installation. +- Replace systemdsystemunitdir with _unitdir macro. There's no need + to manually define it anymore since systemd-rpm-macros already + provide it. + ------------------------------------------------------------------- Wed Mar 16 00:53:48 UTC 2022 - Xiaoguang Wang diff --git a/gdm.spec b/gdm.spec index f98e777..8f20edf 100644 --- a/gdm.spec +++ b/gdm.spec @@ -16,7 +16,6 @@ # -%define systemdsystemunitdir %(pkg-config --variable=systemdsystemunitdir systemd) # FIXME: need to check what should be done to enable this (at least adapt the pam files). See bnc#699999 %define enable_split_authentication 0 @@ -29,14 +28,14 @@ %endif Name: gdm -Version: 41.3 +Version: 42.0 Release: 0 Summary: The GNOME Display Manager License: GPL-2.0-or-later Group: System/GUI/GNOME URL: https://wiki.gnome.org/Projects/GDM -Source0: https://download.gnome.org/sources/gdm/41/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/gdm/42/%{name}-%{version}.tar.xz Source1: gdm.pamd Source2: gdm-autologin.pamd Source3: gdm-launch-environment.pamd @@ -103,6 +102,7 @@ BuildRequires: pkgconfig(gobject-2.0) >= 2.56.0 BuildRequires: pkgconfig(gobject-introspection-1.0) >= 0.9.12 BuildRequires: pkgconfig(gthread-2.0) BuildRequires: pkgconfig(gtk+-3.0) >= 2.91.1 +BuildRequires: pkgconfig(gudev-1.0) >= 232 BuildRequires: pkgconfig(iso-codes) BuildRequires: pkgconfig(libcanberra-gtk3) >= 0.4 BuildRequires: pkgconfig(libkeyutils) @@ -126,6 +126,8 @@ Requires: gnome-shell Requires: xdm Requires(post): dconf Requires(pre): group(video) +Requires(post): update-alternatives +Requires(postun):update-alternatives Recommends: iso-codes # accessibility Recommends: orca @@ -187,7 +189,7 @@ providing graphical log-ins and managing local and remote displays. Summary: The GNOME Display Manager -- Upstream default configuration Group: System/GUI/GNOME Requires: %{name} = %{version} -Supplements: packageand(%{name}:branding-upstream) +Supplements: (%{name} and branding-upstream) Conflicts: %{name}-branding Provides: %{name}-branding = %{version} BuildArch: noarch @@ -202,7 +204,7 @@ providing graphical log-ins and managing local and remote displays. This package provides the upstream default configuration for gdm. %package systemd -Summary: systemd gdm.service file +Summary: Systemd gdm.service file Group: System/GUI/GNOME Requires: gdm BuildArch: noarch @@ -325,6 +327,8 @@ install -m 644 %{SOURCE11} %{buildroot}%{_sysusersdir}/gdm.conf %check %meson_test +# FIXME -- Document why we don't use %%service_add_*/%%service_del_* macros. + %pre -f gdm.pre %post @@ -407,7 +411,7 @@ dconf update %config(noreplace) %{_sysconfdir}/gdm/custom.conf %files systemd -%{systemdsystemunitdir}/gdm.service +%{_unitdir}/gdm.service %files -n gdmflexiserver %{_bindir}/gdmflexiserver