Accepting request 1166851 from GNOME:Factory

Update to 46.1 (forwarded request 1166844 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/1166851
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-text-editor?expand=0&rev=14
This commit is contained in:
Ana Guerrero 2024-04-12 15:34:03 +00:00 committed by Git OBS Bridge
commit 132bccb8a6
7 changed files with 19 additions and 45 deletions

View File

@ -3,7 +3,7 @@
<service name="obs_scm" mode="manual">
<param name="scm">git</param>
<param name="url">https://gitlab.gnome.org/GNOME/gnome-text-editor.git</param>
<param name="revision">46.0</param>
<param name="revision">46.1</param>
<param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
<param name="versionrewrite-pattern">(.*)\+0</param>
<param name="versionrewrite-replacement">\1</param>

View File

@ -1,35 +0,0 @@
From 9a97fddb82824497e76d0e895cf40757f7d89727 Mon Sep 17 00:00:00 2001
From: Christian Hergert <chergert@redhat.com>
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

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ccf46fabc45e6e1788a0f12d2087c5a383b485612084ba1e3b2684b918150609
size 3908108

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c44cd924a049da7418f0e6484e7988a3c10fa17e48d6ac30d63eef7377387679
size 3943436

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Thu Apr 11 11:27:23 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
- Update to version 46.1:
+ Remove DBusActicatable=true from the .desktop file to fix an
issue where you could spawn Text Editor via D-Bus and not have
the session restored at startup.
+ AppData fixes.
+ Updated translations.
- Drop data-desktop-disable-DBusActivatable.patch: fixed upstream.
-------------------------------------------------------------------
Tue Mar 26 12:10:58 UTC 2024 - Elisei Roca <eroca@suse.com>

View File

@ -1,4 +1,4 @@
name: gnome-text-editor
version: 46.0
mtime: 1710544287
commit: 5890bf13b3a4dd810b96b086301e856aba523215
version: 46.1
mtime: 1712784976
commit: d051841333bc18f64e6c3f77fcb7fc7da34701f7

View File

@ -17,14 +17,12 @@
Name: gnome-text-editor
Version: 46.0
Version: 46.1
Release: 0
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
BuildRequires: desktop-file-utils