[120490] trunk/dports/www/FileZilla
mojca at macports.org
mojca at macports.org
Fri May 30 02:21:54 PDT 2014
Revision: 120490
https://trac.macports.org/changeset/120490
Author: mojca at macports.org
Date: 2014-05-30 02:21:54 -0700 (Fri, 30 May 2014)
Log Message:
-----------
FileZilla: upgrade to 3.8.0
Modified Paths:
--------------
trunk/dports/www/FileZilla/Portfile
trunk/dports/www/FileZilla/files/patch-wxWidgets-3.0.diff
Removed Paths:
-------------
trunk/dports/www/FileZilla/files/patch-src-dbus-wxdbusconnection.cpp.diff
Modified: trunk/dports/www/FileZilla/Portfile
===================================================================
--- 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)
@@ -5,7 +5,7 @@
PortGroup wxWidgets 1.0
name FileZilla
-version 3.7.4.1
+version 3.8.0
categories www aqua
platforms darwin
maintainers strasweb.fr:rudloff openmaintainer
@@ -20,8 +20,8 @@
homepage https://filezilla-project.org/
master_sites sourceforge:project/filezilla/FileZilla_Client/${version}
-checksums rmd160 930184fb092c44de36eed822d589ae5bd8e05f8b \
- sha256 8be46f472c12d412c58b5a0b1be751c64bc5e7fceaa6b9170f8edbc7dbfa64a9
+checksums rmd160 f161795774b03bbce8720e40ddff6a5ca6d4fe9a \
+ sha256 8d9c1c9812f916f83676e1930933683828579b40a9fba331c4757f84a02ec308
depends_build port:pkgconfig
@@ -42,8 +42,7 @@
worksrcdir filezilla-${version}
# http://trac.filezilla-project.org/ticket/8272
-patchfiles patch-wxWidgets-3.0.diff \
- patch-src-dbus-wxdbusconnection.cpp.diff
+patchfiles patch-wxWidgets-3.0.diff
# http://trac.filezilla-project.org/ticket/5473
# http://sourceforge.net/p/tinyxml/patches/51/
Deleted: trunk/dports/www/FileZilla/files/patch-src-dbus-wxdbusconnection.cpp.diff
===================================================================
--- 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)
@@ -1,13 +0,0 @@
-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.
Modified: trunk/dports/www/FileZilla/files/patch-wxWidgets-3.0.diff
===================================================================
--- 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)
@@ -204,7 +204,7 @@
return true;
--- src/engine/logging.cpp.orig
+++ src/engine/logging.cpp
-@@ -51,6 +51,38 @@ CLogging::~CLogging()
+@@ -51,6 +51,43 @@ CLogging::~CLogging()
}
}
@@ -238,6 +238,11 @@
+{
+ LogMessage(nMessageType, msgFormat, value1.AsWChar(), value2.AsWChar(), value3.AsWChar(), value4.AsWChar());
+}
++
++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());
++}
+#endif
+
void CLogging::LogMessage(MessageType nMessageType, const wxChar *msgFormat, ...) const
@@ -245,7 +250,7 @@
InitLogFile();
--- src/engine/logging_private.h.orig
+++ src/engine/logging_private.h
-@@ -7,6 +7,15 @@ public:
+@@ -7,6 +7,16 @@ public:
CLogging(CFileZillaEnginePrivate *pEngine);
virtual ~CLogging();
@@ -256,6 +261,7 @@
+ void LogMessage(MessageType nMessageType, const wxChar *msgFormat, wxCStrData value1) const;
+ void LogMessage(MessageType nMessageType, const wxChar *msgFormat, wxCStrData value1, wxCStrData value2) const;
+ void LogMessage(MessageType nMessageType, const wxChar *msgFormat, wxCStrData value1, wxCStrData value2, wxCStrData value3, wxCStrData value4) const;
++ void LogMessage(wxString sourceFile, int nSourceLine, void *pInstance, MessageType nMessageType, const wxChar *msgFormat, wxCStrData value1) const;
+#endif
+
void LogMessage(MessageType nMessageType, const wxChar *msgFormat, ...) const;
@@ -263,7 +269,7 @@
void LogMessage(wxString sourceFile, int nSourceLine, void *pInstance, MessageType nMessageType, const wxChar *msgFormat, ...) const;
--- src/engine/misc.cpp.orig
+++ src/engine/misc.cpp
-@@ -365,11 +365,24 @@ void MakeLowerAscii(wxString& str)
+@@ -349,11 +349,24 @@ void MakeLowerAscii(wxString& str)
{
for (size_t i = 0; i < str.Len(); i++)
{
@@ -295,18 +301,18 @@
static const t_protocolInfo protocolInfos[] = {
- { FTP, _T("ftp"), false, 21, true, wxTRANSLATE("FTP - File Transfer Protocol with optional encryption"), true },
-+ { FTP, _T("ftp"), false, 21, true, _T("FTP - File Transfer Protocol with optional encryption"), true },
++ { FTP, _T("ftp"), false, 21, true, _T("FTP - File Transfer Protocol with optional encryption"), true },
{ SFTP, _T("sftp"), true, 22, false, _T("SFTP - SSH File Transfer Protocol"), false },
- { HTTP, _T("http"), true, 80, false, _T("HTTP - Hypertext Transfer Protocol"), true },
-- { HTTPS, _T("https"), true, 443, true, wxTRANSLATE("HTTPS - HTTP over TLS"), true },
+ { HTTP, _T("http"), true, 80, false, _T("HTTP - Hypertext Transfer Protocol"), false },
+- { HTTPS, _T("https"), true, 443, true, wxTRANSLATE("HTTPS - HTTP over TLS"), false },
- { FTPS, _T("ftps"), true, 990, true, wxTRANSLATE("FTPS - FTP over implicit TLS/SSL"), true },
- { FTPES, _T("ftpes"), true, 21, true, wxTRANSLATE("FTPES - FTP over explicit TLS/SSL"), true },
- { INSECURE_FTP, _T("ftp"), false, 21, true, wxTRANSLATE("FTP - Insecure File Transfer Protocol"), true },
-+ { 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("") }
++ { 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 }
};
--- src/engine/serverpath.cpp.orig
@@ -340,7 +346,7 @@
return safepath;
--- src/engine/socket.cpp.orig
+++ src/engine/socket.cpp
-@@ -1273,7 +1273,7 @@ void CSocket::SetEventHandler(CSocketEventHandler* pEvtHandler)
+@@ -1298,7 +1298,7 @@ void CSocket::SetEventHandler(CSocketEventHandler* pEvtHandler)
}
}
@@ -351,7 +357,7 @@
{
--- src/engine/string_coalescer.cpp.orig
+++ src/engine/string_coalescer.cpp
-@@ -66,7 +66,11 @@ struct fast_equal
+@@ -67,7 +67,11 @@ struct fast_equal
{
// wxString is CoW, yet it doesn't even do this fast pointer
// comparison in it's less and/or equal operator(s).
@@ -378,27 +384,27 @@
#include <vector>
--- src/interface/FileZilla.cpp.orig
+++ src/interface/FileZilla.cpp
-@@ -267,7 +267,7 @@ bool CFileZillaApp::OnInit()
+@@ -269,7 +269,7 @@ bool CFileZillaApp::OnInit()
#else
if (!pInfo || !SetLocale(pInfo->Language))
{
- if (pInfo && pInfo->Description)
+ if (pInfo && !pInfo->Description.IsEmpty())
- 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);
+ 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);
else
- 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)
+ 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))
{
- 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()),
+ 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()),
- _("File not found"), wxICON_ERROR);
+ _("File not found"), wxICON_ERROR | wxOK);
executable.clear();
}
- #endif
+
--- src/interface/Mainfrm.cpp.orig
+++ src/interface/Mainfrm.cpp
-@@ -754,14 +754,19 @@ void CMainFrame::OnMenuHandler(wxCommandEvent &event)
+@@ -759,14 +759,19 @@ void CMainFrame::OnMenuHandler(wxCommandEvent &event)
// Do a crude approach: Drop everything unexpected...
for (unsigned int i = 0; i < version.Len(); i++)
{
@@ -419,7 +425,7 @@
}
}
}
-@@ -779,7 +784,11 @@ void CMainFrame::OnMenuHandler(wxCommandEvent &event)
+@@ -784,7 +789,11 @@ void CMainFrame::OnMenuHandler(wxCommandEvent &event)
{
pStatusBar->Show(show);
wxSizeEvent evt;
@@ -431,7 +437,7 @@
}
}
if (controls && controls->pRemoteListViewPanel)
-@@ -789,7 +798,11 @@ void CMainFrame::OnMenuHandler(wxCommandEvent &event)
+@@ -794,7 +803,11 @@ void CMainFrame::OnMenuHandler(wxCommandEvent &event)
{
pStatusBar->Show(show);
wxSizeEvent evt;
@@ -445,7 +451,7 @@
}
--- src/interface/QueueView.cpp.orig
+++ src/interface/QueueView.cpp
-@@ -3423,9 +3423,13 @@ wxString CQueueView::ReplaceInvalidCharacters(const wxString& filename)
+@@ -3451,9 +3451,13 @@ wxString CQueueView::ReplaceInvalidCharacters(const wxString& filename)
const wxChar replace = COptions::Get()->GetOption(OPTION_INVALID_CHAR_REPLACE)[0];
wxString result;
@@ -460,7 +466,7 @@
const wxChar* p = filename.c_str();
while (*p)
-@@ -3460,9 +3464,11 @@ wxString CQueueView::ReplaceInvalidCharacters(const wxString& filename)
+@@ -3488,9 +3492,11 @@ wxString CQueueView::ReplaceInvalidCharacters(const wxString& filename)
p++;
}
*buf = 0;
@@ -637,7 +643,7 @@
CFileZillaEngine* CCommandQueue::GetEngineExclusive(int requestId)
--- src/interface/filezilla.h.orig
+++ src/interface/filezilla.h
-@@ -71,5 +71,6 @@
+@@ -72,5 +72,6 @@
#include <wx/toolbar.h>
#include <wx/treectrl.h>
#include <wx/xrc/xmlres.h>
@@ -816,7 +822,7 @@
<object class="sizeritem">
<object class="wxStaticText">
<label>&Theme:</label>
-@@ -2081,7 +2081,6 @@
+@@ -2080,7 +2080,6 @@
</object>
<growablecols>1</growablecols>
</object>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140530/46ebe164/attachment-0001.html>
More information about the macports-changes
mailing list