[60685] trunk/dports/graphics/wxWidgets-devel

[jmr at macports.org]

Revision: 60685
          http://trac.macports.org/changeset/60685
Author:   jmr at macports.org
Date:     2009-11-19 14:35:55 -0800 (Thu, 19 Nov 2009)
Log Message:
-----------
wxWidgets-devel: get 64-bit build working

Modified Paths:
--------------
    trunk/dports/graphics/wxWidgets-devel/Portfile

Added Paths:
-----------
    trunk/dports/graphics/wxWidgets-devel/files/
    trunk/dports/graphics/wxWidgets-devel/files/patch-textctrl.diff

Modified: trunk/dports/graphics/wxWidgets-devel/Portfile
===================================================================
--- trunk/dports/graphics/wxWidgets-devel/Portfile	2009-11-19 22:15:30 UTC (rev 60684)
+++ trunk/dports/graphics/wxWidgets-devel/Portfile	2009-11-19 22:35:55 UTC (rev 60685)
@@ -65,7 +65,14 @@
     --disable-sdltest \
     --enable-unicode \
     --enable-display \
-    --enable-monolithic
+    --enable-monolithic \
+    --with-macosx-version-min=${macosx_deployment_target}
+if {$build_arch == "x86_64" || $build_arch == "ppc64"} {
+    # default carbon won't work on 64-bit
+    configure.args-delete --with-mac
+    configure.args-append --with-osx_cocoa
+    patchfiles-append     patch-textctrl.diff
+}
 
 set installtype		release
 #set contrib		"gizmos stc ogl"
@@ -89,7 +96,11 @@
 #	readme-gtk.txt readme-mac.txt \
 #	readme-mgl.txt readme-motif.txt readme-x11.txt \
 #	${destroot}${prefix}/share/doc/${name}
-    reinplace "s|-L${build.dir}/lib||" ${destroot}${prefix}/lib/${sub}/wx/config/osx_carbon-unicode-${installtype}-2.9
+    if {$build_arch == "x86_64" || $build_arch == "ppc64"} {
+        reinplace "s|-L${build.dir}/lib||" ${destroot}${prefix}/lib/${sub}/wx/config/osx_cocoa-unicode-${installtype}-2.9
+    } else {
+        reinplace "s|-L${build.dir}/lib||" ${destroot}${prefix}/lib/${sub}/wx/config/osx_carbon-unicode-${installtype}-2.9
+    }
 }
 
 variant nonmonolithic description {build libraries separately} {

Added: trunk/dports/graphics/wxWidgets-devel/files/patch-textctrl.diff
===================================================================
--- trunk/dports/graphics/wxWidgets-devel/files/patch-textctrl.diff	                        (rev 0)
+++ trunk/dports/graphics/wxWidgets-devel/files/patch-textctrl.diff	2009-11-19 22:35:55 UTC (rev 60685)
@@ -0,0 +1,40 @@
+# See http://groups.google.com/group/wx-dev/browse_thread/thread/8af9dd06f1a1a867
+# and http://svn.wxwidgets.org/viewvc/wx?view=rev&revision=61383
+diff -Naur work/wxWidgets-2.9.0/src/osx/cocoa/textctrl.mm work-patched/wxWidgets-2.9.0/src/osx/cocoa/textctrl.mm
+--- ../src/osx/cocoa/textctrl.mm	2009-09-04 06:53:00.000000000 +0200
++++ ../src/osx/cocoa/textctrl.mm	2009-10-02 12:49:54.000000000 +0200
+@@ -141,7 +141,7 @@
+ 
+ - (void) keyDown:(NSEvent*) event
+ {
+-    wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( [self delegate] );
++    wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( (WXWidget) [self delegate] );
+     lastKeyDownEvent = event;
+     if ( impl == NULL || !impl->DoHandleKeyEvent(event) )
+         [super keyDown:event];
+@@ -150,14 +150,14 @@
+ 
+ - (void) keyUp:(NSEvent*) event
+ {
+-    wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( [self delegate] );
++    wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( (WXWidget) [self delegate] );
+     if ( impl == NULL || !impl->DoHandleKeyEvent(event) )
+         [super keyUp:event];
+ }
+ 
+ - (void) flagsChanged:(NSEvent*) event
+ {
+-    wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( [self delegate] );
++    wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( (WXWidget) [self delegate] );
+     if ( impl == NULL || !impl->DoHandleKeyEvent(event) )
+         [super flagsChanged:event];
+ }
+@@ -170,7 +170,7 @@
+ 
+ - (void) insertText:(id) str
+ {
+-    wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( [self delegate] );
++    wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( (WXWidget) [self delegate] );
+     if ( impl == NULL || lastKeyDownEvent==nil || !impl->DoHandleCharEvent(lastKeyDownEvent, str) )
+     {
+         [super insertText:str];
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091119/ba027f36/attachment.html>