From 274530024aa521688d2b0fc489067584e89e596a5754294e246f78bd647f71f5 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 27 Mar 2024 14:24:27 +0000 Subject: [PATCH 1/2] Accepting request 1161733 from home:eroca - Add data-desktop-disable-DBusActivatable.patch Fixes session restore in GNOME 46 OBS-URL: https://build.opensuse.org/request/show/1161733 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-text-editor?expand=0&rev=26 --- data-desktop-disable-DBusActivatable.patch | 35 ++++++++++++++++++++++ gnome-text-editor.changes | 6 ++++ gnome-text-editor.spec | 1 + 3 files changed, 42 insertions(+) create mode 100644 data-desktop-disable-DBusActivatable.patch diff --git a/data-desktop-disable-DBusActivatable.patch b/data-desktop-disable-DBusActivatable.patch new file mode 100644 index 0000000..6617556 --- /dev/null +++ b/data-desktop-disable-DBusActivatable.patch @@ -0,0 +1,35 @@ +From 9a97fddb82824497e76d0e895cf40757f7d89727 Mon Sep 17 00:00:00 2001 +From: Christian Hergert +Date: Mon, 25 Mar 2024 11:13:44 -0700 +Subject: [PATCH] data/desktop: disable DBusActivatable + +We can end up starting up without going through session initialization if +we are activated via D-Bus alone. + +An alternative, if this should become problematic, would be to delay all +start-up procsesing options until the first activation or open request is +received by the EditorApplication. + +Fixes #661 +--- + data/org.gnome.TextEditor.desktop.in.in | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/data/org.gnome.TextEditor.desktop.in.in b/data/org.gnome.TextEditor.desktop.in.in +index d7516185..2ac72a38 100644 +--- a/data/org.gnome.TextEditor.desktop.in.in ++++ b/data/org.gnome.TextEditor.desktop.in.in +@@ -1,7 +1,9 @@ + [Desktop Entry] + Categories=GNOME;GTK;Utility;TextEditor; + Keywords=write;notepad; +-DBusActivatable=true ++# Not activatable because we want to force ourself through the startup ++# options processing for session-state/etc. See #661. ++DBusActivatable=false + Exec=gnome-text-editor %U + MimeType=text/plain;application/x-zerosize; + Name=Text Editor +-- +GitLab + diff --git a/gnome-text-editor.changes b/gnome-text-editor.changes index 07262b0..a85491b 100644 --- a/gnome-text-editor.changes +++ b/gnome-text-editor.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 26 12:10:58 UTC 2024 - Elisei Roca + +- Add data-desktop-disable-DBusActivatable.patch + Fixes session restore in GNOME 46 + ------------------------------------------------------------------- Sat Mar 16 09:26:36 UTC 2024 - Dominique Leuenberger diff --git a/gnome-text-editor.spec b/gnome-text-editor.spec index 792521f..b8fb8aa 100644 --- a/gnome-text-editor.spec +++ b/gnome-text-editor.spec @@ -23,6 +23,7 @@ Summary: GNOME Text Editor License: GPL-3.0-or-later URL: https://gitlab.gnome.org/GNOME/gnome-text-editor Source: %{name}-%{version}.tar.zst +Patch1: data-desktop-disable-DBusActivatable.patch BuildRequires: appstream-glib BuildRequires: desktop-file-utils From 9b6cebfc2800398aa2b0c61ca7debc59a2608f9c7578d3b982ee538b1a2b2dc2 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 27 Mar 2024 14:26:07 +0000 Subject: [PATCH 2/2] - Add data-desktop-disable-DBusActivatable.patch: Fixes session restore in GNOME 46. OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-text-editor?expand=0&rev=27 --- gnome-text-editor.changes | 4 ++-- gnome-text-editor.spec | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gnome-text-editor.changes b/gnome-text-editor.changes index a85491b..c0bf555 100644 --- a/gnome-text-editor.changes +++ b/gnome-text-editor.changes @@ -1,8 +1,8 @@ ------------------------------------------------------------------- Tue Mar 26 12:10:58 UTC 2024 - Elisei Roca -- Add data-desktop-disable-DBusActivatable.patch - Fixes session restore in GNOME 46 +- Add data-desktop-disable-DBusActivatable.patch: Fixes session + restore in GNOME 46. ------------------------------------------------------------------- Sat Mar 16 09:26:36 UTC 2024 - Dominique Leuenberger diff --git a/gnome-text-editor.spec b/gnome-text-editor.spec index b8fb8aa..ce4d035 100644 --- a/gnome-text-editor.spec +++ b/gnome-text-editor.spec @@ -23,6 +23,7 @@ Summary: GNOME Text Editor License: GPL-3.0-or-later URL: https://gitlab.gnome.org/GNOME/gnome-text-editor Source: %{name}-%{version}.tar.zst +# PATCH-FIX-UPSTREAM data-desktop-disable-DBusActivatable.patch glgo#GNOME/gnome-text-editor#661 -- Session restore does not work if launched from Apps Menu Patch1: data-desktop-disable-DBusActivatable.patch BuildRequires: appstream-glib