[121081] trunk/dports/graphics/wxWidgets-3.0
mojca at macports.org
mojca at macports.org
Tue Jun 17 01:29:21 PDT 2014
Revision: 121081
https://trac.macports.org/changeset/121081
Author: mojca at macports.org
Date: 2014-06-17 01:29:21 -0700 (Tue, 17 Jun 2014)
Log Message:
-----------
wxWidgets-3.0: upgrade to 3.0.1 (#44031)
Modified Paths:
--------------
trunk/dports/graphics/wxWidgets-3.0/Portfile
trunk/dports/graphics/wxWidgets-3.0/files/patch-sdl.diff
Modified: trunk/dports/graphics/wxWidgets-3.0/Portfile
===================================================================
--- trunk/dports/graphics/wxWidgets-3.0/Portfile 2014-06-17 08:01:03 UTC (rev 121080)
+++ trunk/dports/graphics/wxWidgets-3.0/Portfile 2014-06-17 08:29:21 UTC (rev 121081)
@@ -9,9 +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,6 +20,7 @@
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,8 +55,8 @@
dist_subdir ${distname}/${version}
checksums ${distname}-${version}${extract.suffix} \
- rmd160 6113a95125b743309c7b21dd5530f4b675b8b82f \
- sha256 ff340539bcb6e45d8dbce848d3c13ebce34da6ffb9004a0a88e9541bec45bf85
+ rmd160 d4cfb25a5e15f9238addd48a98faf5a525d8fb5c \
+ sha256 bd671b79ec56af8fb3844e11cafceac1a4276fb02c79404d06b91b6c19d2c5f5
depends_lib port:jpeg \
port:tiff \
@@ -75,13 +76,6 @@
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,10 +108,21 @@
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,9 +131,9 @@
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
+ # 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
Modified: trunk/dports/graphics/wxWidgets-3.0/files/patch-sdl.diff
===================================================================
--- trunk/dports/graphics/wxWidgets-3.0/files/patch-sdl.diff 2014-06-17 08:01:03 UTC (rev 121080)
+++ trunk/dports/graphics/wxWidgets-3.0/files/patch-sdl.diff 2014-06-17 08:29:21 UTC (rev 121081)
@@ -2,7 +2,7 @@
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 at __WEBVIEW_SRC_PLATFORM_OBJECTS = monodll_webview_ie.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2 at __AUI_GTK_SRC_OBJECTS \
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ = monodll_tabartgtk.o
@@ -13,7 +13,7 @@
@COND_PLATFORM_WIN32_1 at __monodll___win32rc = monodll_version_rc.o
@COND_USE_STC_1 at __wxscintilla_library_link_DEP = $(__wxscintilla___depname)
@COND_USE_STC_1 at __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 at __WEBVIEW_SRC_PLATFORM_OBJECTS_1 = monolib_webview_ie.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2 at __AUI_GTK_SRC_OBJECTS_1 \
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ = monolib_tabartgtk.o
@@ -24,7 +24,7 @@
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 at __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 at __ADVANCED_UNIV_SRC_OBJECTS_2 = advdll_animateg.o
@COND_TOOLKIT_WINCE at __ADVANCED_UNIV_SRC_OBJECTS_2 = advdll_animateg.o
@COND_TOOLKIT_X11 at __ADVANCED_UNIV_SRC_OBJECTS_2 = advdll_animateg.o
@@ -35,7 +35,7 @@
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 at __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 at __ADVANCED_UNIV_SRC_OBJECTS_3 = advlib_animateg.o
@COND_TOOLKIT_WINCE at __ADVANCED_UNIV_SRC_OBJECTS_3 = advlib_animateg.o
@COND_TOOLKIT_X11 at __ADVANCED_UNIV_SRC_OBJECTS_3 = advlib_animateg.o
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140617/41df25aa/attachment-0001.html>
More information about the macports-changes
mailing list