From 05dc08774109c161c6afa67b4cf2c0cfc2c0344659da583bb264d77ab3456e95 Mon Sep 17 00:00:00 2001 From: Luciano Santos Date: Fri, 15 Sep 2023 02:05:53 +0000 Subject: [PATCH] Accepting request 1111044 from GNOME:Next OBS-URL: https://build.opensuse.org/request/show/1111044 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-session?expand=0&rev=347 --- _service | 19 ++++++++++++++ _servicedata | 4 +++ gnome-session-44.0+10.obscpio | 3 +++ gnome-session-44.0.tar.xz | 3 --- gnome-session-Fix-inhibit-DBus.patch | 38 ++++++++++++++++++++++++++++ gnome-session.changes | 16 ++++++++++++ gnome-session.obsinfo | 4 +++ gnome-session.spec | 10 ++++++-- 8 files changed, 92 insertions(+), 5 deletions(-) create mode 100644 _service create mode 100644 _servicedata create mode 100644 gnome-session-44.0+10.obscpio delete mode 100644 gnome-session-44.0.tar.xz create mode 100644 gnome-session-Fix-inhibit-DBus.patch create mode 100644 gnome-session.obsinfo diff --git a/_service b/_service new file mode 100644 index 0000000..ef4df52 --- /dev/null +++ b/_service @@ -0,0 +1,19 @@ + + + + git + https://gitlab.gnome.org/GNOME/gnome-session.git + 6e76dc3761caac4b1b211c33538d86457aaa5687 + @PARENT_TAG@+@TAG_OFFSET@ + (.*)\+0 + \1 + enable + + + + *.tar + xz + + + + diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..3bb1159 --- /dev/null +++ b/_servicedata @@ -0,0 +1,4 @@ + + + https://gitlab.gnome.org/GNOME/gnome-session.git + 6e76dc3761caac4b1b211c33538d86457aaa5687 \ No newline at end of file diff --git a/gnome-session-44.0+10.obscpio b/gnome-session-44.0+10.obscpio new file mode 100644 index 0000000..b21fc26 --- /dev/null +++ b/gnome-session-44.0+10.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0898ec5be59e7e02e87c8fe2231526165f92f86eaff78c07681dbc55a8b2a8fa +size 3646476 diff --git a/gnome-session-44.0.tar.xz b/gnome-session-44.0.tar.xz deleted file mode 100644 index c81189d..0000000 --- a/gnome-session-44.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ccf829a96526135e9e9f917526515d36a5092bdfa316f3737dd8c5a524dbf2c6 -size 485372 diff --git a/gnome-session-Fix-inhibit-DBus.patch b/gnome-session-Fix-inhibit-DBus.patch new file mode 100644 index 0000000..c028418 --- /dev/null +++ b/gnome-session-Fix-inhibit-DBus.patch @@ -0,0 +1,38 @@ +From c403cf95aabc408e2a7e987761f9dacd71c32067 Mon Sep 17 00:00:00 2001 +From: Erik Inkinen +Date: Tue, 12 Sep 2023 17:25:01 +0300 +Subject: [PATCH] gsm-manager: Fix Inhibit DBus method handler + +In case of an error, the DBus method handler should still return TRUE +to signify that this was the correct handler. +For an error in handling there request, +using g_dbus_method_invocation_take_error is sufficient. +--- + gnome-session/gsm-manager.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gnome-session/gsm-manager.c b/gnome-session/gsm-manager.c +index 05e0d8d5..a19b7f52 100644 +--- a/gnome-session/gsm-manager.c ++++ b/gnome-session/gsm-manager.c +@@ -3154,7 +3154,7 @@ gsm_manager_inhibit (GsmExportedManager *skeleton, + "Reason not specified"); + g_debug ("GsmManager: Unable to inhibit: %s", new_error->message); + g_dbus_method_invocation_take_error (invocation, new_error); +- return FALSE; ++ return TRUE; + } + + if (flags == 0) { +@@ -3165,7 +3165,7 @@ gsm_manager_inhibit (GsmExportedManager *skeleton, + "Invalid inhibit flags"); + g_debug ("GsmManager: Unable to inhibit: %s", new_error->message); + g_dbus_method_invocation_take_error (invocation, new_error); +- return FALSE; ++ return TRUE; + } + + cookie = _generate_unique_cookie (manager); +-- +GitLab + diff --git a/gnome-session.changes b/gnome-session.changes index 046efe6..cc0bb86 100644 --- a/gnome-session.changes +++ b/gnome-session.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Thu Sep 14 07:27:33 UTC 2023 - Bjørn Lie + +- Add gnome-session-Fix-inhibit-DBus.patch: gsm-manager: Fix + Inhibit DBus method handler (glgo#gnome-session!97). + +------------------------------------------------------------------- +Mon Sep 11 17:41:17 UTC 2023 - bjorn.lie@gmail.com + +- Update to version 44.0+10: + + gnome-session: Bind more LC_* variables to REGION + + gsm-system: make return_false actually return FALSE + + data: Add gnome-portals.conf + + DOAP: Fix 'bug-database' value to point to GNOME GitLab Issues + + Updated translations. + ------------------------------------------------------------------- Thu May 4 11:11:22 UTC 2023 - Bjørn Lie diff --git a/gnome-session.obsinfo b/gnome-session.obsinfo new file mode 100644 index 0000000..bf8633c --- /dev/null +++ b/gnome-session.obsinfo @@ -0,0 +1,4 @@ +name: gnome-session +version: 44.0+10 +mtime: 1694028136 +commit: 6e76dc3761caac4b1b211c33538d86457aaa5687 diff --git a/gnome-session.spec b/gnome-session.spec index bfa3409..ca03a8c 100644 --- a/gnome-session.spec +++ b/gnome-session.spec @@ -19,19 +19,22 @@ %define basever 44 Name: gnome-session -Version: 44.0 +Version: 44.0+10 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/44/%{name}-%{version}.tar.xz +#Source0: https://download.gnome.org/sources/gnome-session/44/%%{name}-%%{version}.tar.xz +Source0: %{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-Fix-inhibit-DBus.patch -- glgo#gnome-session!97 gsm-manager: Fix Inhibit DBus method handler +Patch3: gnome-session-Fix-inhibit-DBus.patch BuildRequires: docbook-xsl-stylesheets BuildRequires: fdupes @@ -107,6 +110,7 @@ functional GNOME desktop. %ifarch s390 s390x %patch2 -p1 %endif +%patch3 -p1 %build %meson \ @@ -188,6 +192,8 @@ ln -s %{_sysconfdir}/alternatives/default-waylandsession.desktop %{buildroot}%{_ %{_datadir}/glib-2.0/schemas/org.gnome.SessionManager.gschema.xml %dir %{_datadir}/gnome-session %dir %{_datadir}/gnome-session/sessions +%dir %{_datadir}/xdg-desktop-portal +%{_datadir}/xdg-desktop-portal/gnome-portals.conf %{_mandir}/man1/gnome-session.1%{?ext_man} %{_mandir}/man1/gnome-session-inhibit.1%{?ext_man} %{_mandir}/man1/gnome-session-quit.1%{?ext_man}