[89286] trunk/dports/x11/Xaw3d

[jeremyhu at macports.org]

Revision: 89286
          http://trac.macports.org/changeset/89286
Author:   jeremyhu at macports.org
Date:     2012-01-22 22:02:41 -0800 (Sun, 22 Jan 2012)
Log Message:
-----------
Xaw3d: Build fix for some configs, #32991

Modified Paths:
--------------
    trunk/dports/x11/Xaw3d/Portfile
    trunk/dports/x11/Xaw3d/files/0001-Include-stdlib.h-for-abs.patch
    trunk/dports/x11/Xaw3d/files/0002-Cleanup-shadow-declarations.patch

Added Paths:
-----------
    trunk/dports/x11/Xaw3d/files/0003-Build-fix-for-int-pointer-cast-errors.patch

Modified: trunk/dports/x11/Xaw3d/Portfile
===================================================================
--- trunk/dports/x11/Xaw3d/Portfile	2012-01-23 05:27:59 UTC (rev 89285)
+++ trunk/dports/x11/Xaw3d/Portfile	2012-01-23 06:02:41 UTC (rev 89286)
@@ -29,7 +29,8 @@
                 port:xorg-libXt
 
 patchfiles      0001-Include-stdlib.h-for-abs.patch \
-                0002-Cleanup-shadow-declarations.patch
+                0002-Cleanup-shadow-declarations.patch \
+                0003-Build-fix-for-int-pointer-cast-errors.patch
 
 patch.pre_args  -p1
 

Modified: trunk/dports/x11/Xaw3d/files/0001-Include-stdlib.h-for-abs.patch
===================================================================
--- trunk/dports/x11/Xaw3d/files/0001-Include-stdlib.h-for-abs.patch	2012-01-23 05:27:59 UTC (rev 89285)
+++ trunk/dports/x11/Xaw3d/files/0001-Include-stdlib.h-for-abs.patch	2012-01-23 06:02:41 UTC (rev 89286)
@@ -1,7 +1,7 @@
 From d31153b30abd26c3f65e19d126ce4a3542cf14c0 Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston <jeremyhu at apple.com>
 Date: Sun, 22 Jan 2012 11:55:29 -0800
-Subject: [PATCH 1/2] Include <stdlib.h> for abs()
+Subject: [PATCH 1/3] Include <stdlib.h> for abs()
 
 Tip.c:336:9: error: implicit declaration of function 'abs' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
         ksy += abs(ext->max_ink_extent.y);

Modified: trunk/dports/x11/Xaw3d/files/0002-Cleanup-shadow-declarations.patch
===================================================================
--- trunk/dports/x11/Xaw3d/files/0002-Cleanup-shadow-declarations.patch	2012-01-23 05:27:59 UTC (rev 89285)
+++ trunk/dports/x11/Xaw3d/files/0002-Cleanup-shadow-declarations.patch	2012-01-23 06:02:41 UTC (rev 89286)
@@ -1,7 +1,7 @@
 From 702e4ff9f5fbfae4aecba09f8c735dc97bac1b59 Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston <jeremyhu at apple.com>
 Date: Sun, 22 Jan 2012 11:58:09 -0800
-Subject: [PATCH 2/2] Cleanup shadow declarations
+Subject: [PATCH 2/3] Cleanup shadow declarations
 
 Box.c:265:10: warning: declaration shadows a local variable [-Wshadow]
             int i = bbw->composite.num_children;

Added: trunk/dports/x11/Xaw3d/files/0003-Build-fix-for-int-pointer-cast-errors.patch
===================================================================
--- trunk/dports/x11/Xaw3d/files/0003-Build-fix-for-int-pointer-cast-errors.patch	                        (rev 0)
+++ trunk/dports/x11/Xaw3d/files/0003-Build-fix-for-int-pointer-cast-errors.patch	2012-01-23 06:02:41 UTC (rev 89286)
@@ -0,0 +1,66 @@
+From b093ed77fbab09bd474094898719ed6346d30d45 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu at apple.com>
+Date: Sun, 22 Jan 2012 22:01:07 -0800
+Subject: [PATCH 3/3] Build fix for int-pointer cast errors
+
+Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
+---
+ src/XawIm.c |   12 ++++++------
+ 1 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/XawIm.c b/src/XawIm.c
+index b01f0d0..82a94b1 100644
+--- a/src/XawIm.c
++++ b/src/XawIm.c
+@@ -141,14 +141,14 @@ SearchVendorShell(Widget w)
+     return(NULL);
+ }
+ 
+-static XContext extContext = (XContext)NULL;
++static XContext extContext = (XContext)0;
+ 
+ static XawVendorShellExtPart *
+ SetExtPart(VendorShellWidget w, XawVendorShellExtWidget vew)
+ {
+     contextDataRec *contextData;
+ 
+-    if (extContext == (XContext)NULL) extContext = XUniqueContext();
++    if (extContext == (XContext)0) extContext = XUniqueContext();
+ 
+     contextData = XtNew(contextDataRec);
+     contextData->parent = (Widget)w;
+@@ -252,14 +252,14 @@ ConfigureCB(Widget w, XtPointer closure, XEvent *event)
+     }
+ }
+ 
+-static XContext errContext = (XContext)NULL;
++static XContext errContext = (XContext)0;
+ 
+ static Widget
+ SetErrCnxt(Widget w, XIM xim)
+ {
+     contextErrDataRec *contextErrData;
+ 
+-    if (errContext == (XContext)NULL) errContext = XUniqueContext();
++    if (errContext == (XContext)0) errContext = XUniqueContext();
+ 
+     contextErrData = XtNew(contextErrDataRec);
+     contextErrData->widget = w;
+@@ -1321,12 +1321,12 @@ Destroy(Widget w, XawVendorShellExtPart *ve)
+ 	return;
+     XtFree( (char*) ve->im.resources );
+ 
+-    if (extContext != (XContext)NULL &&
++    if (extContext != (XContext)0 &&
+ 	!XFindContext (XtDisplay (w), (Window)w,
+ 		       extContext, (XPointer*)&contextData))
+         XtFree( (char*) contextData );
+ 
+-    if (errContext != (XContext)NULL &&
++    if (errContext != (XContext)0 &&
+ 	!XFindContext (XDisplayOfIM( ve->im.xim ), (Window) ve->im.xim,
+ 		       errContext, (XPointer*) &contextErrData))
+         XtFree( (char*) contextErrData );
+-- 
+1.7.7.4
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120122/bd61b41f/attachment.html>