commit: b0ba3455ec7c0e409a6bb22ea2941684375204f6 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> AuthorDate: Tue Jan 8 09:31:43 2019 +0000 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> CommitDate: Tue Jan 8 09:35:05 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0ba3455
gnome-base/libgnomekbd: fix build against glib-2.59.0 Pre-emptively apply patch for glib-2.60 compatibility, as it's tiny and safe and doesn't need revbump. Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> .../files/3.26.0-glib-2.60-compat.patch | 35 ++++++++++++++++++++++ gnome-base/libgnomekbd/libgnomekbd-3.26.0.ebuild | 6 +++- 2 files changed, 40 insertions(+), 1 deletion(-) 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 new file mode 100644 index 00000000000..c6bcf66160f --- /dev/null +++ b/gnome-base/libgnomekbd/files/3.26.0-glib-2.60-compat.patch @@ -0,0 +1,35 @@ +From 7e0b6f0a96477c5d12434231ea413d3a16658ed0 Mon Sep 17 00:00:00 2001 +From: Abderrahim Kitouni <[email protected]> +Date: Tue, 18 Dec 2018 10:54:06 +0100 +Subject: [PATCH] rename g_strv_equal to gkbd_strv_equal + +it conflicts with the newly added g_strv_equal in glib +--- + libgnomekbd/gkbd-keyboard-config.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libgnomekbd/gkbd-keyboard-config.c b/libgnomekbd/gkbd-keyboard-config.c +index bbe6904..00dc429 100644 +--- a/libgnomekbd/gkbd-keyboard-config.c ++++ b/libgnomekbd/gkbd-keyboard-config.c +@@ -52,7 +52,7 @@ const gchar *GKBD_KEYBOARD_CONFIG_ACTIVE[] = { + */ + + static gboolean +-g_strv_equal (gchar ** l1, gchar ** l2) ++gkbd_strv_equal (gchar ** l1, gchar ** l2) + { + if (l1 == l2) + return TRUE; +@@ -555,7 +555,7 @@ gkbd_keyboard_config_equals (GkbdKeyboardConfig * kbd_config1, + (kbd_config2->model != NULL) && + g_ascii_strcasecmp (kbd_config1->model, kbd_config2->model)) + return False; +- if (!g_strv_equal (kbd_config1->layouts_variants, ++ if (!gkbd_strv_equal (kbd_config1->layouts_variants, + kbd_config2->layouts_variants)) + return False; + +-- +2.17.0 + diff --git a/gnome-base/libgnomekbd/libgnomekbd-3.26.0.ebuild b/gnome-base/libgnomekbd/libgnomekbd-3.26.0.ebuild index 9bc10e4ce68..d07c943fef6 100644 --- a/gnome-base/libgnomekbd/libgnomekbd-3.26.0.ebuild +++ b/gnome-base/libgnomekbd/libgnomekbd-3.26.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -26,6 +26,10 @@ DEPEND="${RDEPEND} virtual/pkgconfig " +PATCHES=( + "${FILESDIR}"/${PV}-glib-2.60-compat.patch +) + src_configure() { gnome2_src_configure \ --disable-static \
