Accepting request 954340 from GNOME:Next
New release OBS-URL: https://build.opensuse.org/request/show/954340 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gedit?expand=0&rev=259
This commit is contained in:
Git OBS Bridge
parent
a4b361bc96
commit
f49f9f2b09
34
124.patch
34
124.patch
@ -1,34 +0,0 @@
|
||||
From 023ca8a428dff764c7cf84282a97f856e162c07c Mon Sep 17 00:00:00 2001
|
||||
From: rvalue <i@rvalue.moe>
|
||||
Date: Wed, 15 Dec 2021 07:02:09 +0000
|
||||
Subject: [PATCH] Remove incorrect args for i18n.merge_file
|
||||
|
||||
The positional argument has been silently ignored for a time. And it causes failure
|
||||
with "ERROR: Function does not take positional arguments" since meson 0.60.0
|
||||
---
|
||||
data/meson.build | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/data/meson.build b/data/meson.build
|
||||
index 774618b3d..0077b49c5 100644
|
||||
--- a/data/meson.build
|
||||
+++ b/data/meson.build
|
||||
@@ -4,7 +4,6 @@ install_man('gedit.1')
|
||||
|
||||
appdata = 'org.gnome.gedit.appdata.xml'
|
||||
appdata_file = i18n.merge_file(
|
||||
- appdata,
|
||||
input: appdata + '.in',
|
||||
output: appdata,
|
||||
po_dir: '../po/',
|
||||
@@ -23,7 +22,6 @@ endif
|
||||
|
||||
desktop_file = 'org.gnome.gedit.desktop'
|
||||
desktop_output_file = i18n.merge_file(
|
||||
- desktop_file,
|
||||
type: 'desktop',
|
||||
input: desktop_file + '.in',
|
||||
output: desktop_file,
|
||||
--
|
||||
GitLab
|
||||
|
||||
3
gedit-41.0.tar.xz
Normal file
3
gedit-41.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7a9b18b158808d1892989165f3706c4f1a282979079ab7458a79d3c24ad4deb5
|
||||
size 6889320
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4e445d7d2b5c0b088d32cce9dbd17d5507b3362adf6fa985c975282323233f3a
|
||||
size 6886948
|
||||
@ -1,37 +0,0 @@
|
||||
From 624af5fed418c2be0939f42e75c4e9c4744d98d7 Mon Sep 17 00:00:00 2001
|
||||
From: Ray Strode <rstrode@redhat.com>
|
||||
Date: Mon, 27 Sep 2021 15:07:52 -0400
|
||||
Subject: [PATCH] open-selector: Fix crash introduced in GDateTime port
|
||||
|
||||
commit acf14cc04f1e66c4c726d9a0b193bf39a28ca8b0 moved FileItems
|
||||
over to using GDateTime instead of GTimeVal.
|
||||
|
||||
This reduced code complexity pretty nicely, but it unfortunately
|
||||
introduced a bug, where the sort_items_by_mru function was treating
|
||||
the FileItems themselves as GDateTime objects. That bug causes a
|
||||
crash when opening files.
|
||||
|
||||
This commit fixes the problem by using the ->accessed members
|
||||
instead of the file items themselves.
|
||||
|
||||
Closes: https://gitlab.gnome.org/GNOME/gedit/-/issues/465
|
||||
---
|
||||
gedit/gedit-open-document-selector.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gedit/gedit-open-document-selector.c b/gedit/gedit-open-document-selector.c
|
||||
index bc3d0548d..e46f01568 100644
|
||||
--- a/gedit/gedit-open-document-selector.c
|
||||
+++ b/gedit/gedit-open-document-selector.c
|
||||
@@ -312,7 +312,7 @@ sort_items_by_mru (FileItem *a,
|
||||
{
|
||||
g_assert (a != NULL && b != NULL);
|
||||
|
||||
- return g_date_time_compare (b, a);
|
||||
+ return g_date_time_compare (b->accessed, a->accessed);
|
||||
}
|
||||
|
||||
static GList *
|
||||
--
|
||||
GitLab
|
||||
|
||||
@ -1,3 +1,18 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 14 15:21:10 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
- Update to version 41.0:
|
||||
+ Note that gnome-text-editor will be GNOME's recommended text
|
||||
editor beginning with the GNOME 42 release next month.
|
||||
+ Fix some crashes, one when opening files, another when deleting
|
||||
the open folder with the file browser plugin active.
|
||||
+ Fix buttons in the color scheme selector dialog.
|
||||
+ Build fixes.
|
||||
+ Improve symbolic icon coloring.
|
||||
+ Improve Save As behavior when saving error infobar is showing.
|
||||
+ Updated translations.
|
||||
- Drop 124.patch and gedit-fix-open-crash.patch: Fixed upstream.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 2 09:49:18 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
%bcond_without python_bindings
|
||||
Name: gedit
|
||||
Version: 41.alpha
|
||||
Version: 41.0
|
||||
Release: 0
|
||||
Summary: UTF-8 text editor
|
||||
License: GPL-2.0-or-later
|
||||
@ -29,10 +29,6 @@ Source0: https://download.gnome.org/sources/gedit/41/%{name}-%{version}.t
|
||||
Patch0: gedit-desktop.patch
|
||||
# PATCH-FIX-OPENSUSE gedit-plugins-python-env.patch bjorn.lie@gmail.com -- Fix python env
|
||||
Patch1: gedit-plugins-python-env.patch
|
||||
# PATCH-FIX-UPSTREAM gedit-fix-open-crash.patch -- open-selector: Fix crash introduced in GDateTime port
|
||||
Patch2: gedit-fix-open-crash.patch
|
||||
# PATCH-FIX-UPSTREAM 124.patch -- Fix build with meson 0.61.0 and newer
|
||||
Patch3: https://gitlab.gnome.org/GNOME/gedit/-/merge_requests/124.patch
|
||||
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gobject-introspection-devel >= 0.9.3
|
||||
@ -141,7 +137,8 @@ This subpackage contains the header files for creating gedit plugins.
|
||||
%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.time.enums.xml
|
||||
%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.time.gschema.xml
|
||||
%dir %{_libdir}/gedit/
|
||||
%{_libdir}/gedit/libgedit-%{version}.so
|
||||
#%%{_libdir}/gedit/libgedit-%%{version}.so
|
||||
%{_libdir}/gedit/libgedit-41.so
|
||||
%{_libdir}/gedit/girepository-1.0/
|
||||
%dir %{_libdir}/gedit/plugins/
|
||||
# Explicitly list plugins so we know when we miss one
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user