Ticket #44031: wxWidgets-3.0.1.diff

Portfile

@@ -9 +9 @@
 name                wxWidgets-3.0
 subport             wxPython-3.0 {}
 subport             wxgtk-3.0 {}
-version             3.0.0
+version             3.0.1
 set wxpython_ver    3.0.0.0
-revision            5
+# when revbumping remember to change the revision also for wxPython-3.0
 
 set installname     wxWidgets
 set wxtype          osx_cocoa
@@ -20 +20 @@
     wxWidgets.use   wxWidgets-3.0
 } elseif {${subport} eq "wxPython-3.0"} {
     wxWidgets.use   wxPython-3.0
+    version         3.0.0
     revision        0
 } elseif {${subport} eq "wxgtk-3.0"} {
     # with satisfactory Cocoa support there is no real need for GTK-based wxWidgets any more
@@ -54 +55 @@
 dist_subdir         ${distname}/${version}
 
 checksums           ${distname}-${version}${extract.suffix} \
-                    rmd160  6113a95125b743309c7b21dd5530f4b675b8b82f \
-                    sha256  ff340539bcb6e45d8dbce848d3c13ebce34da6ffb9004a0a88e9541bec45bf85
+                    rmd160  d4cfb25a5e15f9238addd48a98faf5a525d8fb5c \
+                    sha256  bd671b79ec56af8fb3844e11cafceac1a4276fb02c79404d06b91b6c19d2c5f5
 
 depends_lib         port:jpeg \
                     port:tiff \
@@ -75 +76 @@
 
 patchfiles-append   patch-configure.diff
 
-if {${os.major} >= 10} {
-    # the patch doesn't work on 10.5, but it's still better to have working wxWidgets with a flaw
-    # than not bing able to compile it at all
-    patchfiles-append \
-                    patch-src-osx-cocoa-utils.mm.diff
-}
-
 post-patch {
     reinplace "s|@@PREFIX@@|${prefix}|g" ${patch.dir}/configure
 }
@@ -114 +108 @@
                             to guarantee compatibility even when the upstream versions \
                             of wxWidgets and wxPython differ.
 
+    checksums               ${distname}-${version}${extract.suffix} \
+                            rmd160  6113a95125b743309c7b21dd5530f4b675b8b82f \
+                            sha256  ff340539bcb6e45d8dbce848d3c13ebce34da6ffb9004a0a88e9541bec45bf85
+
     checksums-append        ${wxpythonsubset}${extract.suffix} \
                             rmd160  d3915cf55d6d8244515794ebf2316d151d69ba68 \
                             sha256  b9377c6917c3a393ab9b190e1d558e4c5b80b13b435b93e11aad748f4d57bf61
 
+    # remove this patch in wxPython 3.0.1.0
+    if {${os.major} >= 10} {
+        # the patch doesn't work on 10.5, but it's still better to have working wxWidgets with a flaw
+        # than not being able to compile it at all
+        patchfiles-append   patch-src-osx-cocoa-utils.mm.diff
+    }
+
     post-destroot {
         # copy a subset of wxPython to wxWidgets to prevent a conflict
         # between py2X-wxpython-3.0 and py2Y-wxpython-3.0
@@ -126 +131 @@
 
     livecheck.type          none
 } elseif {${subport} eq "wxgtk-3.0"} {
-    # both patches could be added to wxWidgets-3.0, but they are not needed for Cocoa
+    # the patch could be added to wxWidgets-3.0, but it is not needed for Cocoa
     #
-    # patch-sdl.diff: the patch allows using --wxth-sdl
+    # patch-sdl.diff: the patch allows using --with-sdl
     patchfiles-append       patch-sdl.diff
 
     depends_build-append    port:pkgconfig

files/patch-sdl.diff

@@ -2 +2 @@
 http://trac.wxwidgets.org/ticket/15453
 --- Makefile.in.orig
 +++ Makefile.in
-@@ -6725,8 +6725,8 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_1 =  \
+@@ -6752,8 +6752,8 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_1 =  \
  @COND_TOOLKIT_MSW@__WEBVIEW_SRC_PLATFORM_OBJECTS = monodll_webview_ie.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__AUI_GTK_SRC_OBJECTS \
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   = monodll_tabartgtk.o
@@ -13 +13 @@
  @COND_PLATFORM_WIN32_1@__monodll___win32rc = monodll_version_rc.o
  @COND_USE_STC_1@__wxscintilla_library_link_DEP = $(__wxscintilla___depname)
  @COND_USE_STC_1@__wxscintilla_library_link_LIBR = -L$(LIBDIRNAME)
-@@ -8975,8 +8975,8 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_3 =  \
+@@ -9006,8 +9006,8 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_3 =  \
  @COND_TOOLKIT_MSW@__WEBVIEW_SRC_PLATFORM_OBJECTS_1 = monolib_webview_ie.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__AUI_GTK_SRC_OBJECTS_1 \
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   = monolib_tabartgtk.o
@@ -24 +24 @@
  COND_MONOLITHIC_0_SHARED_1___basedll___depname = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1@__basedll___depname = $(COND_MONOLITHIC_0_SHARED_1___basedll___depname)
-@@ -13114,8 +13114,8 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_5 =  \
+@@ -13153,8 +13153,8 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_5 =  \
  @COND_TOOLKIT_MSW@__ADVANCED_UNIV_SRC_OBJECTS_2 = advdll_animateg.o
  @COND_TOOLKIT_WINCE@__ADVANCED_UNIV_SRC_OBJECTS_2 = advdll_animateg.o
  @COND_TOOLKIT_X11@__ADVANCED_UNIV_SRC_OBJECTS_2 = advdll_animateg.o
@@ -35 +35 @@
  COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname = \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__advlib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname)
-@@ -13427,8 +13427,8 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_7 =  \
+@@ -13466,8 +13466,8 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_7 =  \
  @COND_TOOLKIT_MSW@__ADVANCED_UNIV_SRC_OBJECTS_3 = advlib_animateg.o
  @COND_TOOLKIT_WINCE@__ADVANCED_UNIV_SRC_OBJECTS_3 = advlib_animateg.o
  @COND_TOOLKIT_X11@__ADVANCED_UNIV_SRC_OBJECTS_3 = advlib_animateg.o