<!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>[120490] 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/120490">120490</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2014-05-30 02:21:54 -0700 (Fri, 30 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>FileZilla: upgrade to 3.8.0</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>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportswwwFileZillafilespatchsrcdbuswxdbusconnectioncppdiff">trunk/dports/www/FileZilla/files/patch-src-dbus-wxdbusconnection.cpp.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 (120489 => 120490)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/FileZilla/Portfile 2014-05-30 05:48:12 UTC (rev 120489)
+++ trunk/dports/www/FileZilla/Portfile 2014-05-30 09:21:54 UTC (rev 120490)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> PortGroup wxWidgets 1.0
</span><span class="cx">
</span><span class="cx"> name FileZilla
</span><del>-version 3.7.4.1
</del><ins>+version 3.8.0
</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">@@ -20,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 930184fb092c44de36eed822d589ae5bd8e05f8b \
- sha256 8be46f472c12d412c58b5a0b1be751c64bc5e7fceaa6b9170f8edbc7dbfa64a9
</del><ins>+checksums rmd160 f161795774b03bbce8720e40ddff6a5ca6d4fe9a \
+ sha256 8d9c1c9812f916f83676e1930933683828579b40a9fba331c4757f84a02ec308
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig
</span><span class="cx">
</span><span class="lines">@@ -42,8 +42,7 @@
</span><span class="cx"> worksrcdir filezilla-${version}
</span><span class="cx">
</span><span class="cx"> # http://trac.filezilla-project.org/ticket/8272
</span><del>-patchfiles patch-wxWidgets-3.0.diff \
- patch-src-dbus-wxdbusconnection.cpp.diff
</del><ins>+patchfiles patch-wxWidgets-3.0.diff
</ins><span class="cx">
</span><span class="cx"> # http://trac.filezilla-project.org/ticket/5473
</span><span class="cx"> # http://sourceforge.net/p/tinyxml/patches/51/
</span></span></pre></div>
<a id="trunkdportswwwFileZillafilespatchsrcdbuswxdbusconnectioncppdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/www/FileZilla/files/patch-src-dbus-wxdbusconnection.cpp.diff (120489 => 120490)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/FileZilla/files/patch-src-dbus-wxdbusconnection.cpp.diff 2014-05-30 05:48:12 UTC (rev 120489)
+++ trunk/dports/www/FileZilla/files/patch-src-dbus-wxdbusconnection.cpp.diff 2014-05-30 09:21:54 UTC (rev 120490)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>-https://trac.macports.org/ticket/41832
-http://trac.filezilla-project.org/ticket/9269
-
---- src/dbus/wxdbusconnection.cpp.orig
-+++ src/dbus/wxdbusconnection.cpp
-@@ -27,6 +27,7 @@ DEALINGS IN THE SOFTWARE.
- #include <errno.h>
- #include <list>
- #include <poll.h>
-+#include <pthread.h>
-
- // Define WITH_LIBDBUS to 1 (e.g. from configure) if you are using
- // libdbus < 1.2 that does not have dbus_watch_get_unix_fd yet.
</del></span></pre></div>
<a id="trunkdportswwwFileZillafilespatchwxWidgets30diff"></a>
<div class="modfile"><h4>Modified: trunk/dports/www/FileZilla/files/patch-wxWidgets-3.0.diff (120489 => 120490)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/FileZilla/files/patch-wxWidgets-3.0.diff 2014-05-30 05:48:12 UTC (rev 120489)
+++ trunk/dports/www/FileZilla/files/patch-wxWidgets-3.0.diff 2014-05-30 09:21:54 UTC (rev 120490)
</span><span class="lines">@@ -204,7 +204,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> --- src/engine/logging.cpp.orig
</span><span class="cx"> +++ src/engine/logging.cpp
</span><del>-@@ -51,6 +51,38 @@ CLogging::~CLogging()
</del><ins>+@@ -51,6 +51,43 @@ CLogging::~CLogging()
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -238,6 +238,11 @@
</span><span class="cx"> +{
</span><span class="cx"> + LogMessage(nMessageType, msgFormat, value1.AsWChar(), value2.AsWChar(), value3.AsWChar(), value4.AsWChar());
</span><span class="cx"> +}
</span><ins>++
++void CLogging::LogMessage(wxString sourceFile, int nSourceLine, void *pInstance, MessageType nMessageType, const wxChar *msgFormat, wxCStrData value1) const
++{
++ LogMessage(sourceFile, nSourceLine, pInstance, nMessageType, msgFormat, value1.AsWChar());
++}
</ins><span class="cx"> +#endif
</span><span class="cx"> +
</span><span class="cx"> void CLogging::LogMessage(MessageType nMessageType, const wxChar *msgFormat, ...) const
</span><span class="lines">@@ -245,7 +250,7 @@
</span><span class="cx"> InitLogFile();
</span><span class="cx"> --- src/engine/logging_private.h.orig
</span><span class="cx"> +++ src/engine/logging_private.h
</span><del>-@@ -7,6 +7,15 @@ public:
</del><ins>+@@ -7,6 +7,16 @@ public:
</ins><span class="cx"> CLogging(CFileZillaEnginePrivate *pEngine);
</span><span class="cx"> virtual ~CLogging();
</span><span class="cx">
</span><span class="lines">@@ -256,6 +261,7 @@
</span><span class="cx"> + void LogMessage(MessageType nMessageType, const wxChar *msgFormat, wxCStrData value1) const;
</span><span class="cx"> + void LogMessage(MessageType nMessageType, const wxChar *msgFormat, wxCStrData value1, wxCStrData value2) const;
</span><span class="cx"> + void LogMessage(MessageType nMessageType, const wxChar *msgFormat, wxCStrData value1, wxCStrData value2, wxCStrData value3, wxCStrData value4) const;
</span><ins>++ void LogMessage(wxString sourceFile, int nSourceLine, void *pInstance, MessageType nMessageType, const wxChar *msgFormat, wxCStrData value1) const;
</ins><span class="cx"> +#endif
</span><span class="cx"> +
</span><span class="cx"> void LogMessage(MessageType nMessageType, const wxChar *msgFormat, ...) const;
</span><span class="lines">@@ -263,7 +269,7 @@
</span><span class="cx"> void LogMessage(wxString sourceFile, int nSourceLine, void *pInstance, MessageType nMessageType, const wxChar *msgFormat, ...) const;
</span><span class="cx"> --- src/engine/misc.cpp.orig
</span><span class="cx"> +++ src/engine/misc.cpp
</span><del>-@@ -365,11 +365,24 @@ void MakeLowerAscii(wxString& str)
</del><ins>+@@ -349,11 +349,24 @@ void MakeLowerAscii(wxString& str)
</ins><span class="cx"> {
</span><span class="cx"> for (size_t i = 0; i < str.Len(); i++)
</span><span class="cx"> {
</span><span class="lines">@@ -295,18 +301,18 @@
</span><span class="cx">
</span><span class="cx"> static const t_protocolInfo protocolInfos[] = {
</span><span class="cx"> - { FTP, _T("ftp"), false, 21, true, wxTRANSLATE("FTP - File Transfer Protocol with optional encryption"), true },
</span><del>-+ { FTP, _T("ftp"), false, 21, true, _T("FTP - File Transfer Protocol with optional encryption"), true },
</del><ins>++ { FTP, _T("ftp"), false, 21, true, _T("FTP - File Transfer Protocol with optional encryption"), true },
</ins><span class="cx"> { SFTP, _T("sftp"), true, 22, false, _T("SFTP - SSH File Transfer Protocol"), false },
</span><del>- { HTTP, _T("http"), true, 80, false, _T("HTTP - Hypertext Transfer Protocol"), true },
-- { HTTPS, _T("https"), true, 443, true, wxTRANSLATE("HTTPS - HTTP over TLS"), true },
</del><ins>+ { HTTP, _T("http"), true, 80, false, _T("HTTP - Hypertext Transfer Protocol"), false },
+- { HTTPS, _T("https"), true, 443, true, wxTRANSLATE("HTTPS - HTTP over TLS"), false },
</ins><span class="cx"> - { FTPS, _T("ftps"), true, 990, true, wxTRANSLATE("FTPS - FTP over implicit TLS/SSL"), true },
</span><span class="cx"> - { FTPES, _T("ftpes"), true, 21, true, wxTRANSLATE("FTPES - FTP over explicit TLS/SSL"), true },
</span><span class="cx"> - { INSECURE_FTP, _T("ftp"), false, 21, true, wxTRANSLATE("FTP - Insecure File Transfer Protocol"), true },
</span><del>-+ { HTTPS, _T("https"), true, 443, true, _T("HTTPS - HTTP over TLS"), true },
-+ { FTPS, _T("ftps"), true, 990, true, _T("FTPS - FTP over implicit TLS/SSL"), true },
-+ { FTPES, _T("ftpes"), true, 21, true, _T("FTPES - FTP over explicit TLS/SSL"), true },
-+ { INSECURE_FTP, _T("ftp"), false, 21, true, _T("FTP - Insecure File Transfer Protocol"), true },
- { UNKNOWN, _T(""), false, 21, false, _T("") }
</del><ins>++ { HTTPS, _T("https"), true, 443, true, _T("HTTPS - HTTP over TLS"), false },
++ { FTPS, _T("ftps"), true, 990, true, _T("FTPS - FTP over implicit TLS/SSL"), true },
++ { FTPES, _T("ftpes"), true, 21, true, _T("FTPES - FTP over explicit TLS/SSL"), true },
++ { INSECURE_FTP, _T("ftp"), false, 21, true, _T("FTP - Insecure File Transfer Protocol"), true },
+ { UNKNOWN, _T(""), false, 21, false, _T(""), false }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> --- src/engine/serverpath.cpp.orig
</span><span class="lines">@@ -340,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>-@@ -1273,7 +1273,7 @@ void CSocket::SetEventHandler(CSocketEventHandler* pEvtHandler)
</del><ins>+@@ -1298,7 +1298,7 @@ void CSocket::SetEventHandler(CSocketEventHandler* pEvtHandler)
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -351,7 +357,7 @@
</span><span class="cx"> {
</span><span class="cx"> --- src/engine/string_coalescer.cpp.orig
</span><span class="cx"> +++ src/engine/string_coalescer.cpp
</span><del>-@@ -66,7 +66,11 @@ struct fast_equal
</del><ins>+@@ -67,7 +67,11 @@ struct fast_equal
</ins><span class="cx"> {
</span><span class="cx"> // wxString is CoW, yet it doesn't even do this fast pointer
</span><span class="cx"> // comparison in it's less and/or equal operator(s).
</span><span class="lines">@@ -378,27 +384,27 @@
</span><span class="cx"> #include <vector>
</span><span class="cx"> --- src/interface/FileZilla.cpp.orig
</span><span class="cx"> +++ src/interface/FileZilla.cpp
</span><del>-@@ -267,7 +267,7 @@ bool CFileZillaApp::OnInit()
</del><ins>+@@ -269,7 +269,7 @@ bool CFileZillaApp::OnInit()
</ins><span class="cx"> #else
</span><span class="cx"> if (!pInfo || !SetLocale(pInfo->Language))
</span><span class="cx"> {
</span><span class="cx"> - if (pInfo && pInfo->Description)
</span><span class="cx"> + if (pInfo && !pInfo->Description.IsEmpty())
</span><del>- wxMessageBox(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);
</del><ins>+ 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);
</ins><span class="cx"> else
</span><del>- wxMessageBox(wxString::Format(_("Failed to set language to %s, using default system language"), language.c_str()), _("Failed to change language"), wxICON_EXCLAMATION);
-@@ -803,7 +803,7 @@ void CFileZillaApp::CheckExistsFzsftp()
- if (!found)
</del><ins>+ wxMessageBoxEx(wxString::Format(_("Failed to set language to %s, using default system language"), language.c_str()), _("Failed to change language"), wxICON_EXCLAMATION);
+@@ -689,7 +689,7 @@ void CFileZillaApp::CheckExistsFzsftp()
+ if (!wxFileName::FileExists(executable))
</ins><span class="cx"> {
</span><del>- wxMessageBox(wxString::Format(_("%s could not be found. Without this component of FileZilla, SFTP will not work.\n\nPossible solutions:\n- Make sure %s is in a directory listed in your PATH environment variable.\n- Set the full path to %s in the FZ_FZSFTP environment variable."), program.c_str(), program.c_str(), program.c_str()),
</del><ins>+ 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()),
</ins><span class="cx"> - _("File not found"), wxICON_ERROR);
</span><span class="cx"> + _("File not found"), wxICON_ERROR | wxOK);
</span><span class="cx"> executable.clear();
</span><span class="cx"> }
</span><del>- #endif
</del><ins>+
</ins><span class="cx"> --- src/interface/Mainfrm.cpp.orig
</span><span class="cx"> +++ src/interface/Mainfrm.cpp
</span><del>-@@ -754,14 +754,19 @@ void CMainFrame::OnMenuHandler(wxCommandEvent &event)
</del><ins>+@@ -759,14 +759,19 @@ void CMainFrame::OnMenuHandler(wxCommandEvent &event)
</ins><span class="cx"> // Do a crude approach: Drop everything unexpected...
</span><span class="cx"> for (unsigned int i = 0; i < version.Len(); i++)
</span><span class="cx"> {
</span><span class="lines">@@ -419,7 +425,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-@@ -779,7 +784,11 @@ void CMainFrame::OnMenuHandler(wxCommandEvent &event)
</del><ins>+@@ -784,7 +789,11 @@ void CMainFrame::OnMenuHandler(wxCommandEvent &event)
</ins><span class="cx"> {
</span><span class="cx"> pStatusBar->Show(show);
</span><span class="cx"> wxSizeEvent evt;
</span><span class="lines">@@ -431,7 +437,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> if (controls && controls->pRemoteListViewPanel)
</span><del>-@@ -789,7 +798,11 @@ void CMainFrame::OnMenuHandler(wxCommandEvent &event)
</del><ins>+@@ -794,7 +803,11 @@ void CMainFrame::OnMenuHandler(wxCommandEvent &event)
</ins><span class="cx"> {
</span><span class="cx"> pStatusBar->Show(show);
</span><span class="cx"> wxSizeEvent evt;
</span><span class="lines">@@ -445,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>-@@ -3423,9 +3423,13 @@ wxString CQueueView::ReplaceInvalidCharacters(const wxString& filename)
</del><ins>+@@ -3451,9 +3451,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">@@ -460,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>-@@ -3460,9 +3464,11 @@ wxString CQueueView::ReplaceInvalidCharacters(const wxString& filename)
</del><ins>+@@ -3488,9 +3492,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">@@ -637,7 +643,7 @@
</span><span class="cx"> CFileZillaEngine* CCommandQueue::GetEngineExclusive(int requestId)
</span><span class="cx"> --- src/interface/filezilla.h.orig
</span><span class="cx"> +++ src/interface/filezilla.h
</span><del>-@@ -71,5 +71,6 @@
</del><ins>+@@ -72,5 +72,6 @@
</ins><span class="cx"> #include <wx/toolbar.h>
</span><span class="cx"> #include <wx/treectrl.h>
</span><span class="cx"> #include <wx/xrc/xmlres.h>
</span><span class="lines">@@ -816,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>-@@ -2081,7 +2081,6 @@
</del><ins>+@@ -2080,7 +2080,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>