CVS commit: pkgsrc/x11/xf86-input-keyboard

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Sat Sep 19 13:52:14 UTC 2020

Modified Files:
        pkgsrc/x11/xf86-input-keyboard: Makefile distinfo
        pkgsrc/x11/xf86-input-keyboard/patches: patch-src_bsd__KbdMap.c

Log Message:
x11/xf86-input-keyboard: apply xsrc/54784 fix

Apply xsrc/54784 fix.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/x11/xf86-input-keyboard/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/x11/xf86-input-keyboard/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/x11/xf86-input-keyboard/patches/patch-src_bsd__KbdMap.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/xf86-input-keyboard/Makefile
diff -u pkgsrc/x11/xf86-input-keyboard/Makefile:1.27 pkgsrc/x11/xf86-input-keyboard/Makefile:1.28
--- pkgsrc/x11/xf86-input-keyboard/Makefile:1.27        Sat Jan 18 23:36:01 2020
+++ pkgsrc/x11/xf86-input-keyboard/Makefile     Sat Sep 19 13:52:14 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2020/01/18 23:36:01 rillig Exp $
+# $NetBSD: Makefile,v 1.28 2020/09/19 13:52:14 taca Exp $
 
 DISTNAME=      xf86-input-keyboard-1.9.0
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_XORG:=driver/}
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/x11/xf86-input-keyboard/distinfo
diff -u pkgsrc/x11/xf86-input-keyboard/distinfo:1.15 pkgsrc/x11/xf86-input-keyboard/distinfo:1.16
--- pkgsrc/x11/xf86-input-keyboard/distinfo:1.15        Sun Jan 21 10:12:39 2018
+++ pkgsrc/x11/xf86-input-keyboard/distinfo     Sat Sep 19 13:52:14 2020
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.15 2018/01/21 10:12:39 triaxx Exp $
+$NetBSD: distinfo,v 1.16 2020/09/19 13:52:14 taca Exp $
 
 SHA1 (xf86-input-keyboard-1.9.0.tar.bz2) = 24b5d84d221a75650f390ff63315912bf9a94992
 RMD160 (xf86-input-keyboard-1.9.0.tar.bz2) = 1b6d2d6fc538f7d57a0b452173184248e22d87d0
 SHA512 (xf86-input-keyboard-1.9.0.tar.bz2) = d1a52d10039096d0d5e09750b6a8c2388345748331615af93e5be499646c3bc5fbbfc897fcebdeada5efaafff94f26a2ab84d6e35f01a875b8b9956a42015df9
 Size (xf86-input-keyboard-1.9.0.tar.bz2) = 341693 bytes
-SHA1 (patch-src_bsd__KbdMap.c) = d92330a90aaf94cf2b8d789ca796b5cb39f7fea6
+SHA1 (patch-src_bsd__KbdMap.c) = b1e9d22a086332ded43e0448307c45d36ce9c159
 SHA1 (patch-src_sun__kbd.c) = 21da7cb7110ae8b08f9245de1d1678965ba7a0c8

Index: pkgsrc/x11/xf86-input-keyboard/patches/patch-src_bsd__KbdMap.c
diff -u pkgsrc/x11/xf86-input-keyboard/patches/patch-src_bsd__KbdMap.c:1.1 pkgsrc/x11/xf86-input-keyboard/patches/patch-src_bsd__KbdMap.c:1.2
--- pkgsrc/x11/xf86-input-keyboard/patches/patch-src_bsd__KbdMap.c:1.1  Sun Jan 21 10:12:39 2018
+++ pkgsrc/x11/xf86-input-keyboard/patches/patch-src_bsd__KbdMap.c      Sat Sep 19 13:52:14 2020
@@ -1,9 +1,12 @@
-$NetBSD: patch-src_bsd__KbdMap.c,v 1.1 2018/01/21 10:12:39 triaxx Exp $
+$NetBSD: patch-src_bsd__KbdMap.c,v 1.2 2020/09/19 13:52:14 taca Exp $
 
 PR191459: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=191459
 Fix a segmentation fault due to the use of Unicode codepoints in vt(4) which is
 the default console driver from FreeBSD 11.
 
+xsrc/54784: Cannot input some keys in JP keyboard on Xorg server when
+specify wskbd Protocol.
+
 --- src/bsd_KbdMap.c.orig      2015-08-07 03:16:08.000000000 +0000
 +++ src/bsd_KbdMap.c
 @@ -28,6 +28,7 @@
@@ -22,6 +25,32 @@ the default console driver from FreeBSD 
  
  #ifdef SYSCONS_SUPPORT
  static
+@@ -581,20 +583,20 @@ static CARD8 wsXtMap[] = {
+       /* 109 */ KEY_NOTUSED,
+       /* 110 */ KEY_NOTUSED,
+       /* 111 */ KEY_NOTUSED,
+-      /* 112 */ KEY_NOTUSED,
++      /* 112 */ KEY_HKTG,
+       /* 113 */ KEY_NOTUSED,
+       /* 114 */ KEY_NOTUSED,
+-      /* 115 */ KEY_NOTUSED,
++      /* 115 */ KEY_BSlash2,
+       /* 116 */ KEY_NOTUSED,
+       /* 117 */ KEY_NOTUSED,
+       /* 118 */ KEY_NOTUSED,
+       /* 119 */ KEY_NOTUSED,
+       /* 120 */ KEY_NOTUSED,
+-      /* 121 */ KEY_NOTUSED,
++      /* 121 */ KEY_XFER,
+       /* 122 */ KEY_NOTUSED,
+-      /* 123 */ KEY_NOTUSED,
++      /* 123 */ KEY_NFER,
+       /* 124 */ KEY_NOTUSED,
+-      /* 125 */ KEY_NOTUSED,
++      /* 125 */ KEY_Yen,
+       /* 126 */ KEY_NOTUSED,
+       /* 127 */ KEY_Pause,
+       /* 128 */ KEY_NOTUSED,
 @@ -1261,6 +1263,7 @@ KbdGetMapping (InputInfoPtr pInfo, KeySy
    KeySym        *k;
    int           i;