CVS commit: pkgsrc/x11/libX11

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Nov 10 21:33:06 UTC 2022

Modified Files:
        pkgsrc/x11/libX11: distinfo
        pkgsrc/x11/libX11/patches: patch-src_xkb_XKBBind.c

Log Message:
libX11: add upstream merge request URL


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 pkgsrc/x11/libX11/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/libX11/patches/patch-src_xkb_XKBBind.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/libX11/distinfo
diff -u pkgsrc/x11/libX11/distinfo:1.48 pkgsrc/x11/libX11/distinfo:1.49
--- pkgsrc/x11/libX11/distinfo:1.48     Thu Nov 10 21:29:16 2022
+++ pkgsrc/x11/libX11/distinfo  Thu Nov 10 21:33:05 2022
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.48 2022/11/10 21:29:16 wiz Exp $
+$NetBSD: distinfo,v 1.49 2022/11/10 21:33:05 wiz Exp $
 
 BLAKE2s (libX11-1.8.2.tar.xz) = e4af15ac627d666ace52ff861da139401207cd63ac06f8e5ca8f6bbd526bd9f8
 SHA512 (libX11-1.8.2.tar.xz) = 662ee8043d9ba27df82f647515b701d6f302a52715f21afdaba391f3b70691753e3649e7ff8322e07858be4297df9cbb19227958d676ed6dea198cce64330d1d
 Size (libX11-1.8.2.tar.xz) = 1823712 bytes
-SHA1 (patch-src_xkb_XKBBind.c) = 3ad94bd3265c3c4a85bcf3e2da0782c16fd461d1
+SHA1 (patch-src_xkb_XKBBind.c) = 88904e6916e56c8460e2d079c4653095a28f85e0

Index: pkgsrc/x11/libX11/patches/patch-src_xkb_XKBBind.c
diff -u pkgsrc/x11/libX11/patches/patch-src_xkb_XKBBind.c:1.1 pkgsrc/x11/libX11/patches/patch-src_xkb_XKBBind.c:1.2
--- pkgsrc/x11/libX11/patches/patch-src_xkb_XKBBind.c:1.1       Wed Jan 20 09:42:55 2021
+++ pkgsrc/x11/libX11/patches/patch-src_xkb_XKBBind.c   Thu Nov 10 21:33:05 2022
@@ -1,10 +1,12 @@
-$NetBSD: patch-src_xkb_XKBBind.c,v 1.1 2021/01/20 09:42:55 nia Exp $
+$NetBSD: patch-src_xkb_XKBBind.c,v 1.2 2022/11/10 21:33:05 wiz Exp $
 
 Don't use pragma inside a function, it breaks compiling with older
 GCCs.
 
 XKBBind.c:230: error: #pragma GCC diagnostic not allowed inside functions
 
+https://gitlab.freedesktop.org/xorg/lib/libx11/-/merge_requests/169
+
 --- src/xkb/XKBBind.c.orig     2020-11-20 19:08:11.000000000 +0000
 +++ src/xkb/XKBBind.c
 @@ -214,6 +214,14 @@ XkbKeysymToModifiers(Display *dpy, KeySy