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

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Aug  8 13:53:57 UTC 2022

Modified Files:
        pkgsrc/x11/xf86-input-ws: Makefile distinfo
        pkgsrc/x11/xf86-input-ws/patches: patch-src_ws.c

Log Message:
xf86-input-ws: stable releases of NetBSD lack WSCONS_EVENT_HSCROLL
and WSCONS_EVENT_VSCROLL (PR pkg/56958)


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/xf86-input-ws/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/x11/xf86-input-ws/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/xf86-input-ws/patches/patch-src_ws.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-ws/Makefile
diff -u pkgsrc/x11/xf86-input-ws/Makefile:1.8 pkgsrc/x11/xf86-input-ws/Makefile:1.9
--- pkgsrc/x11/xf86-input-ws/Makefile:1.8       Fri May 27 02:35:43 2022
+++ pkgsrc/x11/xf86-input-ws/Makefile   Mon Aug  8 13:53:57 2022
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2022/05/27 02:35:43 tnn Exp $
+# $NetBSD: Makefile,v 1.9 2022/08/08 13:53:57 nia Exp $
 
 DISTNAME=      xf86-input-ws-1.3.0.20220511
+PKGREVISION=   1
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_LOCAL}
 

Index: pkgsrc/x11/xf86-input-ws/distinfo
diff -u pkgsrc/x11/xf86-input-ws/distinfo:1.7 pkgsrc/x11/xf86-input-ws/distinfo:1.8
--- pkgsrc/x11/xf86-input-ws/distinfo:1.7       Fri May 27 04:32:49 2022
+++ pkgsrc/x11/xf86-input-ws/distinfo   Mon Aug  8 13:53:57 2022
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2022/05/27 04:32:49 ryoon Exp $
+$NetBSD: distinfo,v 1.8 2022/08/08 13:53:57 nia Exp $
 
 BLAKE2s (xf86-input-ws-1.3.0.20220511.tar.gz) = 2c84b8878160554e2a58c3ca086ca032bc9bf7be1dc8ed90413fb175ecfff53b
 SHA512 (xf86-input-ws-1.3.0.20220511.tar.gz) = 10581eb9ce9d5824c0a08530d0f6dde29abb7eb6e6a3865cdebb1156f79bcee249623cbf7f23679523003e7919773df9c6a3c4a35df8aeddc44a57fc83859e89
 Size (xf86-input-ws-1.3.0.20220511.tar.gz) = 347971 bytes
-SHA1 (patch-src_ws.c) = 57caff6f21bdfc83b4736638ae330f4eaf3b4c7a
+SHA1 (patch-src_ws.c) = 80ff2f6e70df37011fa69ccfe9c81fe048984def

Index: pkgsrc/x11/xf86-input-ws/patches/patch-src_ws.c
diff -u pkgsrc/x11/xf86-input-ws/patches/patch-src_ws.c:1.2 pkgsrc/x11/xf86-input-ws/patches/patch-src_ws.c:1.3
--- pkgsrc/x11/xf86-input-ws/patches/patch-src_ws.c:1.2 Fri May 27 02:35:43 2022
+++ pkgsrc/x11/xf86-input-ws/patches/patch-src_ws.c     Mon Aug  8 13:53:57 2022
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_ws.c,v 1.2 2022/05/27 02:35:43 tnn Exp $
+$NetBSD: patch-src_ws.c,v 1.3 2022/08/08 13:53:57 nia Exp $
 
 ws.c:407:3: warning: attempt to free a non-heap object
 Reported to upstream maintainers.
@@ -13,7 +13,7 @@ Reported to upstream maintainers.
                return !Success;
        }
  
-@@ -611,9 +610,11 @@ wsReadHwState(InputInfoPtr pInfo, wsHwSt
+@@ -611,17 +610,23 @@ wsReadHwState(InputInfoPtr pInfo, wsHwSt
                case WSCONS_EVENT_MOUSE_ABSOLUTE_W:
                        /* ignore those */
                        continue;
@@ -22,10 +22,22 @@ Reported to upstream maintainers.
                        DBG(4, ErrorF("Sync\n"));
                        return TRUE;
 +#endif
++#ifdef WSCONS_EVENT_HSCROLL
                case WSCONS_EVENT_HSCROLL:
                        hw->hscroll = event->value;
                        DBG(4, ErrorF("Horiz. Scrolling %d\n", event->value));
-@@ -876,17 +877,23 @@ wsSetCalibProperty(DeviceIntPtr device, 
+                       return TRUE;
++#endif
++#ifdef WSCONS_EVENT_VSCROLL
+               case WSCONS_EVENT_VSCROLL:
+                       hw->vscroll = event->value;
+                       DBG(4, ErrorF("Vert. Scrolling %d\n", event->value));
+                       return TRUE;
++#endif
+               default:
+                       xf86IDrvMsg(pInfo, X_WARNING,
+                           "bad wsmouse event type=%d\n", event->type);
+@@ -876,17 +881,23 @@ wsSetCalibProperty(DeviceIntPtr device, 
                priv->coords.maxx = priv->max_x;
                priv->coords.miny = priv->min_y;
                priv->coords.maxy = priv->max_y;