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 <leio@gentoo.org>

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 (file)
index 0000000..00eff6c
--- /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 371567b764df7ed203751cc0bf8c108af935e084..4cb92176461c40d7c364ebd11a3027202aba1d17 100644 (file)
--- 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