From owner-svn-ports-head@freebsd.org Mon Feb 25 20:36:00 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0614D15158A9; Mon, 25 Feb 2019 20:36:00 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A0CA380B21; Mon, 25 Feb 2019 20:35:59 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8C26C22381; Mon, 25 Feb 2019 20:35:59 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1PKZxP3089211; Mon, 25 Feb 2019 20:35:59 GMT (envelope-from kwm@FreeBSD.org) Received: (from kwm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1PKZxAl089210; Mon, 25 Feb 2019 20:35:59 GMT (envelope-from kwm@FreeBSD.org) Message-Id: <201902252035.x1PKZxAl089210@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kwm set sender to kwm@FreeBSD.org using -f From: Koop Mast Date: Mon, 25 Feb 2019 20:35:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r493897 - head/x11/libmatekbd/files X-SVN-Group: ports-head X-SVN-Commit-Author: kwm X-SVN-Commit-Paths: head/x11/libmatekbd/files X-SVN-Commit-Revision: 493897 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: A0CA380B21 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.981,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Feb 2019 20:36:00 -0000 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 +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; +