[110366] trunk/dports/graphics/wxWidgets-3.0

[mojca at macports.org]

Revision: 110366
          https://trac.macports.org/changeset/110366
Author:   mojca at macports.org
Date:     2013-08-30 11:18:10 -0700 (Fri, 30 Aug 2013)
Log Message:
-----------
wxWidgets-3.0: minor cosmetic changes only

Modified Paths:
--------------
    trunk/dports/graphics/wxWidgets-3.0/Portfile
    trunk/dports/graphics/wxWidgets-3.0/files/patch-include-wx-math.h.diff

Modified: trunk/dports/graphics/wxWidgets-3.0/Portfile
===================================================================
--- trunk/dports/graphics/wxWidgets-3.0/Portfile	2013-08-30 18:08:37 UTC (rev 110365)
+++ trunk/dports/graphics/wxWidgets-3.0/Portfile	2013-08-30 18:18:10 UTC (rev 110366)
@@ -20,10 +20,6 @@
 } elseif {$subport == "wxPython-3.0"} {
     wxWidgets.use   wxPython-3.0
     version         2.9.4
-    revision            1
-    set wxpythonsubset wxPython-2.9.4.0-MacPorts-subset
-    # temporary patch for 2.9.4 only; already integrated into 2.9.5
-    patchfiles-append patch-include-wx-math.h.diff
 } elseif {$subport == "wxgtk-3.0"} {
     # with satisfactory Cocoa support there is no real need for GTK-based wxWidgets any more
     # wxgtk-3.0 is here mainly for testing purposes
@@ -102,10 +98,13 @@
                     --with-macosx-version-min=no
 
 if {$subport == "wxPython-3.0"} {
+    set wxpythonsubset      wxPython-2.9.4.0-MacPorts-subset
     distfiles-append        ${wxpythonsubset}${extract.suffix}:trac
 
     # patch-src-osx-cocoa-window.mm.diff: http://trac.wxwidgets.org/changeset/72195 (only needed for 2.9.4)
-    patchfiles-append       patch-src-osx-cocoa-window.mm.diff
+    # patch-include-wx-math.h.diff:       http://trac.wxwidgets.org/changeset/74456 (only needed for 2.9.4)
+    patchfiles-append       patch-src-osx-cocoa-window.mm.diff \
+                            patch-include-wx-math.h.diff
 
     description             wxWidgets ${branch} for the wxPython distribution
     long_description        The port installs wxWidgets ${branch} for wxPython \

Modified: trunk/dports/graphics/wxWidgets-3.0/files/patch-include-wx-math.h.diff
===================================================================
--- trunk/dports/graphics/wxWidgets-3.0/files/patch-include-wx-math.h.diff	2013-08-30 18:08:37 UTC (rev 110365)
+++ trunk/dports/graphics/wxWidgets-3.0/files/patch-include-wx-math.h.diff	2013-08-30 18:18:10 UTC (rev 110366)
@@ -1,11 +1,17 @@
---- include/wx/math.h.orig	2013-08-29 12:45:25.000000000 -0400
-+++ include/wx/math.h	2013-08-29 12:45:40.000000000 -0400
-@@ -62,7 +62,7 @@
+Upstream: http://trac.wxwidgets.org/changeset/74456
+--- include/wx/math.h (revision 73280)
++++ include/wx/math.h (revision 74456)
+@@ -62,7 +62,12 @@
          add more compilers with C99 support here: using C99 isfinite() is
          preferable to using BSD-ish finite()
       */
 -    #define wxFinite(x) isfinite(x)
-+    #define wxFinite(x) std::isfinite(x)
++    #if defined(_GLIBCXX_CMATH) || defined(_LIBCPP_CMATH)
++        // these <cmath> headers #undef isfinite
++        #define wxFinite(x) std::isfinite(x)
++    #else
++        #define wxFinite(x) isfinite(x)
++    #endif
  #elif ( defined(__GNUG__)||defined(__GNUWIN32__)||defined(__DJGPP__)|| \
        defined(__SGI_CC__)||defined(__SUNCC__)||defined(__XLC__)|| \
        defined(__HPUX__) ) && ( !defined(wxOSX_USE_IPHONE) || wxOSX_USE_IPHONE == 0 )
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130830/9a8f517d/attachment-0001.html>