From bd247335bcf65a8277ab762af9e3f8d7d2495f9c13f9f966e61a9b2a3968c7bf Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 26 Oct 2020 08:12:37 +0000 Subject: [PATCH] Accepting request 842918 from GNOME:Next update to 3.38.1 - TW should be ready OBS-URL: https://build.opensuse.org/request/show/842918 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-session?expand=0&rev=324 --- gnome-session-3.36.0.tar.xz | 3 -- gnome-session-3.38.0.tar.xz | 3 ++ gnome-session-error-numbers-wrong.patch | 44 ------------------- gnome-session-remove-gsd-XSettings.patch | 21 --------- ...session-s390-not-require-g-s-d_wacom.patch | 9 ---- gnome-session.changes | 30 +++++++++++++ gnome-session.spec | 30 +++++-------- 7 files changed, 45 insertions(+), 95 deletions(-) delete mode 100644 gnome-session-3.36.0.tar.xz create mode 100644 gnome-session-3.38.0.tar.xz delete mode 100644 gnome-session-error-numbers-wrong.patch delete mode 100644 gnome-session-remove-gsd-XSettings.patch delete mode 100644 gnome-session-s390-not-require-g-s-d_wacom.patch diff --git a/gnome-session-3.36.0.tar.xz b/gnome-session-3.36.0.tar.xz deleted file mode 100644 index 2cebb14..0000000 --- a/gnome-session-3.36.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d54b38b818c812f64b82cc6a1279e3ca5a6e391ee662793322a38cab5670bb7a -size 475492 diff --git a/gnome-session-3.38.0.tar.xz b/gnome-session-3.38.0.tar.xz new file mode 100644 index 0000000..71106f5 --- /dev/null +++ b/gnome-session-3.38.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7bcc0eb2cdba4b3f6d1b459b3a30873b7bb65b383c1f6a5f63c3e3b5c7943d67 +size 481300 diff --git a/gnome-session-error-numbers-wrong.patch b/gnome-session-error-numbers-wrong.patch deleted file mode 100644 index 703f273..0000000 --- a/gnome-session-error-numbers-wrong.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 534850d20b4f9dcb2c521bf6420a4d34123e7893 Mon Sep 17 00:00:00 2001 -From: Xiaoguang Wang -Date: Fri, 10 Apr 2020 15:41:23 +0800 -Subject: [PATCH] Valid error numbers are all positive numbers - -There is error in journal log: -gnome-session-c[4905]: Error creating FIFO: File exists -The errno can't be negative number. - -https://gitlab.gnome.org/GNOME/gnome-session/-/merge_requests/42 ---- - gnome-session/main.c | 2 +- - tools/gnome-session-ctl.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gnome-session/main.c b/gnome-session/main.c -index 01f56667..c1dda5dc 100644 ---- a/gnome-session/main.c -+++ b/gnome-session/main.c -@@ -349,7 +349,7 @@ systemd_leader_run(void) - fifo_name = g_strdup_printf ("%s/gnome-session-leader-fifo", - g_get_user_runtime_dir ()); - res = mkfifo (fifo_name, 0666); -- if (res < 0 && errno != -EEXIST) -+ if (res < 0 && errno != EEXIST) - g_warning ("Error creating FIFO: %m"); - - fifo_fd = g_open (fifo_name, O_WRONLY | O_CLOEXEC, 0666); -diff --git a/tools/gnome-session-ctl.c b/tools/gnome-session-ctl.c -index 9276a0ad..86f03be1 100644 ---- a/tools/gnome-session-ctl.c -+++ b/tools/gnome-session-ctl.c -@@ -194,7 +194,7 @@ do_monitor_leader (void) - fifo_name = g_strdup_printf ("%s/gnome-session-leader-fifo", - g_get_user_runtime_dir ()); - res = mkfifo (fifo_name, 0666); -- if (res < 0 && errno != -EEXIST) -+ if (res < 0 && errno != EEXIST) - g_warning ("Error creating FIFO: %m"); - - data.fifo_fd = g_open (fifo_name, O_RDONLY | O_CLOEXEC, 0666); --- -2.26.0 - diff --git a/gnome-session-remove-gsd-XSettings.patch b/gnome-session-remove-gsd-XSettings.patch deleted file mode 100644 index 5d2dbc5..0000000 --- a/gnome-session-remove-gsd-XSettings.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 7690131514d22578dc6bfdc3b1af3196ffc4bbac Mon Sep 17 00:00:00 2001 -From: Xiaoguang Wang -Date: Thu, 5 Mar 2020 14:44:38 +0800 -Subject: [PATCH] data: Remove org.gnome.SettingsDaemon.XSettings - -Now gnome-shell starts up org.gnome.SettingsDaemon.XSettings - -https://gitlab.gnome.org/GNOME/gnome-session/issues/51 ---- - data/gnome.session.desktop.in.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: gnome-session-3.36.0/data/gnome.session.desktop.in.in -=================================================================== ---- gnome-session-3.36.0.orig/data/gnome.session.desktop.in.in -+++ gnome-session-3.36.0/data/gnome.session.desktop.in.in -@@ -1,3 +1,3 @@ - [GNOME Session] - Name=GNOME --RequiredComponents=org.gnome.Shell;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; -+RequiredComponents=org.gnome.Shell;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; diff --git a/gnome-session-s390-not-require-g-s-d_wacom.patch b/gnome-session-s390-not-require-g-s-d_wacom.patch deleted file mode 100644 index 38ded42..0000000 --- a/gnome-session-s390-not-require-g-s-d_wacom.patch +++ /dev/null @@ -1,9 +0,0 @@ -Index: gnome-session-3.34.2/data/gnome.session.desktop.in.in -=================================================================== ---- gnome-session-3.34.2.orig/data/gnome.session.desktop.in.in -+++ gnome-session-3.34.2/data/gnome.session.desktop.in.in -@@ -1,3 +1,3 @@ - [GNOME Session] - Name=GNOME --RequiredComponents=org.gnome.Shell;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.Wacom; -+RequiredComponents=org.gnome.Shell;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; diff --git a/gnome-session.changes b/gnome-session.changes index 13e88f3..d9223d8 100644 --- a/gnome-session.changes +++ b/gnome-session.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Mon Sep 14 12:19:28 UTC 2020 - dimstar@opensuse.org + +- Update to version 3.38.0: + + Updated translations. +- Drop gnome-session-remove-gsd-XSettings.patch + gnome-session-s390-not-require-g-s-d_wacom.patch: no longer + applicable. + +------------------------------------------------------------------- +Fri Sep 4 12:26:39 UTC 2020 - dimstar@opensuse.org + +- Update to version 3.37.0: + + util: Unset GNOME_SETUP_DISPLAY at login time. + + main: clear environment on shutdown. + + gnome-session: avoid setting LC_ unless LANG and region + disagree. + + data: Add drop-in to configure launched applications. + + autostart-app: Place launched applications into a systemd + scope. + + doc: Add description of important systemd units to man page. + + fail-whale-dialog: Make dialog visible in all monitors. + + gnome-session-inhibit: Add --list command. + + gnome-session-ctl: Add systemd service failure checker. + + data: Major changes in systemd configuration. + + Updated translations. +- Add pkgconfig(systemd) BuildRequires: new explicitly verified + dependency. +- Drop gnome-session-error-numbers-wrong.patch: fixed upstream. + ------------------------------------------------------------------- Tue May 12 07:18:56 UTC 2020 - Xiaoguang Wang diff --git a/gnome-session.spec b/gnome-session.spec index a96136a..9508d4e 100644 --- a/gnome-session.spec +++ b/gnome-session.spec @@ -17,24 +17,18 @@ Name: gnome-session -Version: 3.36.0 +Version: 3.38.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/3.36/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/gnome-session/3.38/%{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-remove-gsd-XSettings.patch bsc#1163262 glgo#GNOME/gnome-session#51 xwang@suse.com -- remove org.gnome.SettingsDaemon.XSettings from gnome.session -Patch1: gnome-session-remove-gsd-XSettings.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-error-numbers-wrong.patch bsc#1169165 glgo!GNOME/gnome-session#42 xwang@suse.com -- Valid error numbers are all positive numbers -Patch3: gnome-session-error-numbers-wrong.patch BuildRequires: docbook-xsl-stylesheets BuildRequires: fdupes @@ -50,12 +44,13 @@ BuildRequires: pkgconfig(gio-unix-2.0) >= 2.46.0 BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glesv2) BuildRequires: pkgconfig(glib-2.0) >= 2.46.0 -BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.18.0 -BuildRequires: pkgconfig(gtk+-3.0) >= 3.18.0 +BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.24.2 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.22.0 BuildRequires: pkgconfig(ice) BuildRequires: pkgconfig(json-glib-1.0) >= 0.10 BuildRequires: pkgconfig(libsystemd) >= 209 BuildRequires: pkgconfig(sm) +BuildRequires: pkgconfig(systemd) >= 242 BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcomposite) BuildRequires: pkgconfig(xtrans) @@ -107,13 +102,7 @@ functional GNOME desktop. %lang_package %prep -%setup -q -%patch0 -p1 -%patch1 -p1 -%ifarch s390 s390x -%patch2 -p1 -%endif -%patch3 -p1 +%autosetup -p1 translation-update-upstream po gnome-session-3.0 %build @@ -206,6 +195,8 @@ ln -s %{_sysconfdir}/alternatives/default-waylandsession.desktop %{buildroot}%{_ %{_libexecdir}/gnome-session-ctl %{_libexecdir}/gnome-session-failed %{_datadir}/gnome-session/hardware-compatibility +%dir %{_userunitdir}/gnome-launched-.scope.d +%{_userunitdir}/gnome-launched-.scope.d/override.conf %{_userunitdir}/gnome-session-failed.service %{_userunitdir}/gnome-session-failed.target %{_userunitdir}/gnome-session-initialized.target @@ -218,11 +209,14 @@ ln -s %{_sysconfdir}/alternatives/default-waylandsession.desktop %{buildroot}%{_ %{_userunitdir}/gnome-session-signal-init.service %{_userunitdir}/gnome-session-wayland.target %{_userunitdir}/gnome-session-wayland@.target +%{_userunitdir}/gnome-session-x11-services-ready.target +%{_userunitdir}/gnome-session-x11-services.target %{_userunitdir}/gnome-session-x11.target %{_userunitdir}/gnome-session-x11@.target -%{_userunitdir}/gnome-session-x11-services.target %{_userunitdir}/gnome-session.target %{_userunitdir}/gnome-session@.target +%dir %{_userunitdir}/gnome-session@gnome.target.d +%{_userunitdir}/gnome-session@gnome.target.d/gnome.session.conf %files lang -f %{name}-3.0.lang