Date: Mon, 25 Feb 2019 20:35:59 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r493897 - head/x11/libmatekbd/files Message-ID: <201902252035.x1PKZxAl089210@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kwm Date: Mon Feb 25 20:35:59 2019 New Revision: 493897 URL: https://svnweb.freebsd.org/changeset/ports/493897 Log: Add patch to fix the build with newer glib20. Obtained from: libmatekbd upstream Added: head/x11/libmatekbd/files/ head/x11/libmatekbd/files/patch-libmatekbd_matekbd-keyboard-config.c (contents, props changed) Added: head/x11/libmatekbd/files/patch-libmatekbd_matekbd-keyboard-config.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/libmatekbd/files/patch-libmatekbd_matekbd-keyboard-config.c Mon Feb 25 20:35:59 2019 (r493897) @@ -0,0 +1,31 @@ +From dc04e969dd61a2b1f82beae2d3c8ad105447812d Mon Sep 17 00:00:00 2001 +From: Leigh Scott <leigh123linux@googlemail.com> +Date: Wed, 6 Feb 2019 01:04:17 +0000 +Subject: [PATCH] rename g_strv_equal to matekbd_strv_equal + +--- + libmatekbd/matekbd-keyboard-config.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libmatekbd/matekbd-keyboard-config.c b/libmatekbd/matekbd-keyboard-config.c +index 4c9db11..40b4022 100644 +--- libmatekbd/matekbd-keyboard-config.c ++++ libmatekbd/matekbd-keyboard-config.c +@@ -53,7 +53,7 @@ const gchar *MATEKBD_KEYBOARD_CONFIG_ACTIVE[] = { + */ + + static gboolean +-g_strv_equal (gchar ** l1, gchar ** l2) ++matekbd_strv_equal (gchar ** l1, gchar ** l2) + { + if (l1 == l2) + return TRUE; +@@ -555,7 +555,7 @@ matekbd_keyboard_config_equals (MatekbdKeyboardConfig * 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 (!matekbd_strv_equal (kbd_config1->layouts_variants, + kbd_config2->layouts_variants)) + return False; +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902252035.x1PKZxAl089210>