diff options
| author | bjs <bjs@pkgsrc.org> | 2008-04-08 03:41:00 +0000 |
|---|---|---|
| committer | bjs <bjs@pkgsrc.org> | 2008-04-08 03:41:00 +0000 |
| commit | 8f3e54e842da6319ccd2c35cea1d61e0d5b197d9 (patch) | |
| tree | 1fe7ab05932970b2769238ae8fb9a2f35119501b /x11/libXxf86vm | |
| parent | 8e4da88eb42a5a2ae168a9df86ca4b18704a540e (diff) | |
| download | pkgsrc-8f3e54e842da6319ccd2c35cea1d61e0d5b197d9.tar.gz | |
Add a patch from Xorg GIT to fix:
Bug #10846: Fix XF86VidModeGetMonitor when vendor or model are null.
Bump PKGREVISION.
Diffstat (limited to 'x11/libXxf86vm')
| -rw-r--r-- | x11/libXxf86vm/Makefile | 3 | ||||
| -rw-r--r-- | x11/libXxf86vm/distinfo | 3 | ||||
| -rw-r--r-- | x11/libXxf86vm/patches/patch-aa | 25 |
3 files changed, 29 insertions, 2 deletions
diff --git a/x11/libXxf86vm/Makefile b/x11/libXxf86vm/Makefile index 4197a41204f..8bd048b1391 100644 --- a/x11/libXxf86vm/Makefile +++ b/x11/libXxf86vm/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2007/07/27 23:51:59 joerg Exp $ +# $NetBSD: Makefile,v 1.3 2008/04/08 03:41:00 bjs Exp $ # DISTNAME= libXxf86vm-1.0.1 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= http://xorg.freedesktop.org/releases/individual/lib/ EXTRACT_SUFX= .tar.bz2 diff --git a/x11/libXxf86vm/distinfo b/x11/libXxf86vm/distinfo index 64f65234d07..d5dff968e15 100644 --- a/x11/libXxf86vm/distinfo +++ b/x11/libXxf86vm/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2006/11/14 15:06:45 joerg Exp $ +$NetBSD: distinfo,v 1.2 2008/04/08 03:41:00 bjs Exp $ SHA1 (libXxf86vm-1.0.1.tar.bz2) = 75469e9ef5bc29dc84fcc5e35251583d10c04859 RMD160 (libXxf86vm-1.0.1.tar.bz2) = f9bd6533f37c74a948ad9f8af58d833a8ce1bfcf Size (libXxf86vm-1.0.1.tar.bz2) = 227928 bytes +SHA1 (patch-aa) = aeff97fa6c348314c3a4e4aae8aa9ba782ab6f28 diff --git a/x11/libXxf86vm/patches/patch-aa b/x11/libXxf86vm/patches/patch-aa new file mode 100644 index 00000000000..c4ef3564dea --- /dev/null +++ b/x11/libXxf86vm/patches/patch-aa @@ -0,0 +1,25 @@ +$NetBSD: patch-aa,v 1.1 2008/04/08 03:41:00 bjs Exp $ + +From: Adam Jackson <ajax@redhat.com> +Date: Mon, 24 Mar 2008 19:13:14 +0000 (-0400) +Subject: Bug #10846: Fix XF86VidModeGetMonitor when vendor or model are null. +X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/lib/libXxf86vm.git;a=commitdiff;h=0aa2ae83518b14e927fb5b8ced182a4f25cecc76 + +Bug #10846: Fix XF86VidModeGetMonitor when vendor or model are null. + +--- src/XF86VMode.c.orig 2004-04-23 14:43:56.000000000 -0400 ++++ src/XF86VMode.c +@@ -967,11 +964,11 @@ XF86VidModeGetMonitor(dpy, screen, monit + if (rep.vendorLength) + _XReadPad(dpy, monitor->vendor, rep.vendorLength); + else +- monitor->vendor = ""; ++ monitor->vendor[0] = '\0'; + if (rep.modelLength) + _XReadPad(dpy, monitor->model, rep.modelLength); + else +- monitor->model = ""; ++ monitor->model[0] = '\0'; + + UnlockDisplay(dpy); + SyncHandle(); |