diff options
Diffstat (limited to 'gnome-extra/gnome-contacts')
-rw-r--r-- | gnome-extra/gnome-contacts/Manifest | 7 | ||||
-rw-r--r-- | gnome-extra/gnome-contacts/files/3.36.2-fix-telepathy.patch | 71 | ||||
-rw-r--r-- | gnome-extra/gnome-contacts/gnome-contacts-3.38.1.ebuild | 2 | ||||
-rw-r--r-- | gnome-extra/gnome-contacts/gnome-contacts-40.0.ebuild (renamed from gnome-extra/gnome-contacts/gnome-contacts-3.36.2.ebuild) | 23 |
4 files changed, 14 insertions, 89 deletions
diff --git a/gnome-extra/gnome-contacts/Manifest b/gnome-extra/gnome-contacts/Manifest index 0c2f76a44b5c..1bcd2a2fbb2a 100644 --- a/gnome-extra/gnome-contacts/Manifest +++ b/gnome-extra/gnome-contacts/Manifest @@ -1,6 +1,5 @@ -AUX 3.36.2-fix-telepathy.patch 2839 BLAKE2B 42e48203bb17cab1940d12169e39703c85dcd368a9c296b4771d9128f9f98d2a6b10305ab745139bfe94c3088129c1fd985a4bd5fe3950c2196f054b6d4beb34 SHA512 112872143b270507465f1a203973bc5a7e1987a40cd45a67ee62b8aa88eb94fba9d803c77cc289d24c15d4a20e307588e6078f243a0c754fa961a85330e2a3b2 -DIST gnome-contacts-3.36.2.tar.xz 635932 BLAKE2B 9bcdf093d99477d1162c9ea78007e65cf20a1e4038fe284fafa4c174ab1d1d0c2ceb7ec2806c9abeed1c8ab168549c80b2763e65ece22c76a9044781eef8ed5d SHA512 ebbce67aa5c0af55559230c558c5f28b065182d434582431595bffedc25dd0ec3caa44e60f4670b4b2a1f784e90c8dd4f56df937054697b4ea932a39da78f1c1 DIST gnome-contacts-3.38.1.tar.xz 657376 BLAKE2B 5c042566ad99be1bda454466dcc2a42d6494cfbfb5a9f60eb0fa718a8d9bcbb986798ec48a87d5d322989b22d0fac2eee69df852ae39ba8a228ad91f50247c30 SHA512 bc2ed06d491c4773b9cedb2c51dc390a95d0271cf22d54864f5da4d892f80efece3cbdc1b90b4497f730039c8c83065b2a0ca590cecec579f011dd324ff8f134 -EBUILD gnome-contacts-3.36.2.ebuild 1717 BLAKE2B 402bae46c48b40440e11e99c2e0b68bf25251fbcb41bb806dc90c2adbe7d4629c0851c2c59598b59b7fee257b3d52a46c2811d4c2b6d7832c9c8315d588e0a31 SHA512 01e1837785076273e06eb275aa63714daa23b7cf43f5a7ea49448aaafd8f76db12c05b4be8832557ed025620dc4689758844ed679a183a7566c2d221169aaf93 -EBUILD gnome-contacts-3.38.1.ebuild 1639 BLAKE2B 4b1b9101c79906b0855ec59a69fde55d3cc30c6b934be909a93ce948655e6edb0762ea70ccdc48b103894f36fdcfced37a9cc19d4439e14aaf20d2d27f599758 SHA512 be35de3c7a722bb6a2dea1599c67fce4dcfe6bc5706292a7f5ce292cb89ca27b912469283b8f79b69ede0149f33e70ccc08786ce0ee2be78bbc8153735e24bb0 +DIST gnome-contacts-40.0.tar.xz 270412 BLAKE2B 4d7970ac5417dfbd9b0acf51efd8ce1310cee51f90de8d8afa0239d918269642869e35befb64cbfb5acf1bde17ac738192d5ef802d27df47936165b03ed20b51 SHA512 5f9bb7e805cc67a379fd1ab5945774f5067be64d6577bc9cf0514c4ca6b53937555dc96591244d8be418b2b07f7c5401e8186dca5baff3a2b6c5a2ae459a676f +EBUILD gnome-contacts-3.38.1.ebuild 1638 BLAKE2B 13ecf49290a796cbf04b66c01b702a311543f82c53021444088a51517bf8ba399eac9792e549f25e68f3acf480790271a029cade29f940ce418070f26af4fe4b SHA512 a83e01f87b803a5e258d449b6fcf01591e79560180355d8f89b490e270095cd44a676ab6eaba45fa63e8429ad3012cd786c8b484be6dcd67bab2baa9bd7002ae +EBUILD gnome-contacts-40.0.ebuild 1703 BLAKE2B fe91ca45d0e6e629eb77f802f880ae0e74bc5a3b5e6c5d2787ad2f18060a1c78ead87143ad0728c3a75b8cca9623f07fe9810edc0a47a74e48e88246f5b04494 SHA512 81747627e73d7da2c7c8c3da6a5ab82def82d67af5adbf5ed9a2a74118e67dc6276291c4d28264e5efb9dac11769de972d710e6b5002fb4e1815dca395d1f0e8 MISC metadata.xml 325 BLAKE2B f00835a4dbd2fafbc578f1d36cd3101da6ccbd9236b6a874c862f6e584fe856c7fc1585e0d9da7c3c6a243cc1ea271fc281a127c2f330ba91495873baea0ac6b SHA512 5c6da9fcb4666a80a2fcdaeaa0263feee21140932084683dec7257bbb9e686a08d7d2b476684800216c13f3c851a92416267d5415c25643200250edd8d6041f5 diff --git a/gnome-extra/gnome-contacts/files/3.36.2-fix-telepathy.patch b/gnome-extra/gnome-contacts/files/3.36.2-fix-telepathy.patch deleted file mode 100644 index 07d4e7783634..000000000000 --- a/gnome-extra/gnome-contacts/files/3.36.2-fix-telepathy.patch +++ /dev/null @@ -1,71 +0,0 @@ -From cbcb28f91f2c5dab9300ded79dc8e246a7ae0f36 Mon Sep 17 00:00:00 2001 -From: Niels De Graef <nielsdegraef@gmail.com> -Date: Sat, 7 Nov 2020 12:01:59 +0100 -Subject: [PATCH] Fix build when -Dtelepathy=true - ---- - src/contacts-contact-list.vala | 2 +- - src/contacts-contact-sheet.vala | 4 +++- - src/contacts-utils.vala | 4 ++-- - 3 files changed, 6 insertions(+), 4 deletions(-) - -diff --git a/src/contacts-contact-list.vala b/src/contacts-contact-list.vala -index aa3cd33..b371644 100644 ---- a/src/contacts-contact-list.vala -+++ b/src/contacts-contact-list.vala -@@ -243,7 +243,7 @@ public class Contacts.ContactList : ListBox { - selection_changed (individual); - #if HAVE_TELEPATHY - if (individual != null) -- Contact.fetch_contact_info (individual); -+ Utils.fetch_contact_info (individual); - #endif - } - -diff --git a/src/contacts-contact-sheet.vala b/src/contacts-contact-sheet.vala -index b6c2249..669e771 100644 ---- a/src/contacts-contact-sheet.vala -+++ b/src/contacts-contact-sheet.vala -@@ -27,6 +27,7 @@ using Gee; - public class Contacts.ContactSheet : Grid { - private int last_row = 0; - private Individual individual; -+ private unowned Store store; - public bool narrow { get; set; default = true; } - - private const string[] SORTED_PROPERTIES = { -@@ -43,6 +44,7 @@ public class Contacts.ContactSheet : Grid { - public ContactSheet (Individual individual, Store store) { - Object (row_spacing: 12, column_spacing: 12); - this.individual = individual; -+ this.store = store; - - this.individual.notify.connect (update); - this.individual.personas_changed.connect (update); -@@ -242,7 +244,7 @@ public class Contacts.ContactSheet : Grid { - var type = im_persona.presence_type; - if (type != PresenceType.UNSET && type != PresenceType.ERROR && - type != PresenceType.OFFLINE && type != PresenceType.UNKNOWN) { -- Utils.start_chat (this.contact, protocol, id.value); -+ Utils.start_chat (this.individual, protocol, id.value); - } - } - }); -diff --git a/src/contacts-utils.vala b/src/contacts-utils.vala -index 879c4a9..8f3b8c1 100644 ---- a/src/contacts-utils.vala -+++ b/src/contacts-utils.vala -@@ -80,8 +80,8 @@ namespace Contacts.Utils { - } - - #if HAVE_TELEPATHY -- public void start_chat (Contact contact, string protocol, string id) { -- var im_persona = contact.find_im_persona (protocol, id); -+ public void start_chat (Individual individual, string protocol, string id) { -+ var im_persona = Utils.find_im_persona (individual, protocol, id); - var account = (im_persona.store as Tpf.PersonaStore).account; - var request_dict = new HashTable<string, Value?>(str_hash, str_equal); - request_dict.insert (TelepathyGLib.PROP_CHANNEL_CHANNEL_TYPE, --- -2.27.0 - diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.38.1.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.38.1.ebuild index 9fed36ffff08..3a32c93b4bec 100644 --- a/gnome-extra/gnome-contacts/gnome-contacts-3.38.1.ebuild +++ b/gnome-extra/gnome-contacts/gnome-contacts-3.38.1.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts" LICENSE="GPL-2+" SLOT="0" IUSE="telepathy v4l" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sparc x86" VALA_DEPEND=" $(vala_depend) diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.36.2.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-40.0.ebuild index 372d51f30729..7cf6f2b6d3a1 100644 --- a/gnome-extra/gnome-contacts/gnome-contacts-3.36.2.ebuild +++ b/gnome-extra/gnome-contacts/gnome-contacts-40.0.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +PYTHON_COMPAT=( python3_{7..9} ) VALA_MIN_API_VERSION="0.40" -VALA_MAX_API_VERSION="0.48" -inherit gnome.org gnome2-utils meson vala xdg +inherit gnome.org gnome2-utils meson python-any-r1 vala xdg DESCRIPTION="GNOME contact management application" HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts" @@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts" LICENSE="GPL-2+" SLOT="0" IUSE="telepathy v4l" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sparc x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86" VALA_DEPEND=" $(vala_depend) @@ -22,23 +22,24 @@ VALA_DEPEND=" net-libs/gnome-online-accounts[vala] gnome-extra/evolution-data-server[gtk,vala] telepathy? ( net-libs/telepathy-glib[vala] ) - gui-libs/libhandy:0.0[vala] + >=gui-libs/libhandy-1.1.0:1[vala] " # Configure is wrong; it needs cheese-3.5.91, not 3.3.91 RDEPEND=" - >=gnome-extra/evolution-data-server-3.13.90:=[gnome-online-accounts] + >=gnome-extra/evolution-data-server-3.30:=[gnome-online-accounts] >=dev-libs/folks-0.11.4:=[eds,telepathy?] - >=dev-libs/glib-2.44:2 + >=dev-libs/glib-2.58:2 >=dev-libs/libgee-0.10:0.8 >=gnome-base/gnome-desktop-3.0:3= net-libs/gnome-online-accounts:= >=x11-libs/gtk+-3.23.1:3 v4l? ( >=media-video/cheese-3.5.91:= ) telepathy? ( >=net-libs/telepathy-glib-0.22 ) - >=gui-libs/libhandy-0.0.12:0.0= + >=gui-libs/libhandy-1.0.0:1 " DEPEND="${RDEPEND}" BDEPEND=" + ${PYTHON_DEPS} ${VALA_DEPEND} app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets @@ -49,10 +50,6 @@ BDEPEND=" virtual/pkgconfig " -PATCHES=( - "${FILESDIR}"/${PV}-fix-telepathy.patch -) - src_prepare() { xdg_src_prepare vala_src_prepare @@ -60,7 +57,7 @@ src_prepare() { src_configure() { local emesonargs=( - $(meson_use v4l cheese) + $(meson_feature v4l cheese) $(meson_use telepathy) -Dmanpage=true -Ddocs=false |