diff options
| author | apb <apb@pkgsrc.org> | 2009-03-14 11:09:37 +0000 |
|---|---|---|
| committer | apb <apb@pkgsrc.org> | 2009-03-14 11:09:37 +0000 |
| commit | 796261e5c616f5a175c4a4b002c27b81f0332030 (patch) | |
| tree | 1d33c1c173b70410bfee389cafa80c14befa664d /x11 | |
| parent | 7e4ea6b182fba8edf32eff31fd07ff188db9d2ce (diff) | |
| download | pkgsrc-796261e5c616f5a175c4a4b002c27b81f0332030.tar.gz | |
xf86-input-mouse-1.3.0nb2.
Apply the following patch from NetBSD xsrc/external/mit/xf86-input-mouse;
thanks to joerg for providing a list of changes to apply.
2009-02-02 03:05 christos
* src/mouse.c (1.2):
Call a SetupMouse function to condition the fd.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/xf86-input-mouse/Makefile | 4 | ||||
| -rw-r--r-- | x11/xf86-input-mouse/distinfo | 3 | ||||
| -rw-r--r-- | x11/xf86-input-mouse/patches/patch-ab | 24 |
3 files changed, 28 insertions, 3 deletions
diff --git a/x11/xf86-input-mouse/Makefile b/x11/xf86-input-mouse/Makefile index d36fb5e7451..cd105ed16f8 100644 --- a/x11/xf86-input-mouse/Makefile +++ b/x11/xf86-input-mouse/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.8 2008/09/18 20:57:52 bjs Exp $ +# $NetBSD: Makefile,v 1.9 2009/03/14 11:09:37 apb Exp $ DISTNAME= xf86-input-mouse-1.3.0 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 diff --git a/x11/xf86-input-mouse/distinfo b/x11/xf86-input-mouse/distinfo index 1919d63dd78..23a6406db4a 100644 --- a/x11/xf86-input-mouse/distinfo +++ b/x11/xf86-input-mouse/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.6 2008/05/30 10:54:57 wiz Exp $ +$NetBSD: distinfo,v 1.7 2009/03/14 11:09:37 apb Exp $ SHA1 (xf86-input-mouse-1.3.0.tar.bz2) = 79ecd994b2820d24a00d4c4af9aa9189bdd9db93 RMD160 (xf86-input-mouse-1.3.0.tar.bz2) = a691e809e61e14e2383f1d4533b0eb454373667f Size (xf86-input-mouse-1.3.0.tar.bz2) = 282157 bytes SHA1 (patch-aa) = baf529a3ae260e98fb068cb9549f749705d8213b +SHA1 (patch-ab) = 632ec0e3908ccd16678a480b5ffa00dba7db640f diff --git a/x11/xf86-input-mouse/patches/patch-ab b/x11/xf86-input-mouse/patches/patch-ab new file mode 100644 index 00000000000..f24870991d3 --- /dev/null +++ b/x11/xf86-input-mouse/patches/patch-ab @@ -0,0 +1,24 @@ +$NetBSD: patch-ab,v 1.1 2009/03/14 11:09:37 apb Exp $ + +Changes from NetBSD xsrc/external/mit/xf86-input-mouse/dist/\ +src/mouse.c + +---------------------------- +revision 1.2 +date: 2009/02/02 03:05:35; author: christos; state: Exp; lines: +4 -0 +Call a SetupMouse function to condition the fd. +---------------------------- + +--- src/mouse.c.orig 2008-03-20 20:55:51.000000000 +0200 ++++ src/mouse.c +@@ -2538,6 +2538,10 @@ SetupMouse(InputInfoPtr pInfo) + Bool automatic = FALSE; + + pMse = pInfo->private; ++ ++ if (osInfo->SetupMouse) ++ if (!osInfo->SetupMouse(pInfo)) ++ return FALSE; + + /* Handle the "Auto" protocol. */ + if (pMse->protocolID == PROT_AUTO) { |