<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[121081] trunk/dports/graphics/wxWidgets-3.0</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/121081">121081</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2014-06-17 01:29:21 -0700 (Tue, 17 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>wxWidgets-3.0: upgrade to 3.0.1 (#44031)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicswxWidgets30Portfile">trunk/dports/graphics/wxWidgets-3.0/Portfile</a></li>
<li><a href="#trunkdportsgraphicswxWidgets30filespatchsdldiff">trunk/dports/graphics/wxWidgets-3.0/files/patch-sdl.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgraphicswxWidgets30Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/wxWidgets-3.0/Portfile (121080 => 121081)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -9,9 +9,9 @@
</span><span class="cx"> name wxWidgets-3.0
</span><span class="cx"> subport wxPython-3.0 {}
</span><span class="cx"> subport wxgtk-3.0 {}
</span><del>-version 3.0.0
</del><ins>+version 3.0.1
</ins><span class="cx"> set wxpython_ver 3.0.0.0
</span><del>-revision 5
</del><ins>+# when revbumping remember to change the revision also for wxPython-3.0
</ins><span class="cx">
</span><span class="cx"> set installname wxWidgets
</span><span class="cx"> set wxtype osx_cocoa
</span><span class="lines">@@ -20,6 +20,7 @@
</span><span class="cx"> wxWidgets.use wxWidgets-3.0
</span><span class="cx"> } elseif {${subport} eq "wxPython-3.0"} {
</span><span class="cx"> wxWidgets.use wxPython-3.0
</span><ins>+ version 3.0.0
</ins><span class="cx"> revision 0
</span><span class="cx"> } elseif {${subport} eq "wxgtk-3.0"} {
</span><span class="cx"> # with satisfactory Cocoa support there is no real need for GTK-based wxWidgets any more
</span><span class="lines">@@ -54,8 +55,8 @@
</span><span class="cx"> dist_subdir ${distname}/${version}
</span><span class="cx">
</span><span class="cx"> checksums ${distname}-${version}${extract.suffix} \
</span><del>- rmd160 6113a95125b743309c7b21dd5530f4b675b8b82f \
- sha256 ff340539bcb6e45d8dbce848d3c13ebce34da6ffb9004a0a88e9541bec45bf85
</del><ins>+ rmd160 d4cfb25a5e15f9238addd48a98faf5a525d8fb5c \
+ sha256 bd671b79ec56af8fb3844e11cafceac1a4276fb02c79404d06b91b6c19d2c5f5
</ins><span class="cx">
</span><span class="cx"> depends_lib port:jpeg \
</span><span class="cx"> port:tiff \
</span><span class="lines">@@ -75,13 +76,6 @@
</span><span class="cx">
</span><span class="cx"> patchfiles-append patch-configure.diff
</span><span class="cx">
</span><del>-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
-}
-
</del><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s|@@PREFIX@@|${prefix}|g" ${patch.dir}/configure
</span><span class="cx"> }
</span><span class="lines">@@ -114,10 +108,21 @@
</span><span class="cx"> to guarantee compatibility even when the upstream versions \
</span><span class="cx"> of wxWidgets and wxPython differ.
</span><span class="cx">
</span><ins>+ checksums ${distname}-${version}${extract.suffix} \
+ rmd160 6113a95125b743309c7b21dd5530f4b675b8b82f \
+ sha256 ff340539bcb6e45d8dbce848d3c13ebce34da6ffb9004a0a88e9541bec45bf85
+
</ins><span class="cx"> checksums-append ${wxpythonsubset}${extract.suffix} \
</span><span class="cx"> rmd160 d3915cf55d6d8244515794ebf2316d151d69ba68 \
</span><span class="cx"> sha256 b9377c6917c3a393ab9b190e1d558e4c5b80b13b435b93e11aad748f4d57bf61
</span><span class="cx">
</span><ins>+ # 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
+ }
+
</ins><span class="cx"> post-destroot {
</span><span class="cx"> # copy a subset of wxPython to wxWidgets to prevent a conflict
</span><span class="cx"> # between py2X-wxpython-3.0 and py2Y-wxpython-3.0
</span><span class="lines">@@ -126,9 +131,9 @@
</span><span class="cx">
</span><span class="cx"> livecheck.type none
</span><span class="cx"> } elseif {${subport} eq "wxgtk-3.0"} {
</span><del>- # both patches could be added to wxWidgets-3.0, but they are not needed for Cocoa
</del><ins>+ # patch could be added to wxWidgets-3.0, but it is not needed for Cocoa
</ins><span class="cx"> #
</span><del>- # patch-sdl.diff: the patch allows using --wxth-sdl
</del><ins>+ # patch-sdl.diff: the patch allows using --with-sdl
</ins><span class="cx"> patchfiles-append patch-sdl.diff
</span><span class="cx">
</span><span class="cx"> depends_build-append port:pkgconfig
</span></span></pre></div>
<a id="trunkdportsgraphicswxWidgets30filespatchsdldiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/wxWidgets-3.0/files/patch-sdl.diff (121080 => 121081)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> http://trac.wxwidgets.org/ticket/15453
</span><span class="cx"> --- Makefile.in.orig
</span><span class="cx"> +++ Makefile.in
</span><del>-@@ -6725,8 +6725,8 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_1 = \
</del><ins>+@@ -6752,8 +6752,8 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_1 = \
</ins><span class="cx"> @COND_TOOLKIT_MSW@__WEBVIEW_SRC_PLATFORM_OBJECTS = monodll_webview_ie.o
</span><span class="cx"> @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__AUI_GTK_SRC_OBJECTS \
</span><span class="cx"> @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ = monodll_tabartgtk.o
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> @COND_PLATFORM_WIN32_1@__monodll___win32rc = monodll_version_rc.o
</span><span class="cx"> @COND_USE_STC_1@__wxscintilla_library_link_DEP = $(__wxscintilla___depname)
</span><span class="cx"> @COND_USE_STC_1@__wxscintilla_library_link_LIBR = -L$(LIBDIRNAME)
</span><del>-@@ -8975,8 +8975,8 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_3 = \
</del><ins>+@@ -9006,8 +9006,8 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_3 = \
</ins><span class="cx"> @COND_TOOLKIT_MSW@__WEBVIEW_SRC_PLATFORM_OBJECTS_1 = monolib_webview_ie.o
</span><span class="cx"> @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__AUI_GTK_SRC_OBJECTS_1 \
</span><span class="cx"> @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ = monolib_tabartgtk.o
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> COND_MONOLITHIC_0_SHARED_1___basedll___depname = \
</span><span class="cx"> $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
</span><span class="cx"> @COND_MONOLITHIC_0_SHARED_1@__basedll___depname = $(COND_MONOLITHIC_0_SHARED_1___basedll___depname)
</span><del>-@@ -13114,8 +13114,8 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_5 = \
</del><ins>+@@ -13153,8 +13153,8 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_5 = \
</ins><span class="cx"> @COND_TOOLKIT_MSW@__ADVANCED_UNIV_SRC_OBJECTS_2 = advdll_animateg.o
</span><span class="cx"> @COND_TOOLKIT_WINCE@__ADVANCED_UNIV_SRC_OBJECTS_2 = advdll_animateg.o
</span><span class="cx"> @COND_TOOLKIT_X11@__ADVANCED_UNIV_SRC_OBJECTS_2 = advdll_animateg.o
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname = \
</span><span class="cx"> $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
</span><span class="cx"> @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__advlib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname)
</span><del>-@@ -13427,8 +13427,8 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_7 = \
</del><ins>+@@ -13466,8 +13466,8 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_7 = \
</ins><span class="cx"> @COND_TOOLKIT_MSW@__ADVANCED_UNIV_SRC_OBJECTS_3 = advlib_animateg.o
</span><span class="cx"> @COND_TOOLKIT_WINCE@__ADVANCED_UNIV_SRC_OBJECTS_3 = advlib_animateg.o
</span><span class="cx"> @COND_TOOLKIT_X11@__ADVANCED_UNIV_SRC_OBJECTS_3 = advlib_animateg.o
</span></span></pre>
</div>
</div>
</body>
</html>