| 1 |
commit: b0ba3455ec7c0e409a6bb22ea2941684375204f6 |
| 2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 8 09:31:43 2019 +0000 |
| 4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 8 09:35:05 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0ba3455 |
| 7 |
|
| 8 |
gnome-base/libgnomekbd: fix build against glib-2.59.0 |
| 9 |
|
| 10 |
Pre-emptively apply patch for glib-2.60 compatibility, as it's tiny |
| 11 |
and safe and doesn't need revbump. |
| 12 |
|
| 13 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
| 14 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
| 15 |
|
| 16 |
.../files/3.26.0-glib-2.60-compat.patch | 35 ++++++++++++++++++++++ |
| 17 |
gnome-base/libgnomekbd/libgnomekbd-3.26.0.ebuild | 6 +++- |
| 18 |
2 files changed, 40 insertions(+), 1 deletion(-) |
| 19 |
|
| 20 |
diff --git a/gnome-base/libgnomekbd/files/3.26.0-glib-2.60-compat.patch b/gnome-base/libgnomekbd/files/3.26.0-glib-2.60-compat.patch |
| 21 |
new file mode 100644 |
| 22 |
index 00000000000..c6bcf66160f |
| 23 |
--- /dev/null |
| 24 |
+++ b/gnome-base/libgnomekbd/files/3.26.0-glib-2.60-compat.patch |
| 25 |
@@ -0,0 +1,35 @@ |
| 26 |
+From 7e0b6f0a96477c5d12434231ea413d3a16658ed0 Mon Sep 17 00:00:00 2001 |
| 27 |
+From: Abderrahim Kitouni <akitouni@×××××.org> |
| 28 |
+Date: Tue, 18 Dec 2018 10:54:06 +0100 |
| 29 |
+Subject: [PATCH] rename g_strv_equal to gkbd_strv_equal |
| 30 |
+ |
| 31 |
+it conflicts with the newly added g_strv_equal in glib |
| 32 |
+--- |
| 33 |
+ libgnomekbd/gkbd-keyboard-config.c | 4 ++-- |
| 34 |
+ 1 file changed, 2 insertions(+), 2 deletions(-) |
| 35 |
+ |
| 36 |
+diff --git a/libgnomekbd/gkbd-keyboard-config.c b/libgnomekbd/gkbd-keyboard-config.c |
| 37 |
+index bbe6904..00dc429 100644 |
| 38 |
+--- a/libgnomekbd/gkbd-keyboard-config.c |
| 39 |
++++ b/libgnomekbd/gkbd-keyboard-config.c |
| 40 |
+@@ -52,7 +52,7 @@ const gchar *GKBD_KEYBOARD_CONFIG_ACTIVE[] = { |
| 41 |
+ */ |
| 42 |
+ |
| 43 |
+ static gboolean |
| 44 |
+-g_strv_equal (gchar ** l1, gchar ** l2) |
| 45 |
++gkbd_strv_equal (gchar ** l1, gchar ** l2) |
| 46 |
+ { |
| 47 |
+ if (l1 == l2) |
| 48 |
+ return TRUE; |
| 49 |
+@@ -555,7 +555,7 @@ gkbd_keyboard_config_equals (GkbdKeyboardConfig * kbd_config1, |
| 50 |
+ (kbd_config2->model != NULL) && |
| 51 |
+ g_ascii_strcasecmp (kbd_config1->model, kbd_config2->model)) |
| 52 |
+ return False; |
| 53 |
+- if (!g_strv_equal (kbd_config1->layouts_variants, |
| 54 |
++ if (!gkbd_strv_equal (kbd_config1->layouts_variants, |
| 55 |
+ kbd_config2->layouts_variants)) |
| 56 |
+ return False; |
| 57 |
+ |
| 58 |
+-- |
| 59 |
+2.17.0 |
| 60 |
+ |
| 61 |
|
| 62 |
diff --git a/gnome-base/libgnomekbd/libgnomekbd-3.26.0.ebuild b/gnome-base/libgnomekbd/libgnomekbd-3.26.0.ebuild |
| 63 |
index 9bc10e4ce68..d07c943fef6 100644 |
| 64 |
--- a/gnome-base/libgnomekbd/libgnomekbd-3.26.0.ebuild |
| 65 |
+++ b/gnome-base/libgnomekbd/libgnomekbd-3.26.0.ebuild |
| 66 |
@@ -1,4 +1,4 @@ |
| 67 |
-# Copyright 1999-2018 Gentoo Authors |
| 68 |
+# Copyright 1999-2019 Gentoo Authors |
| 69 |
# Distributed under the terms of the GNU General Public License v2 |
| 70 |
|
| 71 |
EAPI=6 |
| 72 |
@@ -26,6 +26,10 @@ DEPEND="${RDEPEND} |
| 73 |
virtual/pkgconfig |
| 74 |
" |
| 75 |
|
| 76 |
+PATCHES=( |
| 77 |
+ "${FILESDIR}"/${PV}-glib-2.60-compat.patch |
| 78 |
+) |
| 79 |
+ |
| 80 |
src_configure() { |
| 81 |
gnome2_src_configure \ |
| 82 |
--disable-static \ |
Archives