From 7eac0a5018536eec03de9a8af377e4f896a10aef Mon Sep 17 00:00:00 2001 From: David King Date: Wed, 12 Jan 2022 17:18:08 +0000 Subject: [PATCH] Update to 41.3 --- .gitignore | 1 + ...ME-on-Wayland-session-for-X11-prefer.patch | 140 ------------------ gnome-session.spec | 13 +- sources | 2 +- 4 files changed, 9 insertions(+), 147 deletions(-) delete mode 100644 0001-data-Install-GNOME-on-Wayland-session-for-X11-prefer.patch diff --git a/.gitignore b/.gitignore index 7c1e32b..e8432c6 100644 --- a/.gitignore +++ b/.gitignore @@ -116,3 +116,4 @@ gnome-session-2.31.6.tar.bz2 /gnome-session-40.0.tar.xz /gnome-session-40.1.tar.xz /gnome-session-40.1.1.tar.xz +/gnome-session-41.3.tar.xz diff --git a/0001-data-Install-GNOME-on-Wayland-session-for-X11-prefer.patch b/0001-data-Install-GNOME-on-Wayland-session-for-X11-prefer.patch deleted file mode 100644 index b999f33..0000000 --- a/0001-data-Install-GNOME-on-Wayland-session-for-X11-prefer.patch +++ /dev/null @@ -1,140 +0,0 @@ -From 2f84d8ada4d468ef368c662276472f02c50bdd94 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= -Date: Mon, 20 Sep 2021 18:04:46 +0200 -Subject: [PATCH] data: Install GNOME on Wayland session for X11 preferred - setups - -gdm supports now setups where X11 is the preferred session, but wayland -can be used on demand. - -However we're currently not proposing GNOME on Wayland session because -the preferred X11 GNOME session will be picked instead. - -To avoid this, install (again) the gnome-wayland session, so that it -will be selectable when gdm is running under X11, but it also supports -wayland. Given its name, it will be filtered out in the case gdm is -running instead under wayland. ---- - data/gnome-wayland.desktop.in.in | 3 ++- - data/meson.build | 20 +++++++++++++------- - 2 files changed, 15 insertions(+), 8 deletions(-) - -diff --git a/data/gnome-wayland.desktop.in.in b/data/gnome-wayland.desktop.in.in -index 516c211e..b48eecd6 100644 ---- a/data/gnome-wayland.desktop.in.in -+++ b/data/gnome-wayland.desktop.in.in -@@ -1,7 +1,8 @@ - [Desktop Entry] --Name=GNOME -+Name=GNOME on Wayland - Comment=This session logs you into GNOME - Exec=@bindir@/gnome-session - TryExec=@bindir@/gnome-session - Type=Application - DesktopNames=GNOME -+X-GDM-SessionRegisters=true -diff --git a/data/meson.build b/data/meson.build -index e02b80d3..d3134ade 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -1,84 +1,90 @@ - desktop_plain = 'gnome' - - desktops = [ - desktop_plain, -- 'gnome-xorg' -+ 'gnome-xorg', -+ 'gnome-wayland', - ] - - shell_component = { - desktop_plain: 'org.gnome.Shell', - } - - required_components = { - desktop_plain: [ - 'org.gnome.SettingsDaemon.A11ySettings', - 'org.gnome.SettingsDaemon.Color', - 'org.gnome.SettingsDaemon.Datetime', - 'org.gnome.SettingsDaemon.Housekeeping', - 'org.gnome.SettingsDaemon.Keyboard', - 'org.gnome.SettingsDaemon.MediaKeys', - '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.UsbProtection', - 'org.gnome.SettingsDaemon.Wacom', - 'org.gnome.SettingsDaemon.XSettings', - ], - } - - if enable_session_selector - desktops += 'gnome-custom-session' - endif - - foreach name: desktops - desktop_conf = configuration_data() - desktop_conf.set('bindir', session_bindir) - - desktop = name + '.desktop' - - desktop_in = configure_file( - input: desktop + '.in.in', - output: desktop + '.in', - configuration: desktop_conf - ) - -- install_dir = join_paths(session_datadir, 'xsessions') -- # FIXME: The same target can not be copied into two directories. -- # There is a workaround in meson_post_install.py until proper solution arises: -- # https://groups.google.com/forum/#!topic/mesonbuild/3iIoYPrN4P0 -- if name == desktop_plain -- #install_dir: [ -+ if name.endswith('-xorg') -+ install_dir = session_datadir / 'xsessions' -+ elif name.endswith('-wayland') -+ install_dir = session_datadir / 'wayland-sessions' -+ else -+ # FIXME: The same target can not be copied into two directories. -+ # There is a workaround in meson_post_install.py until proper -+ # solution arises: -+ # https://github.com/mesonbuild/meson/issues/2416 -+ install_dir = session_datadir / 'xsessions' -+ #install_dir = [ - # join_paths(session_datadir, 'xsessions'), - # join_paths(session_datadir, 'wayland-sessions') - #] - endif - - desktop_target = i18n.merge_file( - desktop, - type: 'desktop', - input: desktop_in, - output: desktop, - po_dir: po_dir, - install: true, - install_dir: install_dir - ) - endforeach - - sessions = [ - 'gnome', - 'gnome-dummy' - ] - - foreach session: sessions - session_file = session + '.session' - desktop_conf = configuration_data() - desktop_conf.set('libexecdir', session_libexecdir) - desktop_conf.set('required_components', ';'.join( - [shell_component.get(session, '')] + required_components.get(session, []))) - - desktop = session_file + '.desktop' - --- -2.31.1 - diff --git a/gnome-session.spec b/gnome-session.spec index 7d82f3f..71af3d3 100644 --- a/gnome-session.spec +++ b/gnome-session.spec @@ -1,4 +1,4 @@ -%define po_package gnome-session-40 +%define po_package gnome-session-41 %if 0%{?fedora} %else @@ -8,13 +8,13 @@ %global tarball_version %%(echo %{version} | tr '~' '.') Name: gnome-session -Version: 40.1.1 -Release: 3%{?dist} +Version: 41.3 +Release: 1%{?dist} Summary: GNOME session manager License: GPLv2+ URL: https://gitlab.gnome.org/GNOME/gnome-session -Source0: https://download.gnome.org/sources/gnome-session/40/%{name}-%{tarball_version}.tar.xz +Source0: https://download.gnome.org/sources/gnome-session/41/%{name}-%{tarball_version}.tar.xz # Blacklist NV30: https://bugzilla.redhat.com/show_bug.cgi?id=745202 Patch1: gnome-session-3.3.92-nv30.patch @@ -63,8 +63,6 @@ Requires: gsettings-desktop-schemas >= 0.1.7 Requires: dbus -Patch0: 0001-data-Install-GNOME-on-Wayland-session-for-X11-prefer.patch - %description gnome-session manages a GNOME desktop or GDM login session. It starts up @@ -132,6 +130,9 @@ Desktop file to add GNOME on wayland to display manager session menu. %{_userunitdir}/gnome-launched-.scope.d/ %changelog +* Wed Jan 12 2022 David King - 41.3-1 +- Update to 41.3 + * Tue Oct 12 2021 Ray Strode - 40.1.1-3 - Install gnome-wayland session diff --git a/sources b/sources index 919b90f..fe34c8f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-session-40.1.1.tar.xz) = 91609915366839806729e066e5ca0d42daff0591732cda08c3da7d4951f7e27964d72988c4e61a64045443969b9fb0a9697c7ace82bdd8843310cb4d7e9dfd8c +SHA512 (gnome-session-41.3.tar.xz) = a75c038639301ccd1f0abf83f944890f74986e94dc32f45c97c1872ddc09bcebbb94116f7f865b1d9fa40a81133ec14fbfb75d585061750d9809af4abba3aa9a