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

[mojca at macports.org]

Revision: 113320
          https://trac.macports.org/changeset/113320
Author:   mojca at macports.org
Date:     2013-11-13 07:56:03 -0800 (Wed, 13 Nov 2013)
Log Message:
-----------
wxWidgets-3.0: upgrade from 3.0.0-rc2 to 3.0.0

Modified Paths:
--------------
    trunk/dports/graphics/wxWidgets-3.0/Portfile
    trunk/dports/graphics/wxWidgets-3.0/files/patch-upstream-nonbundled.diff

Modified: trunk/dports/graphics/wxWidgets-3.0/Portfile
===================================================================
--- trunk/dports/graphics/wxWidgets-3.0/Portfile	2013-11-13 15:49:46 UTC (rev 113319)
+++ trunk/dports/graphics/wxWidgets-3.0/Portfile	2013-11-13 15:56:03 UTC (rev 113320)
@@ -10,8 +10,7 @@
 subport             wxPython-3.0 {}
 subport             wxgtk-3.0 {}
 version             3.0.0
-set version_rc      ${version}-rc2
-revision            3
+revision            4
 
 set installname     wxWidgets
 set wxtype          osx_cocoa
@@ -21,7 +20,6 @@
 } elseif {$subport == "wxPython-3.0"} {
     wxWidgets.use   wxPython-3.0
     version         2.9.5
-    set version_rc  ${version}
     revision        1
 } elseif {$subport == "wxgtk-3.0"} {
     # with satisfactory Cocoa support there is no real need for GTK-based wxWidgets any more
@@ -46,20 +44,19 @@
 
 homepage            http://www.wxwidgets.org/
 distname            wxWidgets
-master_sites        sourceforge:project/wxwindows/${version_rc} \
-                    http://biolpc22.york.ac.uk/pub/${version_rc}/ \
+master_sites        sourceforge:project/wxwindows/${version} \
+                    http://biolpc22.york.ac.uk/pub/${version}/ \
                     http://trac.macports.org/raw-attachment/ticket/19190/:trac
 
 use_bzip2           yes
 
-distfiles           ${distname}-${version_rc}${extract.suffix}
+distfiles           ${distname}-${version}${extract.suffix}
 dist_subdir         ${distname}/${version}
 
-checksums           ${distname}-${version_rc}${extract.suffix} \
-                    rmd160  93cfa8063855dda9c5b5ed44990bdab35fbbdb35 \
-                    sha256  dd052c773253953a9eef76b8acc88fef3a79e77b9625611a2867d05638c7e2c5
+checksums           ${distname}-${version}${extract.suffix} \
+                    rmd160  6113a95125b743309c7b21dd5530f4b675b8b82f \
+                    sha256  ff340539bcb6e45d8dbce848d3c13ebce34da6ffb9004a0a88e9541bec45bf85
 
-
 depends_lib         port:jpeg \
                     port:tiff \
                     port:libpng \
@@ -72,11 +69,12 @@
 select.group        wxWidgets
 select.file         ${filespath}/${subport}
 
-worksrcdir          ${distname}-${version_rc}/build
+worksrcdir          ${distname}-${version}/build
 
 patch.dir           ${worksrcpath}/..
 
-patchfiles-append   patch-configure.diff
+patchfiles-append   patch-configure.diff \
+                    patch-upstream-nonbundled.diff
 
 post-patch {
     reinplace "s|@@PREFIX@@|${prefix}|g" ${patch.dir}/configure
@@ -117,7 +115,8 @@
                             rmd160  936858d5856adde043d107164b1b53d3209eb76d \
                             sha256  c892f257b151726a70886c7cffda51554b48b8e9cc7cfcc962d6988c5fe81856
 
-    patchfiles-delete       patch-configure.diff
+    patchfiles-delete       patch-configure.diff \
+                            patch-upstream-nonbundled.diff
     patchfiles-append       patch-configure295.diff \
                             patch-upstream-src-osx-cocoa-textctrl.mm.diff \
                             patch-upstream-src-osx-cocoa-window.mm.diff

Modified: trunk/dports/graphics/wxWidgets-3.0/files/patch-upstream-nonbundled.diff
===================================================================
--- trunk/dports/graphics/wxWidgets-3.0/files/patch-upstream-nonbundled.diff	2013-11-13 15:49:46 UTC (rev 113319)
+++ trunk/dports/graphics/wxWidgets-3.0/files/patch-upstream-nonbundled.diff	2013-11-13 15:56:03 UTC (rev 113320)
@@ -1,18 +1,5 @@
 http://trac.wxwidgets.org/changeset/75142
 
---- include/wx/osx/app.h.orig
-+++ include/wx/osx/app.h
-@@ -143,6 +143,10 @@ public:
-     virtual void         MacNewFile() ;
-     // in response of a reopen-application apple event
-     virtual void         MacReopenApp() ;
-+
-+    // override this to return false from a non-bundled console app in order to stay in background ...
-+    virtual bool         OSXIsGUIApplication() { return true; }
-+
- #if wxOSX_USE_COCOA_OR_IPHONE
-     // immediately before the native event loop launches
-     virtual void         OSXOnWillFinishLaunching();
 --- src/osx/cocoa/utils.mm.orig
 +++ src/osx/cocoa/utils.mm
 @@ -255,6 +255,50 @@ void wxBell()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131113/2534e4ed/attachment.html>