[pkgsrc/trunk]: pkgsrc/x11/libgnomekbd Don't conflict with newer glib.

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1e8d097163fb
branches:  trunk
changeset: 345980:1e8d097163fb
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Dec 22 22:30:58 2019 +0000

description:
Don't conflict with newer glib.

diffstat:

 x11/libgnomekbd/distinfo                                         |   3 +-
 x11/libgnomekbd/patches/patch-libgnomekbd_gkbd-keyboard-config.c |  22 ++++++++++
 2 files changed, 24 insertions(+), 1 deletions(-)

diffs (38 lines):

diff -r 8ab38379151c -r 1e8d097163fb x11/libgnomekbd/distinfo
--- a/x11/libgnomekbd/distinfo  Sun Dec 22 22:30:08 2019 +0000
+++ b/x11/libgnomekbd/distinfo  Sun Dec 22 22:30:58 2019 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.15 2018/06/01 17:04:18 youri Exp $
+$NetBSD: distinfo,v 1.16 2019/12/22 22:30:58 joerg Exp $
 
 SHA1 (libgnomekbd-3.6.0.tar.xz) = 4375d2cb8cbdbad7a4f59a8b99edd58cfa328597
 RMD160 (libgnomekbd-3.6.0.tar.xz) = 59ecbefb14f92e7c896ca4416d5f09e45a2b30a9
 SHA512 (libgnomekbd-3.6.0.tar.xz) = 27d0711eeebba91ca0dbed079c17acfec97116153a01f4f6e78cb30044afc534c438f655c6836b74b377acb8116d3b70e1f09578f182bb4fc51d8d05e89c6f17
 Size (libgnomekbd-3.6.0.tar.xz) = 373588 bytes
+SHA1 (patch-libgnomekbd_gkbd-keyboard-config.c) = 89f8b3e8e809c896c3aa0a549f5c43ee2aaf36b8
diff -r 8ab38379151c -r 1e8d097163fb x11/libgnomekbd/patches/patch-libgnomekbd_gkbd-keyboard-config.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/libgnomekbd/patches/patch-libgnomekbd_gkbd-keyboard-config.c  Sun Dec 22 22:30:58 2019 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-libgnomekbd_gkbd-keyboard-config.c,v 1.1 2019/12/22 22:30:58 joerg Exp $
+
+g_strv_equal exists in newer glib.
+
+--- libgnomekbd/gkbd-keyboard-config.c.orig    2019-12-22 18:05:27.205201216 +0000
++++ libgnomekbd/gkbd-keyboard-config.c
+@@ -51,6 +51,7 @@ const gchar *GKBD_KEYBOARD_CONFIG_ACTIVE
+  * static common functions
+  */
+ 
++#if 0
+ static gboolean
+ g_strv_equal (gchar ** l1, gchar ** l2)
+ {
+@@ -75,6 +76,7 @@ g_strv_equal (gchar ** l1, gchar ** l2)
+       }
+       return (*l1 == NULL) && (*l2 == NULL);
+ }
++#endif
+ 
+ gboolean
+ gkbd_keyboard_config_get_lv_descriptions (XklConfigRegistry *