Accepting request 944032 from GNOME:Next

- Stop passing introspection=true, vapi=true and plugins=true to
  meson, no longer needed.

- Add gedit-fix-open-crash.patch: open-selector: Fix crash
  introduced in GDateTime port.

- Update to version 41.alpha:
  + Replace use of Tepl and AMTK
  + Use sourceview4 in the snap build
  + Enable OpenLink plugin by default
  + Warn when trying to open a big file and allow to cancel
  + Port open-selector to GDateTime
  + Allow disabling gspell and python options
  + Fix parsing of font-family strgins when they contain whitespace
  * Updated translations.
- Drop pkgconfig(tepl-6) BuildRequires: no longer needed.

  + Updated translations.

OBS-URL: https://build.opensuse.org/request/show/944032
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gedit?expand=0&rev=257
This commit is contained in:
Dominique Leuenberger 2022-01-05 13:28:05 +00:00 committed by Git OBS Bridge
parent 846de643d8
commit 0584beb337
5 changed files with 76 additions and 13 deletions

View File

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

3
gedit-41.alpha.tar.xz Normal file
View File

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

View File

@ -0,0 +1,37 @@
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

View File

@ -1,9 +1,35 @@
-------------------------------------------------------------------
Fri Nov 5 07:51:35 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
- Stop passing introspection=true, vapi=true and plugins=true to
meson, no longer needed.
-------------------------------------------------------------------
Mon Sep 27 19:34:30 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
- Add gedit-fix-open-crash.patch: open-selector: Fix crash
introduced in GDateTime port.
-------------------------------------------------------------------
Thu Sep 16 01:34:00 UTC 2021 - Stanislav Brabec <sbrabec@suse.com>
- Remove obsolete translation-update-upstream support
(jsc#SLE-21105).
-------------------------------------------------------------------
Fri Aug 6 12:42:50 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
- Update to version 41.alpha:
+ Replace use of Tepl and AMTK
+ Use sourceview4 in the snap build
+ Enable OpenLink plugin by default
+ Warn when trying to open a big file and allow to cancel
+ Port open-selector to GDateTime
+ Allow disabling gspell and python options
+ Fix parsing of font-family strgins when they contain whitespace
* Updated translations.
- Drop pkgconfig(tepl-6) BuildRequires: no longer needed.
-------------------------------------------------------------------
Sat Apr 17 12:59:53 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>

View File

@ -18,17 +18,19 @@
%bcond_without python_bindings
Name: gedit
Version: 40.1
Version: 41.alpha
Release: 0
Summary: UTF-8 text editor
License: GPL-2.0-or-later
Group: Productivity/Text/Editors
URL: https://wiki.gnome.org/Apps/Gedit
Source0: https://download.gnome.org/sources/gedit/40/%{name}-%{version}.tar.xz
Source0: https://download.gnome.org/sources/gedit/41/%{name}-%{version}.tar.xz
# PATCH-FIX-OPENSUSE gedit-desktop.patch -- Adds more MIME types.
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
BuildRequires: fdupes
BuildRequires: gobject-introspection-devel >= 0.9.3
@ -39,8 +41,8 @@ BuildRequires: meson >= 0.53
BuildRequires: pkgconfig
BuildRequires: python3-base >= 3.2.3
BuildRequires: yelp-tools
BuildRequires: pkgconfig(gio-2.0) >= 2.52
BuildRequires: pkgconfig(glib-2.0) >= 2.52
BuildRequires: pkgconfig(gio-2.0) >= 2.64
BuildRequires: pkgconfig(glib-2.0) >= 2.64
BuildRequires: pkgconfig(gmodule-2.0)
BuildRequires: pkgconfig(gsettings-desktop-schemas)
BuildRequires: pkgconfig(gspell-1) >= 1.0
@ -49,7 +51,6 @@ BuildRequires: pkgconfig(gtksourceview-4) >= 4.0.2
BuildRequires: pkgconfig(libpeas-1.0) >= 1.14.1
BuildRequires: pkgconfig(libpeas-gtk-1.0) >= 1.14.1
BuildRequires: pkgconfig(pygobject-3.0) >= 3.0.0
BuildRequires: pkgconfig(tepl-6) >= 5.99.0
BuildRequires: pkgconfig(vapigen) >= 0.25.1
BuildRequires: pkgconfig(x11)
Requires: python3-cairo
@ -107,9 +108,6 @@ This subpackage contains the header files for creating gedit plugins.
%build
%meson \
-Dintrospection=true \
-Dvapi=true \
-Dplugins=true \
-Dgtk_doc=true \
%{nil}
%meson_build
@ -141,7 +139,7 @@ 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-40.0.so
%{_libdir}/gedit/libgedit-%{version}.so
%{_libdir}/gedit/girepository-1.0/
%dir %{_libdir}/gedit/plugins/
# Explicitly list plugins so we know when we miss one
@ -153,6 +151,8 @@ This subpackage contains the header files for creating gedit plugins.
%{_libdir}/gedit/plugins/libfilebrowser.so
%{_libdir}/gedit/plugins/modelines.plugin
%{_libdir}/gedit/plugins/libmodelines.so
%{_libdir}/gedit/plugins/libopenlinks.so
%{_libdir}/gedit/plugins/openlinks.plugin
%{_libdir}/gedit/plugins/pythonconsole/
%{_libdir}/gedit/plugins/pythonconsole.plugin
%{_libdir}/gedit/plugins/quickopen/