rpms/gnome-text-editor
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 42.alpha2

Browse Source
This commit is contained in:
David King 2022-01-20 09:27:23 +00:00
parent a4c96192b7
commit 76c5f1f335
4 changed files with 57 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1 +1,2 @@
/gnome-text-editor-41.1.tar.xz
/gnome-text-editor-42.alpha2.tar.xz

42
gnome-text-editor-42.alpha2-fix-gcc12-array-bounds.patch Normal file
View File

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

22
gnome-text-editor.spec
View File

@ -1,18 +1,20 @@
%global glib2_version 2.69
%global gtk4_version 4.3
%global gtksourceview_version 5.1.1
%global gtk4_version 4.4
%global gtksourceview_version 5.3.1
%global enchant_version 2.2.0
%global tarball_version %%(echo %{version} | tr '~' '.')
Name: gnome-text-editor
Version: 41.1
Release: 2%{?dist}
Version: 42~alpha2
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}/41/%{name}-%{tarball_version}.tar.xz
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}
@ -53,26 +55,28 @@ You can come back to your work even if you've never saved it to a file.
%check
appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/org.gnome.TextEditor.appdata.xml
appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.gnome.TextEditor.appdata.xml
desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.TextEditor.desktop
%files -f %{name}.lang
%doc README.md NEWS
%license COPYING
%dir %{_datadir}/help/C
%doc %{_datadir}/help/C/%{name}/
%{_bindir}/gnome-text-editor
%{_datadir}/appdata/org.gnome.TextEditor.appdata.xml
%{_metainfodir}/org.gnome.TextEditor.appdata.xml
%{_datadir}/applications/org.gnome.TextEditor.desktop
%dir %{_datadir}/dbus-1
%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}/icons/hicolor/*/*/*.svg
%changelog
* Thu Jan 20 2022 David King <amigadave@amigadave.com> - 42~alpha2-1
- Update to 42.alpha2
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 41.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

2
sources
View File

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