<!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>[120942] trunk/dports/www/FileZilla</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/120942">120942</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2014-06-12 05:19:32 -0700 (Thu, 12 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>FileZilla: upgrade to 3.8.1 (last release without official wxWidgets 3.0 support, #43969)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportswwwFileZillaPortfile">trunk/dports/www/FileZilla/Portfile</a></li>
<li><a href="#trunkdportswwwFileZillafilespatchwxWidgets30diff">trunk/dports/www/FileZilla/files/patch-wxWidgets-3.0.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportswwwFileZillaPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/www/FileZilla/Portfile (120941 => 120942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/FileZilla/Portfile 2014-06-12 08:59:03 UTC (rev 120941)
+++ trunk/dports/www/FileZilla/Portfile 2014-06-12 12:19:32 UTC (rev 120942)
</span><span class="lines">@@ -5,8 +5,7 @@
</span><span class="cx"> PortGroup wxWidgets 1.0
</span><span class="cx">
</span><span class="cx"> name FileZilla
</span><del>-version 3.8.0
-revision 1
</del><ins>+version 3.8.1
</ins><span class="cx"> categories www aqua
</span><span class="cx"> platforms darwin
</span><span class="cx"> maintainers strasweb.fr:rudloff openmaintainer
</span><span class="lines">@@ -21,8 +20,8 @@
</span><span class="cx"> homepage https://filezilla-project.org/
</span><span class="cx"> master_sites sourceforge:project/filezilla/FileZilla_Client/${version}
</span><span class="cx">
</span><del>-checksums rmd160 f161795774b03bbce8720e40ddff6a5ca6d4fe9a \
- sha256 8d9c1c9812f916f83676e1930933683828579b40a9fba331c4757f84a02ec308
</del><ins>+checksums rmd160 6a1692fc1b6ca73b878d8b9c2dd147b1885cacf0 \
+ sha256 66bc9c082843ffdcb915c7902900b92bdf921ed7310f2a40ff6b96b03cfa1e4f
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportswwwFileZillafilespatchwxWidgets30diff"></a>
<div class="modfile"><h4>Modified: trunk/dports/www/FileZilla/files/patch-wxWidgets-3.0.diff (120941 => 120942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/FileZilla/files/patch-wxWidgets-3.0.diff 2014-06-12 08:59:03 UTC (rev 120941)
+++ trunk/dports/www/FileZilla/files/patch-wxWidgets-3.0.diff 2014-06-12 12:19:32 UTC (rev 120942)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx">
</span><span class="cx"> --- configure.orig
</span><span class="cx"> +++ configure
</span><del>-@@ -692,6 +692,9 @@ PACKAGE_VERSION_MAJOR
</del><ins>+@@ -691,6 +691,9 @@ PACKAGE_VERSION_MAJOR
</ins><span class="cx"> WINDRESFLAGS
</span><span class="cx"> WINDRES
</span><span class="cx"> WX_CONFIG_WITH_ARGS
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx"> WX_RESCOMP
</span><span class="cx"> WX_VERSION
</span><span class="cx"> WX_LIBS_STATIC
</span><del>-@@ -15987,7 +15990,7 @@ $as_echo_n "checking for wxWidgets version >= $min_wx_version... " >&6; }
</del><ins>+@@ -16042,7 +16045,7 @@ $as_echo_n "checking for wxWidgets version >= $min_wx_version... " >&6; }
</ins><span class="cx"> $as_echo_n "checking for wxWidgets version >= $min_wx_version (--unicode=yes --universal=no)... " >&6; }
</span><span class="cx"> fi
</span><span class="cx">
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx">
</span><span class="cx"> WX_VERSION=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null`
</span><span class="cx"> wx_config_major_version=`echo $WX_VERSION | \
</span><del>-@@ -16026,14 +16029,13 @@ $as_echo_n "checking for wxWidgets version >= $min_wx_version (--unicode=yes --u
</del><ins>+@@ -16081,14 +16084,13 @@ $as_echo_n "checking for wxWidgets version >= $min_wx_version (--unicode=yes --u
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> if test -n "$wx_ver_ok"; then
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> if test "x$WX_LIBS_STATIC" = "x"; then
</span><span class="cx"> { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span><span class="cx"> $as_echo "no" >&6; }
</span><del>-@@ -16076,16 +16078,16 @@ $as_echo "yes" >&6; }
</del><ins>+@@ -16131,16 +16133,16 @@ $as_echo "yes" >&6; }
</ins><span class="cx"> fi
</span><span class="cx">
</span><span class="cx"> if test "x$wx_has_cppflags" = x ; then
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx">
</span><span class="cx"> WX_CFLAGS_ONLY=`echo $WX_CFLAGS | sed "s@^$WX_CPPFLAGS *@@"`
</span><span class="cx"> WX_CXXFLAGS_ONLY=`echo $WX_CXXFLAGS | sed "s@^$WX_CFLAGS *@@"`
</span><del>-@@ -16109,7 +16111,32 @@ $as_echo "no (version $WX_VERSION is not new enough)" >&6; }
</del><ins>+@@ -16164,7 +16166,32 @@ $as_echo "no (version $WX_VERSION is not new enough)" >&6; }
</ins><span class="cx"> WX_LIBS=""
</span><span class="cx"> WX_LIBS_STATIC=""
</span><span class="cx"> WX_RESCOMP=""
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx">
</span><span class="cx"> fi
</span><span class="cx"> else
</span><del>-@@ -16135,6 +16162,13 @@ $as_echo "no (version $WX_VERSION is not new enough)" >&6; }
</del><ins>+@@ -16190,6 +16217,13 @@ $as_echo "no (version $WX_VERSION is not new enough)" >&6; }
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> if test "$wxWin" != 1; then
</span><span class="cx"> as_fn_error $? "
</span><span class="cx"> wxWidgets must be installed on your system
</span><del>-@@ -16150,9 +16184,6 @@ $as_echo "no (version $WX_VERSION is not new enough)" >&6; }
</del><ins>+@@ -16205,9 +16239,6 @@ $as_echo "no (version $WX_VERSION is not new enough)" >&6; }
</ins><span class="cx"> equivalent variable and wxWidgets version is $MIN_WX_VERSION or above.
</span><span class="cx"> " "$LINENO" 5
</span><span class="cx"> fi
</span><span class="lines">@@ -317,7 +317,7 @@
</span><span class="cx">
</span><span class="cx"> --- src/engine/serverpath.cpp.orig
</span><span class="cx"> +++ src/engine/serverpath.cpp
</span><del>-@@ -272,8 +272,13 @@ wxString CServerPath::GetSafePath() const
</del><ins>+@@ -258,8 +258,13 @@ wxString CServerPath::GetSafePath() const
</ins><span class="cx"> len += iter->Length() + 2 + INTLENGTH;
</span><span class="cx">
</span><span class="cx"> wxString safepath;
</span><span class="lines">@@ -331,7 +331,7 @@
</span><span class="cx">
</span><span class="cx"> t = fast_sprint_number(t, m_type);
</span><span class="cx"> *(t++) = ' ';
</span><del>-@@ -295,8 +300,11 @@ wxString CServerPath::GetSafePath() const
</del><ins>+@@ -281,8 +286,11 @@ wxString CServerPath::GetSafePath() const
</ins><span class="cx"> t += iter->size();
</span><span class="cx"> }
</span><span class="cx"> *t = 0;
</span><span class="lines">@@ -346,7 +346,7 @@
</span><span class="cx"> return safepath;
</span><span class="cx"> --- src/engine/socket.cpp.orig
</span><span class="cx"> +++ src/engine/socket.cpp
</span><del>-@@ -1298,7 +1298,7 @@ void CSocket::SetEventHandler(CSocketEventHandler* pEvtHandler)
</del><ins>+@@ -1187,7 +1187,7 @@ void CSocket::SetEventHandler(CSocketEventHandler* pEvtHandler)
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -360,7 +360,7 @@
</span><span class="cx"> @@ -67,7 +67,11 @@ struct fast_equal
</span><span class="cx"> {
</span><span class="cx"> // wxString is CoW, yet it doesn't even do this fast pointer
</span><del>- // comparison in it's less and/or equal operator(s).
</del><ins>+ // comparison in its less and/or equal operator(s).
</ins><span class="cx"> +#if wxCHECK_VERSION(2, 9, 0)
</span><span class="cx"> + return lhs == rhs;
</span><span class="cx"> +#else
</span><span class="lines">@@ -393,7 +393,7 @@
</span><span class="cx"> wxMessageBoxEx(wxString::Format(_("Failed to set language to %s (%s), using default system language"), pInfo->Description.c_str(), language.c_str()), _("Failed to change language"), wxICON_EXCLAMATION);
</span><span class="cx"> else
</span><span class="cx"> wxMessageBoxEx(wxString::Format(_("Failed to set language to %s, using default system language"), language.c_str()), _("Failed to change language"), wxICON_EXCLAMATION);
</span><del>-@@ -689,7 +689,7 @@ void CFileZillaApp::CheckExistsFzsftp()
</del><ins>+@@ -694,7 +694,7 @@ void CFileZillaApp::CheckExistsFzsftp()
</ins><span class="cx"> if (!wxFileName::FileExists(executable))
</span><span class="cx"> {
</span><span class="cx"> wxMessageBoxEx(wxString::Format(_("%s could not be found. Without this component of FileZilla, SFTP will not work.\n\nPlease download FileZilla again. If this problem persists, please submit a bug report."), executable.c_str()),
</span><span class="lines">@@ -451,7 +451,7 @@
</span><span class="cx"> }
</span><span class="cx"> --- src/interface/QueueView.cpp.orig
</span><span class="cx"> +++ src/interface/QueueView.cpp
</span><del>-@@ -3451,9 +3451,13 @@ wxString CQueueView::ReplaceInvalidCharacters(const wxString& filename)
</del><ins>+@@ -3443,9 +3443,13 @@ wxString CQueueView::ReplaceInvalidCharacters(const wxString& filename)
</ins><span class="cx"> const wxChar replace = COptions::Get()->GetOption(OPTION_INVALID_CHAR_REPLACE)[0];
</span><span class="cx">
</span><span class="cx"> wxString result;
</span><span class="lines">@@ -466,7 +466,7 @@
</span><span class="cx">
</span><span class="cx"> const wxChar* p = filename.c_str();
</span><span class="cx"> while (*p)
</span><del>-@@ -3488,9 +3492,11 @@ wxString CQueueView::ReplaceInvalidCharacters(const wxString& filename)
</del><ins>+@@ -3480,9 +3484,11 @@ wxString CQueueView::ReplaceInvalidCharacters(const wxString& filename)
</ins><span class="cx"> p++;
</span><span class="cx"> }
</span><span class="cx"> *buf = 0;
</span><span class="lines">@@ -482,7 +482,7 @@
</span><span class="cx">
</span><span class="cx"> --- src/interface/RemoteTreeView.cpp.orig
</span><span class="cx"> +++ src/interface/RemoteTreeView.cpp
</span><del>-@@ -350,7 +350,7 @@ void CRemoteTreeView::SetDirectoryListing(const CSharedPointer<const CDirectoryL
</del><ins>+@@ -351,7 +351,7 @@ void CRemoteTreeView::SetDirectoryListing(const CSharedPointer<const CDirectoryL
</ins><span class="cx"> SetItemImages(parent, false);
</span><span class="cx">
</span><span class="cx"> #ifndef __WXMSW__
</span><span class="lines">@@ -790,8 +790,8 @@
</span><span class="cx"> }
</span><span class="cx"> else
</span><span class="cx"> event.Skip();
</span><del>---- src/interface/resources/settings.xrc.orig
-+++ src/interface/resources/settings.xrc
</del><ins>+--- src/interface/resources/xrc/settings.xrc.orig
++++ src/interface/resources/xrc/settings.xrc
</ins><span class="cx"> @@ -427,7 +427,7 @@
</span><span class="cx"> </object>
</span><span class="cx"> <cols>1</cols>
</span><span class="lines">@@ -813,7 +813,7 @@
</span><span class="cx"> </object>
</span><span class="cx"> <vgap>5</vgap>
</span><span class="cx"> <growablecols>0</growablecols>
</span><del>-@@ -1368,7 +1368,7 @@
</del><ins>+@@ -1393,7 +1393,7 @@
</ins><span class="cx"> <object class="sizeritem">
</span><span class="cx"> <object class="wxFlexGridSizer">
</span><span class="cx"> <cols>2</cols>
</span><span class="lines">@@ -822,7 +822,7 @@
</span><span class="cx"> <object class="sizeritem">
</span><span class="cx"> <object class="wxStaticText">
</span><span class="cx"> <label>&amp;Theme:</label>
</span><del>-@@ -2080,7 +2080,6 @@
</del><ins>+@@ -2105,7 +2105,6 @@
</ins><span class="cx"> </object>
</span><span class="cx"> <growablecols>1</growablecols>
</span><span class="cx"> </object>
</span></span></pre>
</div>
</div>
</body>
</html>