diff options
| author |   Mart Raudsepp <leio@gentoo.org> | 2019-11-17 21:14:23 +0200 |
|---|---|---|
| committer | Mart Raudsepp <leio@gentoo.org> | 2019-11-17 21:15:23 +0200 |
| commit | 8970439d89d47dff5b6df87fd6173907797728d3 (patch) | |
| tree | 0a21b28c4a4bb4df6383f6f6964bd31ccaa693c4 /gnome-extra/gnome-contacts | |
| parent | app-office/abiword: Add upstream patch for C++ template use (diff) | |
| download | gentoo-8970439d89d47dff5b6df87fd6173907797728d3.tar.gz gentoo-8970439d89d47dff5b6df87fd6173907797728d3.tar.bz2 gentoo-8970439d89d47dff5b6df87fd6173907797728d3.zip | |
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>
Diffstat (limited to 'gnome-extra/gnome-contacts')
| -rw-r--r-- | gnome-extra/gnome-contacts/files/3.32.1-libhandy-0.0.10-compat.patch | 30 | ||||
| -rw-r--r-- | gnome-extra/gnome-contacts/gnome-contacts-3.32.1.ebuild | 4 |
2 files changed, 34 insertions, 0 deletions
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 |