ports/108720: accessx will have build problems on amd64

[Stephen Montgomery-Smith]

>Number:         108720
>Category:       ports
>Synopsis:       accessx will have build problems on amd64
>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:   Sat Feb 03 15:30:12 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Stephen Montgomery-Smith
>Release:        FreeBSD 6.2-STABLE i386
>Organization:
>Environment:
System: FreeBSD cauchy 6.2-STABLE FreeBSD 6.2-STABLE #0: Mon Jan 15 09:58:34 CST 2007 stephen at cauchy:/usr/obj/usr/src/sys/cauchy i386


	
>Description:

Kris Kannaway reports that on an amd64, and compiling using gcc41, that there
is a compilation error due to pointers and integers having different
sizes.

>How-To-Repeat:
>Fix:

This will almost certainly fix the problem.  In any case, the original code
is wrong anyway, as it doesn't understand how XkbGetMap works.  This PR
should be completely independent of ports/108168 in that it shouldn't
matter which one is submitted first.

diff -ur /usr/ports/x11/accessx/files/patch-Access.C accessx/files/patch-Access.C
--- /usr/ports/x11/accessx/files/patch-Access.C	Wed Mar 15 19:35:37 2006
+++ accessx/files/patch-Access.C	Tue Jan 30 22:18:52 2007
@@ -1,5 +1,5 @@
---- Access.C.orig	Mon Dec 16 20:35:51 2002
-+++ Access.C	Mon Dec 16 20:36:29 2002
+--- Access.C.orig	Tue Mar 13 23:39:55 2001
++++ Access.C	Tue Jan 30 22:18:00 2007
 @@ -21,6 +21,8 @@
  #include <X11/XKBlib.h>
  #include "Access.h"
@@ -9,3 +9,21 @@
  //
  // Access()
  //
+@@ -152,7 +154,7 @@
+     //Get the state of the keyboard.
+ 
+     XkbDescPtr xkb = XkbGetMap(display, 0, XkbUseCoreKbd);
+-    if ((int)xkb == BadAlloc || xkb == NULL)
++    if (xkb == NULL)
+       {
+ 	return 5; /*AccessKeyboardQueryFailure;*/
+       }
+@@ -261,7 +263,7 @@
+     //Get the state of the keyboard.
+ 
+     XkbDescPtr xkb = XkbGetMap(display, 0, XkbUseCoreKbd);
+-    if ((int)xkb == BadAlloc || xkb == NULL)
++    if (xkb == NULL)
+       {
+ 	return 5; /*AccessKeyboardQueryFailure;*/
+       }


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