commit: cb275ae0ac7fdeb6ed8eac7e40fc6684334c9872 Author: Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org> AuthorDate: Fri Feb 9 15:55:17 2018 +0000 Commit: Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org> CommitDate: Fri Feb 9 15:55:17 2018 +0000 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=cb275ae0
gnome-extra/gnome-contacts: bump Package-Manager: Portage-2.3.23, Repoman-2.3.6 Manifest-Sign-Key: 0x7DF238CF0AA182E1 .../files/3.22.1-fix-vala-0.35-part1.patch | 29 +++++++++ .../files/3.22.1-fix-vala-0.35-part2.patch | 50 ++++++++++++++++ .../gnome-contacts/gnome-contacts-3.26.ebuild | 70 ++++++++++++++++++++++ 3 files changed, 149 insertions(+) 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 00000000..b9634e6f --- /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 <[email protected]> +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 00000000..4cfe861f --- /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 <[email protected]> +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 + diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.26.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.26.ebuild new file mode 100644 index 00000000..943d7aea --- /dev/null +++ b/gnome-extra/gnome-contacts/gnome-contacts-3.26.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +VALA_USE_DEPEND="vapigen" +VALA_MIN_API_VERSION="0.24" + +inherit gnome-meson vala + +DESCRIPTION="GNOME contact management application" +HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts"; + +LICENSE="GPL-2+" +SLOT="0" +IUSE="v4l" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +VALA_DEPEND=" + $(vala_depend) + >=dev-libs/gobject-introspection-0.9.6:= + dev-libs/folks[vala(+)] + gnome-base/gnome-desktop:3=[introspection] + gnome-extra/evolution-data-server[vala] + net-libs/telepathy-glib[vala] +" +# Configure is wrong; it needs cheese-3.5.91, not 3.3.91 +# folks-0.11.4 to avoid build issues with vala-0.36, upstream 7a9001b056b4fb1d00375e7b2adeda9b7cf93c90 +RDEPEND=" + >=dev-libs/folks-0.11.4:=[eds,telepathy] + >=dev-libs/glib-2.44:2 + >=dev-libs/libgee-0.10:0.8 + >=gnome-extra/evolution-data-server-3.13.90:=[gnome-online-accounts] + >=gnome-base/gnome-desktop-3.0:3= + media-libs/clutter:1.0 + media-libs/clutter-gtk:1.0 + media-libs/libchamplain:0.12 + net-libs/gnome-online-accounts:=[vala] + >=net-libs/telepathy-glib-0.22 + >=sci-geosciences/geocode-glib-3.15.3 + x11-libs/cairo:= + x11-libs/gdk-pixbuf:2 + >=x11-libs/gtk+-3.22:3 + x11-libs/pango + v4l? ( >=media-video/cheese-3.5.91:= ) +" +DEPEND="${RDEPEND} + ${VALA_DEPEND} + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + >=dev-util/intltool-0.40 + >=sys-devel/gettext-0.17 + virtual/pkgconfig +" + +src_prepare() { + # Regenerate the pre-generated C sources, bug #471628 + if ! use v4l; then + touch src/*.vala + fi + + vala_src_prepare + gnome-meson_src_prepare +} + +src_configure() { + gnome-meson_src_configure \ + -Dwith-manpage=true \ + $(meson_use v4l with-cheese) +}
