Update to 42.rc1

This commit is contained in:
David King 2022-03-08 14:32:14 +00:00
parent 76c5f1f335
commit 94e0f32e88
4 changed files with 7 additions and 47 deletions

1
.gitignore vendored
View File

@ -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

View File

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

View File

@ -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 <amigadave@amigadave.com> - 42~rc1-1
- Update to 42.rc1
* Thu Jan 20 2022 David King <amigadave@amigadave.com> - 42~alpha2-1
- Update to 42.alpha2

View File

@ -1 +1 @@
SHA512 (gnome-text-editor-42.alpha2.tar.xz) = a63bd5136b9e3151369879ea0a5f5d43c87d1f31bff2cf0d0b8f41ef05a1b1b8bd1733ad6c0c38eb5b9617baccfbef6084ff4e1de74648fa37187fbce072d113
SHA512 (gnome-text-editor-42.rc1.tar.xz) = debebccceb4bbe2bfc87a1c1f0813b10fc0c565cc89c6b3a826daa0a3344c88b9f20135087335f61d7b736a8c8ada7e2f823795c1e6c8d3d03ac7325afd0a9ae