[gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-contacts/files/, gnome-extra/gnome-contacts/
commit: 3a4227497860654f320ebfd6925846e6a21608d4
Author: Mart Raudsepp gentoo org>
AuthorDate: Sat Dec 19 11:50:50 2020 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Sat Dec 19 11:53:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a422749
gnome-extra/gnome-contacts: fix build with USE=telepathy
Also require at least vala-0.40, as compilation fails with 0.36.
gnome-contacts-3.38 adds a meson check for >=vala-0.40.10 too.
Closes: https://bugs.gentoo.org/732540
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Mart Raudsepp gentoo.org>
.../files/3.36.2-fix-telepathy.patch | 71 ++
.../gnome-contacts/gnome-contacts-3.36.2.ebuild| 5 ++
2 files changed, 76 insertions(+)
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
new file mode 100644
index 000..07d4e778363
--- /dev/null
+++ b/gnome-extra/gnome-contacts/files/3.36.2-fix-telepathy.patch
@@ -0,0 +1,71 @@
+From cbcb28f91f2c5dab9300ded79dc8e246a7ae0f36 Mon Sep 17 00:00:00 2001
+From: Niels De Graef
+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(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.36.2.ebuild
b/gnome-extra/gnome-contacts/gnome-contacts-3.36.2.ebuild
index 669b2a1ab43..372d51f3072 100644
--- a/gnome-extra/gnome-contacts/gnome-contacts-3.36.2.ebuild
+++ b/gnome-extra/gnome-contacts/gnome-contacts-3.36.2.ebuild
@@ -2,6 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+VALA_MIN_API_VERSION="0.40"
VALA_MAX_API_VERSION="0.48"
inherit gnome.org gnome2-utils meson vala xdg
@@ -48,6 +49,10 @@ BDEPEND="
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}"/${PV}-fix-telepathy.patch
+)
+
src_prepare() {
xdg_src_prepare
vala_src_prepare
[gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-contacts/files/, gnome-extra/gnome-contacts/
commit: 8970439d89d47dff5b6df87fd6173907797728d3
Author: Mart Raudsepp gentoo org>
AuthorDate: Sun Nov 17 19:14:23 2019 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Sun Nov 17 19:15:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8970439d
gnome-extra/gnome-contacts: fix build against libhandy-0.0.10+
Closes: https://bugs.gentoo.org/699090
Package-Manager: Portage-2.3.69, Repoman-2.3.12
Signed-off-by: Mart Raudsepp gentoo.org>
.../files/3.32.1-libhandy-0.0.10-compat.patch | 30 ++
.../gnome-contacts/gnome-contacts-3.32.1.ebuild| 4 +++
2 files changed, 34 insertions(+)
diff --git
a/gnome-extra/gnome-contacts/files/3.32.1-libhandy-0.0.10-compat.patch
b/gnome-extra/gnome-contacts/files/3.32.1-libhandy-0.0.10-compat.patch
new file mode 100644
index 000..00eff6c686f
--- /dev/null
+++ b/gnome-extra/gnome-contacts/files/3.32.1-libhandy-0.0.10-compat.patch
@@ -0,0 +1,30 @@
+From c5eee38cd2556403a640a0a4c11d36cbf9a5a798 Mon Sep 17 00:00:00 2001
+From: Niels De Graef
+Date: Thu, 30 May 2019 14:30:54 +0200
+Subject: [PATCH] window: Disambiguate Gtk.HeaderBar
+
+Apparently libhandy also added a HeaderBar type, which means this
+clashes with that of Gtk.
+---
+ src/contacts-window.vala | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/contacts-window.vala b/src/contacts-window.vala
+index 738228d..49f6995 100644
+--- a/src/contacts-window.vala
b/src/contacts-window.vala
+@@ -35,9 +35,9 @@ public class Contacts.Window : Gtk.ApplicationWindow {
+ [GtkChild]
+ private TitleBar titlebar;
+ [GtkChild]
+- private HeaderBar left_header;
++ private Gtk.HeaderBar left_header;
+ [GtkChild]
+- private HeaderBar right_header;
++ private Gtk.HeaderBar right_header;
+ [GtkChild]
+ private Overlay notification_overlay;
+ [GtkChild]
+--
+2.20.1
+
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.32.1.ebuild
b/gnome-extra/gnome-contacts/gnome-contacts-3.32.1.ebuild
index 371567b764d..4cb92176461 100644
--- a/gnome-extra/gnome-contacts/gnome-contacts-3.32.1.ebuild
+++ b/gnome-extra/gnome-contacts/gnome-contacts-3.32.1.ebuild
@@ -46,6 +46,10 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}"/${PV}-libhandy-0.0.10-compat.patch # compatibility with
libhandy-0.0.10+
+)
+
src_prepare() {
xdg_src_prepare
vala_src_prepare
[gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-contacts/files/, gnome-extra/gnome-contacts/
commit: a09c5996beb528998b6ab704fbef8f6032021cc4
Author: Mart Raudsepp gentoo org>
AuthorDate: Sat May 18 20:52:32 2019 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Sat May 18 21:23:52 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a09c5996
gnome-extra/gnome-contacts: remove old
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Mart Raudsepp gentoo.org>
gnome-extra/gnome-contacts/Manifest| 1 -
.../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.22.1-r1.ebuild | 75 --
4 files changed, 155 deletions(-)
diff --git a/gnome-extra/gnome-contacts/Manifest
b/gnome-extra/gnome-contacts/Manifest
index fc4ea711021..e50b19e4bad 100644
--- a/gnome-extra/gnome-contacts/Manifest
+++ b/gnome-extra/gnome-contacts/Manifest
@@ -1,2 +1 @@
-DIST gnome-contacts-3.22.1.tar.xz 788820 BLAKE2B
8f620334dd380e8cb690f7b71d3a99a921f5814ab230690a60be6022150db7a6a0f74e426e72d8d027eb5280e1b6bfd04fa7b0b030519bb19e4718ca0c9f2120
SHA512
d93ed6c65ffdabe1925cc795b88ff374fe69e03fcd36af7c2fc67a5236b90ab6af4bd269b6fc3b344fcd6b4688d866628b8b090bb62de95f8bd0c2e40c26a107
DIST gnome-contacts-3.30.2.tar.xz 368476 BLAKE2B
502170e327eb63a6d026af94a09949f6b973dba0c59079a23c7f37dfde2a391ffa13d905452741c403ada8e6f1101f7a5620ad9b59eb4c5341e96d357d8fe99b
SHA512
cf6ab33ef6147bceb5a4681b83830828fd4caa47d83fa9f71e01db3caf710f7f09fe60d2956565a2b9bd124356e100b31d6372ac4d4d231718230915a135e79d
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
deleted file mode 100644
index b9634e6fc04..000
--- a/gnome-extra/gnome-contacts/files/3.22.1-fix-vala-0.35-part1.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 2ba6e380dd8a3575bd8f4d4e5d8d3883003e9f54 Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz
-Date: Sat, 1 Oct 2016 14:27:55 +0200
-Subject: [PATCH] Don't restrict RowData.details to the generic type "string"
-
-This allows AbstractFieldDetails 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 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
deleted file mode 100644
index 4cfe861fa50..000
--- a/gnome-extra/gnome-contacts/files/3.22.1-fix-vala-0.35-part2.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From b96b0fc07c49724f252a5cd35f2d028f91529068 Mon Sep 17 00:00:00 2001
-From: Jeena
-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 {
-
