From 94e0f32e88bd60960d8a43a6fe4af03a783e4086 Mon Sep 17 00:00:00 2001 From: David King Date: Tue, 8 Mar 2022 14:32:14 +0000 Subject: [PATCH] Update to 42.rc1 --- .gitignore | 1 + ...tor-42.alpha2-fix-gcc12-array-bounds.patch | 42 ------------------- gnome-text-editor.spec | 9 ++-- sources | 2 +- 4 files changed, 7 insertions(+), 47 deletions(-) delete mode 100644 gnome-text-editor-42.alpha2-fix-gcc12-array-bounds.patch diff --git a/.gitignore b/.gitignore index e59cf1f..934bddd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /gnome-text-editor-41.1.tar.xz /gnome-text-editor-42.alpha2.tar.xz +/gnome-text-editor-42.rc1.tar.xz diff --git a/gnome-text-editor-42.alpha2-fix-gcc12-array-bounds.patch b/gnome-text-editor-42.alpha2-fix-gcc12-array-bounds.patch deleted file mode 100644 index a40a3a2..0000000 --- a/gnome-text-editor-42.alpha2-fix-gcc12-array-bounds.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 709f144d702915ce49c4c0dde21548d0f9880f41 Mon Sep 17 00:00:00 2001 -From: Christian Hergert -Date: Wed, 19 Jan 2022 11:07:46 -0800 -Subject: [PATCH] textregionbtree: add more assertions and failure branching - -Related #296 ---- - src/cjhtextregionbtree.h | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/src/cjhtextregionbtree.h b/src/cjhtextregionbtree.h -index 53609a6..610874c 100644 ---- a/src/cjhtextregionbtree.h -+++ b/src/cjhtextregionbtree.h -@@ -191,7 +191,10 @@ G_BEGIN_DECLS - for (_iter = (Node)->head, _nth = 0; \ - _nth < (Nth); \ - _iter = (Node)->items[_iter].next, ++_nth) \ -- { /* Do Nothing */ } \ -+ { \ -+ /* Do Nothing */ \ -+ g_assert (_iter != VAL_QUEUE_INVALID(Node)); \ -+ } \ - } \ - } G_STMT_END - #define _VAL_QUEUE_MOVE(Node, Old, New) \ -@@ -293,6 +296,12 @@ G_BEGIN_DECLS - guint8 _len; \ - \ - VAL_QUEUE_POP_NTH(&(FIELD)->q, POSITION, _pos); \ -+ if (_pos == VAL_QUEUE_INVALID(&(FIELD)->q)) \ -+ { \ -+ g_assert_not_reached (); \ -+ break; \ -+ } \ -+ \ - _ele = (FIELD)->items[_pos]; \ - _len = VAL_QUEUE_LENGTH(&(FIELD)->q); \ - \ --- -GitLab - diff --git a/gnome-text-editor.spec b/gnome-text-editor.spec index 9e43728..c0506f0 100644 --- a/gnome-text-editor.spec +++ b/gnome-text-editor.spec @@ -6,15 +6,13 @@ %global tarball_version %%(echo %{version} | tr '~' '.') Name: gnome-text-editor -Version: 42~alpha2 +Version: 42~rc1 Release: 1%{?dist} Summary: A simple text editor for the GNOME desktop License: GPLv3+ URL: https://gitlab.gnome.org/GNOME/gnome-text-editor Source0: https://download.gnome.org/sources/%{name}/42/%{name}-%{tarball_version}.tar.xz -# https://gitlab.gnome.org/GNOME/gnome-text-editor/-/issues/296 -Patch0: gnome-text-editor-42.alpha2-fix-gcc12-array-bounds.patch BuildRequires: pkgconfig(enchant-2) >= %{enchant_version} BuildRequires: pkgconfig(gio-unix-2.0) >= %{glib2_version} @@ -69,11 +67,14 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.TextEditor. %dir %{_datadir}/dbus-1/services %{_datadir}/dbus-1/services/org.gnome.TextEditor.service %{_datadir}/glib-2.0/schemas/org.gnome.TextEditor.gschema.xml -%{_datadir}/gtksourceview-5/styles/*.xml +%{_datadir}/gnome-text-editor/ %{_datadir}/icons/hicolor/*/*/*.svg %changelog +* Tue Mar 08 2022 David King - 42~rc1-1 +- Update to 42.rc1 + * Thu Jan 20 2022 David King - 42~alpha2-1 - Update to 42.alpha2 diff --git a/sources b/sources index 3ef62e0..ff281f3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-text-editor-42.alpha2.tar.xz) = a63bd5136b9e3151369879ea0a5f5d43c87d1f31bff2cf0d0b8f41ef05a1b1b8bd1733ad6c0c38eb5b9617baccfbef6084ff4e1de74648fa37187fbce072d113 +SHA512 (gnome-text-editor-42.rc1.tar.xz) = debebccceb4bbe2bfc87a1c1f0813b10fc0c565cc89c6b3a826daa0a3344c88b9f20135087335f61d7b736a8c8ada7e2f823795c1e6c8d3d03ac7325afd0a9ae