diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /gnome-extra/gnome-contacts/files |
reinit the tree, so we can have metadata
Diffstat (limited to 'gnome-extra/gnome-contacts/files')
-rw-r--r-- | gnome-extra/gnome-contacts/files/3.22.1-fix-vala-0.35-part1.patch | 29 | ||||
-rw-r--r-- | gnome-extra/gnome-contacts/files/3.22.1-fix-vala-0.35-part2.patch | 50 |
2 files changed, 79 insertions, 0 deletions
diff --git a/gnome-extra/gnome-contacts/files/3.22.1-fix-vala-0.35-part1.patch b/gnome-extra/gnome-contacts/files/3.22.1-fix-vala-0.35-part1.patch new file mode 100644 index 000000000000..b9634e6fc041 --- /dev/null +++ b/gnome-extra/gnome-contacts/files/3.22.1-fix-vala-0.35-part1.patch @@ -0,0 +1,29 @@ +From 2ba6e380dd8a3575bd8f4d4e5d8d3883003e9f54 Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz <ricotz@ubuntu.com> +Date: Sat, 1 Oct 2016 14:27:55 +0200 +Subject: [PATCH] Don't restrict RowData.details to the generic type "string" + +This allows AbstractFieldDetails<G> based values to be assigned, +like PostalAddressFieldDetails. + +Fixes a build-failure with vala 0.35+ due to stricter type-checking. +--- + src/contacts-contact-editor.vala | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/contacts-contact-editor.vala b/src/contacts-contact-editor.vala +index 3372f87..3978887 100644 +--- a/src/contacts-contact-editor.vala ++++ b/src/contacts-contact-editor.vala +@@ -77,7 +77,7 @@ public class Contacts.ContactEditor : Grid { + } + + struct RowData { +- AbstractFieldDetails<string> details; ++ AbstractFieldDetails details; + } + + struct Field { +-- +2.14.1 + diff --git a/gnome-extra/gnome-contacts/files/3.22.1-fix-vala-0.35-part2.patch b/gnome-extra/gnome-contacts/files/3.22.1-fix-vala-0.35-part2.patch new file mode 100644 index 000000000000..4cfe861fa509 --- /dev/null +++ b/gnome-extra/gnome-contacts/files/3.22.1-fix-vala-0.35-part2.patch @@ -0,0 +1,50 @@ +From b96b0fc07c49724f252a5cd35f2d028f91529068 Mon Sep 17 00:00:00 2001 +From: Jeena <hello@jeena.net> +Date: Tue, 15 Aug 2017 16:53:05 +0200 +Subject: [PATCH] Drop unnecessary format-string. + +Code got refactored in 3.25/master but it boils down to dropping this +extra parameter. +--- + src/contacts-contact-pane.vala | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/src/contacts-contact-pane.vala b/src/contacts-contact-pane.vala +index 8e100f2..fce832b 100644 +--- a/src/contacts-contact-pane.vala ++++ b/src/contacts-contact-pane.vala +@@ -451,7 +451,6 @@ public class Contacts.ContactPane : Notebook { + DialogFlags.MODAL, + MessageType.ERROR, + ButtonsType.OK, +- "%s", + _("You need to enter some data")); + dialog.show (); + dialog.response.connect ( () => { +@@ -463,7 +462,6 @@ public class Contacts.ContactPane : Notebook { + DialogFlags.MODAL, + MessageType.ERROR, + ButtonsType.OK, +- "%s", + _("No primary addressbook configured")); + dialog.show (); + dialog.response.connect ( () => { +@@ -482,7 +480,6 @@ public class Contacts.ContactPane : Notebook { + DialogFlags.MODAL, + MessageType.ERROR, + ButtonsType.OK, +- "%s", + _("Unable to create new contacts: %s"), e.message); + } + +@@ -493,7 +490,6 @@ public class Contacts.ContactPane : Notebook { + DialogFlags.MODAL, + MessageType.ERROR, + ButtonsType.OK, +- "%s", + _("Unable to find newly created contact")); + } + +-- +2.14.1 + |