diff --git a/211.patch b/211.patch new file mode 100644 index 0000000..ae31493 --- /dev/null +++ b/211.patch @@ -0,0 +1,38 @@ +From 85554186e29ba1993afd5e430ff2dd74c6263345 Mon Sep 17 00:00:00 2001 +From: Niels De Graef +Date: Tue, 13 Sep 2022 19:42:02 +0000 +Subject: [PATCH] editor: make sure properties have null terminator + +We thought that Vala would properly know about a normal `string[]` and +null-terminated `string[]`, but apparently it doesn't. Worse, it seems +that on systems it knows how to deal with this, but not on other +systems where it just crashes. + +Fixes: https://gitlab.gnome.org/GNOME/gnome-contacts/-/issues/266 +--- + src/contacts-contact-editor.vala | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/contacts-contact-editor.vala b/src/contacts-contact-editor.vala +index 1cca90fd..f3f20f25 100644 +--- a/src/contacts-contact-editor.vala ++++ b/src/contacts-contact-editor.vala +@@ -168,6 +168,7 @@ public class Contacts.PersonaEditor : Gtk.Widget { + public const string[] IMPORTANT_PROPERTIES = { + "email-addresses", + "phone-numbers", ++ null + }; + + public const string[] SUPPORTED_PROPERTIES = { +@@ -181,6 +182,7 @@ public class Contacts.PersonaEditor : Gtk.Widget { + "postal-addresses", + "roles", + "urls", ++ null + }; + + construct { +-- +GitLab + diff --git a/gnome-contacts.spec b/gnome-contacts.spec index 4ac6653..87da48c 100644 --- a/gnome-contacts.spec +++ b/gnome-contacts.spec @@ -4,13 +4,17 @@ Name: gnome-contacts Version: 43~rc -Release: 2%{?dist} +Release: 3%{?dist} Summary: Contacts manager for GNOME License: GPLv2+ URL: https://wiki.gnome.org/Apps/Contacts Source0: https://download.gnome.org/sources/%{name}/43/%{name}-%{tarball_version}.tar.xz +# Backported from upstream +# https://gitlab.gnome.org/GNOME/gnome-contacts/-/merge_requests/211 +Patch: 211.patch + BuildRequires: desktop-file-utils BuildRequires: docbook-dtds BuildRequires: docbook-style-xsl @@ -69,6 +73,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/org.gnome.Contacts.d %changelog +* Wed Sep 14 2022 Kalev Lember - 43~rc-3 +- Backport upstream fix for a crash when editing contacts + * Tue Sep 13 2022 Kalev Lember - 43~rc-2 - Produce vala debug information