gentoo resync : 18.11.2019

3 files changed, 36 insertions, 1 deletions

diff --git a/gnome-extra/gnome-contacts/Manifest b/gnome-extra/gnome-contacts/Manifest
index fa7acdb73e78..1a6876a6e9f9 100644
--- a/gnome-extra/gnome-contacts/Manifest
+++ b/gnome-extra/gnome-contacts/Manifest
@@ -1,5 +1,6 @@
+AUX 3.32.1-libhandy-0.0.10-compat.patch 918 BLAKE2B 53fceb62485c109623815a4087743a4e56c7ebba53ca780a67e8bd2d7e645efe7ec42cf45a38dd32fc042fa463d033bed796ca96d0a246d4eb8c4f5d9a88a6a4 SHA512 4f77e953b7ccd818f0347d470690a92906b045c4de129428db6a4fa211882d7e9f6e8956ec65a7ae66e9190551fe36ceb64476e62ab91e6755b93cca1b88f02d
 DIST gnome-contacts-3.30.2.tar.xz 368476 BLAKE2B 502170e327eb63a6d026af94a09949f6b973dba0c59079a23c7f37dfde2a391ffa13d905452741c403ada8e6f1101f7a5620ad9b59eb4c5341e96d357d8fe99b SHA512 cf6ab33ef6147bceb5a4681b83830828fd4caa47d83fa9f71e01db3caf710f7f09fe60d2956565a2b9bd124356e100b31d6372ac4d4d231718230915a135e79d
 DIST gnome-contacts-3.32.1.tar.xz 358800 BLAKE2B a3cdc58948b994868a18e74dd2ab1a1ffea04b84da95347f19b79b49a7eb9363589e08e11e8fa2f588c5833592be3149ea435b6036a376d4c9e1477d0d308e96 SHA512 25fc4835c61bd5f195512fd304955058e1178cbafaff09a6bbfffc58840876f514ebc3119247925266a9c10f8fc452511a055d84aa1e815571188aba7212fe71
 EBUILD gnome-contacts-3.30.2.ebuild 1535 BLAKE2B 83ec57595fce94b72e7b27698b1b61741fe7d4d146d1d1e0b46db1d135f495c82f4bb42d19a35889e8cbf2a155f1c27415b860eb9598d8e6f4c4695d257ccdac SHA512 361f2b124cff1fab69565045246465c69191003911bae74e33ddf46b362c9eb8e9d108a35d9e13fed41f149fdac9b4964792e2814ccccd13eba44aaff2821582
-EBUILD gnome-contacts-3.32.1.ebuild 1573 BLAKE2B ba7edefaddc0000ea402c4c5beadff68f2a1c9d8dd733421e8622dd346c46af97fb97987ed269041773e99112465d72e610980a06cfc79bbeb1c13331f5a8f2d SHA512 a8c9d51d203d04b335eb3dfbb3b03ed9d4c3ba6d6c1bf18159dc3652d238a09ebf03e1459fe099b60a972bdaadbd3874a8fe8b336c77ebcf713cbe201b5dad16
+EBUILD gnome-contacts-3.32.1.ebuild 1674 BLAKE2B 74ab5e27d47ea95f64df9f43cc4f0242e43f56b0786c97e602c596ef90d8d22a7ccd407f43245135b9449a38cb9207e788acfdb15fdc6cd19602b3595047fef7 SHA512 747e5d47f91929e5922f48ca8d9367d53616f1d3f1a0ce9ac9156584e27c0e0ce3731d9bcc6d50f9c2fbc52c35a6cfff5eeddd59e57be6c42f3ac15d5c6f882f
 MISC metadata.xml 325 BLAKE2B f00835a4dbd2fafbc578f1d36cd3101da6ccbd9236b6a874c862f6e584fe856c7fc1585e0d9da7c3c6a243cc1ea271fc281a127c2f330ba91495873baea0ac6b SHA512 5c6da9fcb4666a80a2fcdaeaa0263feee21140932084683dec7257bbb9e686a08d7d2b476684800216c13f3c851a92416267d5415c25643200250edd8d6041f5
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 000000000000..00eff6c686f2
--- /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 <nielsdegraef@gmail.com>
+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 371567b764df..4cb92176461c 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