ports/163939: [MAINTAINER] x11-wm/ctwm: Patch potential amd64 issue

[Matthew D.Fuller]

>Number:         163939
>Category:       ports
>Synopsis:       [MAINTAINER] x11-wm/ctwm: Patch potential amd64 issue
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 09 00:20:08 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Matthew D. Fuller
>Release:        FreeBSD 9.0-RC1 i386
>Organization:
>Environment:
System: FreeBSD draco.over-yonder.net 9.0-RC1 FreeBSD 9.0-RC1 #0 r227108M: Sat Nov 5 09:06:02 CDT 2011 root at draco.over-yonder.net:/bsd/obj/bsd/src/sys/DRACO i386


	
>Description:
	Part of the JPEG loading code assumes long is 32 bit, which isn't
	true on amd64 (and potentially other platforms).  To be addressed
	upstream, but this fixes it locally for now.
>How-To-Repeat:
	
>Fix:


Index: Makefile
===================================================================
RCS file: /draco/cvs/ports/x11-wm/ctwm/Makefile,v
retrieving revision 1.52
diff -u -r1.52 Makefile
--- Makefile	7 Jan 2012 19:26:58 -0000	1.52
+++ Makefile	8 Jan 2012 17:24:13 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	ctwm
 PORTVERSION=	3.8.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://ctwm.free.lp.se/dist/ \
Index: files/patch-util.c
===================================================================
RCS file: files/patch-util.c
diff -N files/patch-util.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-util.c	8 Jan 2012 22:52:06 -0000
@@ -0,0 +1,11 @@
+--- util.c.orig	2012-01-08 16:51:48.245308175 -0600
++++ util.c	2012-01-08 16:51:52.168309618 -0600
+@@ -3941,7 +3941,7 @@
+ #ifdef JPEG
+ 
+ unsigned short int *buffer_16bpp;
+-long *buffer_32bpp;
++uint32_t *buffer_32bpp;
+ 
+ static void convert_for_16 (int w, int x, int y, int r, int g, int b) {
+   buffer_16bpp [y * w + x] = ((r >> 3) << 11) + ((g >> 2) << 5) + (b >> 3);

>Release-Note:
>Audit-Trail:
>Unformatted: