| 1 |
commit: 8970439d89d47dff5b6df87fd6173907797728d3 |
| 2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 17 19:14:23 2019 +0000 |
| 4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 17 19:15:23 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8970439d |
| 7 |
|
| 8 |
gnome-extra/gnome-contacts: fix build against libhandy-0.0.10+ |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/699090 |
| 11 |
Package-Manager: Portage-2.3.69, Repoman-2.3.12 |
| 12 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
| 13 |
|
| 14 |
.../files/3.32.1-libhandy-0.0.10-compat.patch | 30 ++++++++++++++++++++++ |
| 15 |
.../gnome-contacts/gnome-contacts-3.32.1.ebuild | 4 +++ |
| 16 |
2 files changed, 34 insertions(+) |
| 17 |
|
| 18 |
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 |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..00eff6c686f |
| 21 |
--- /dev/null |
| 22 |
+++ b/gnome-extra/gnome-contacts/files/3.32.1-libhandy-0.0.10-compat.patch |
| 23 |
@@ -0,0 +1,30 @@ |
| 24 |
+From c5eee38cd2556403a640a0a4c11d36cbf9a5a798 Mon Sep 17 00:00:00 2001 |
| 25 |
+From: Niels De Graef <nielsdegraef@×××××.com> |
| 26 |
+Date: Thu, 30 May 2019 14:30:54 +0200 |
| 27 |
+Subject: [PATCH] window: Disambiguate Gtk.HeaderBar |
| 28 |
+ |
| 29 |
+Apparently libhandy also added a HeaderBar type, which means this |
| 30 |
+clashes with that of Gtk. |
| 31 |
+--- |
| 32 |
+ src/contacts-window.vala | 4 ++-- |
| 33 |
+ 1 file changed, 2 insertions(+), 2 deletions(-) |
| 34 |
+ |
| 35 |
+diff --git a/src/contacts-window.vala b/src/contacts-window.vala |
| 36 |
+index 738228d..49f6995 100644 |
| 37 |
+--- a/src/contacts-window.vala |
| 38 |
++++ b/src/contacts-window.vala |
| 39 |
+@@ -35,9 +35,9 @@ public class Contacts.Window : Gtk.ApplicationWindow { |
| 40 |
+ [GtkChild] |
| 41 |
+ private TitleBar titlebar; |
| 42 |
+ [GtkChild] |
| 43 |
+- private HeaderBar left_header; |
| 44 |
++ private Gtk.HeaderBar left_header; |
| 45 |
+ [GtkChild] |
| 46 |
+- private HeaderBar right_header; |
| 47 |
++ private Gtk.HeaderBar right_header; |
| 48 |
+ [GtkChild] |
| 49 |
+ private Overlay notification_overlay; |
| 50 |
+ [GtkChild] |
| 51 |
+-- |
| 52 |
+2.20.1 |
| 53 |
+ |
| 54 |
|
| 55 |
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.32.1.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.32.1.ebuild |
| 56 |
index 371567b764d..4cb92176461 100644 |
| 57 |
--- a/gnome-extra/gnome-contacts/gnome-contacts-3.32.1.ebuild |
| 58 |
+++ b/gnome-extra/gnome-contacts/gnome-contacts-3.32.1.ebuild |
| 59 |
@@ -46,6 +46,10 @@ DEPEND="${RDEPEND} |
| 60 |
virtual/pkgconfig |
| 61 |
" |
| 62 |
|
| 63 |
+PATCHES=( |
| 64 |
+ "${FILESDIR}"/${PV}-libhandy-0.0.10-compat.patch # compatibility with libhandy-0.0.10+ |
| 65 |
+) |
| 66 |
+ |
| 67 |
src_prepare() { |
| 68 |
xdg_src_prepare |
| 69 |
vala_src_prepare |
Archives