[67814] trunk/dports/python/py26-wxpython

[macsforever2000 at macports.org]

Revision: 67814
          http://trac.macports.org/changeset/67814
Author:   macsforever2000 at macports.org
Date:     2010-05-18 14:28:41 -0700 (Tue, 18 May 2010)
Log Message:
-----------
Fix for building on Snow Leopard. Added gtk variant. (#24350)

Modified Paths:
--------------
    trunk/dports/python/py26-wxpython/Portfile

Added Paths:
-----------
    trunk/dports/python/py26-wxpython/files/
    trunk/dports/python/py26-wxpython/files/wxpython28101_gdiwrap.diff

Modified: trunk/dports/python/py26-wxpython/Portfile
===================================================================
--- trunk/dports/python/py26-wxpython/Portfile	2010-05-18 21:25:16 UTC (rev 67813)
+++ trunk/dports/python/py26-wxpython/Portfile	2010-05-18 21:28:41 UTC (rev 67814)
@@ -5,7 +5,7 @@
 PortGroup           python26 1.0
 
 name                py26-wxpython
-version             2.8.9.1
+version             2.8.10.1
 categories-append   graphics
 maintainers         jameskyle
 description         Python interface to the wxWindows cross platform GUI
@@ -20,28 +20,40 @@
 
 platforms           darwin
 depends_lib         port:python26 \
-                    port:wxWidgets
+                    port:wxWidgets-python
 
 master_sites        sourceforge:wxpython
 distname            wxPython-src-${version}
 use_bzip2           yes
 
-checksums           md5 4ad9a64e05529097618c7e48fbb10a84 \
-                    sha1 7359af790d58082330c867f5c10f51b6382d9a35 \
-                    rmd160 2b193c867a028985f8ead4084a9c1f024a1d37c6
+checksums           md5     65d5ef166f23fe8b4c67f58df164f93e \
+                    sha1    6598fbafd979a91f20100171fa23a91779f6dc62 \
+                    rmd160  bb606046d140623041b988e64ab268ced9aa958f
 
-
 worksrcdir          ${distname}/wxPython
 
 extract.post_args   "| tar -xf - ${worksrcdir} ${distname}/docs"
 
+patchfiles         wxpython28101_gdiwrap.diff
+patch.pre_args	   -p1
+
 use_configure       no
 
-build.env           UNICODE="1" WXPORT="mac" PATH="${prefix}/lib/wx/config:$env(PATH)"
+variant carbon conflicts gtk description {use carbon} {
+    build.args   "UNICODE=1 WXPORT=mac"
+    destroot.args "UNICODE=1 WXPORT=mac"
+}
+variant gtk conflicts carbon description {use gtk} {
+    build.args    "UNICODE=1 WXPORT=gtk2"
+    destroot.args "UNICODE=1 WXPORT=gtk2"
+}
+if {![variant_isset carbon]} {
+    default_variants-append +gtk
+}
+
 build.cmd           ${python.bin} setup.py
 build.target        build
 
-destroot.env        UNICODE="1" WXPORT="mac" PATH="${python.prefix}/lib/wx/config:$env(PATH)"
 destroot.cmd        ${build.cmd}
 destroot.destdir    --prefix=${python.prefix} --root=${destroot}
 

Added: trunk/dports/python/py26-wxpython/files/wxpython28101_gdiwrap.diff
===================================================================
--- trunk/dports/python/py26-wxpython/files/wxpython28101_gdiwrap.diff	                        (rev 0)
+++ trunk/dports/python/py26-wxpython/files/wxpython28101_gdiwrap.diff	2010-05-18 21:28:41 UTC (rev 67814)
@@ -0,0 +1,13 @@
+--- wxPython/src/gtk/_gdi_wrap.cpp.orig	2009-08-08 16:26:48.000000000 +0200
++++ wxPython/src/gtk/_gdi_wrap.cpp	2009-08-08 16:32:50.000000000 +0200
+@@ -4195,6 +4195,10 @@
+     virtual wxGraphicsBrush CreateRadialGradientBrush(wxDouble , wxDouble , wxDouble , wxDouble , wxDouble ,
+                                                       const wxColour &, const wxColour &)  { return wxNullGraphicsBrush; }
+     virtual wxGraphicsFont CreateFont( const wxFont & , const wxColour & ) { return wxNullGraphicsFont; }
++
++    // patch required as explained in
++    // http://groups.google.com/group/wxPython-users/browse_thread/thread/129ba27e2f868c3c?pli=1
++    wxGraphicsBitmap CreateBitmap( const wxBitmap &bitmap ) const { return wxNullGraphicsBitmap; } 
+ };
+ 
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100518/bc4ed888/attachment.html>