[116916] trunk/dports/www/FileZilla
mojca at macports.org
mojca at macports.org
Mon Feb 10 04:22:53 PST 2014
Revision: 116916
https://trac.macports.org/changeset/116916
Author: mojca at macports.org
Date: 2014-02-10 04:22:53 -0800 (Mon, 10 Feb 2014)
Log Message:
-----------
FileZilla: upgrade to 3.7.4
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-putty-Makefile.in.diff
Modified: trunk/dports/www/FileZilla/Portfile
===================================================================
--- trunk/dports/www/FileZilla/Portfile 2014-02-10 09:18:52 UTC (rev 116915)
+++ trunk/dports/www/FileZilla/Portfile 2014-02-10 12:22:53 UTC (rev 116916)
@@ -5,8 +5,7 @@
PortGroup wxWidgets 1.0
name FileZilla
-version 3.7.3
-revision 2
+version 3.7.4
categories www aqua
platforms darwin
maintainers strasweb.fr:rudloff openmaintainer
@@ -21,8 +20,8 @@
homepage https://filezilla-project.org/
master_sites sourceforge:project/filezilla/FileZilla_Client/${version}
-checksums sha1 34c3dd1943816a916c54e49cbbea51c97ef3f583 \
- rmd160 8fefebae9f2024dedab9841dc6fe3876305f8d2f
+checksums rmd160 8ea764d7d02fbc76b06d378bc26f6c2d8f44083d \
+ sha256 20a6d5ce737a8cbb38786b53365547e5e71dd9086259bf0b4eb264e8dbbc11ce
depends_build port:pkgconfig
@@ -42,8 +41,7 @@
use_bzip2 yes
worksrcdir filezilla-${version}
-patchfiles patch-wxWidgets-3.0.diff \
- patch-src-putty-Makefile.in.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-putty-Makefile.in.diff
===================================================================
--- trunk/dports/www/FileZilla/files/patch-src-putty-Makefile.in.diff 2014-02-10 09:18:52 UTC (rev 116915)
+++ trunk/dports/www/FileZilla/files/patch-src-putty-Makefile.in.diff 2014-02-10 12:22:53 UTC (rev 116916)
@@ -1,13 +0,0 @@
-http://trac.filezilla-project.org/ticket/8852
-avoids 'cp: fzputtygen: No such file or directory'
---- src/putty/Makefile.in.orig
-+++ src/putty/Makefile.in
-@@ -1526,7 +1526,7 @@ uninstall-am: uninstall-binPROGRAMS
- uninstall-binPROGRAMS
-
-
--$(top_builddir)/FileZilla.app/Contents/MacOS/fzsftp$(EXEEXT): fzsftp
-+$(top_builddir)/FileZilla.app/Contents/MacOS/fzsftp$(EXEEXT): fzsftp fzputtygen
- mkdir -p $(top_builddir)/FileZilla.app/Contents/MacOS
- cp -f fzsftp $(top_builddir)/FileZilla.app/Contents/MacOS/fzsftp
- cp -f fzputtygen $(top_builddir)/FileZilla.app/Contents/MacOS/fzputtygen
Modified: trunk/dports/www/FileZilla/files/patch-wxWidgets-3.0.diff
===================================================================
--- trunk/dports/www/FileZilla/files/patch-wxWidgets-3.0.diff 2014-02-10 09:18:52 UTC (rev 116915)
+++ trunk/dports/www/FileZilla/files/patch-wxWidgets-3.0.diff 2014-02-10 12:22:53 UTC (rev 116916)
@@ -1,4 +1,3 @@
-http://trac.filezilla-project.org/ticket/8272
--- configure.orig
+++ configure
@@ -692,6 +692,9 @@ PACKAGE_VERSION_MAJOR
@@ -16,7 +15,7 @@
fi
- WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args --unicode=yes --universal=no aui,xrc,adv,core,xml,net,base"
-+ WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args --unicode=yes --universal=no"
++ WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args --unicode=yes --universal=no"
WX_VERSION=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null`
wx_config_major_version=`echo $WX_VERSION | \
@@ -113,7 +112,7 @@
- if test "$wx_config_major_version" -gt "2" || test "$wx_config_minor_version" -gt "8"; then
- as_fn_error $? "You need to use wxWidgets 2.8.x to compile this program." "$LINENO" 5
- fi
-
+
# --universal=no doesn't work correctly, it still accepts universal builds. Reject it manually here.
if echo "$WX_CPPFLAGS" | grep __WXUNIVERSAL__ > /dev/null; then
--- src/engine/local_path.cpp.orig
@@ -208,61 +207,61 @@
}
+#if wxCHECK_VERSION(2, 9, 0)
-+void CLogging::LogMessage(MessageType nMessageType, const wxChar *msgFormat, int value1) const
-+{
-+ LogMessage(nMessageType, msgFormat, (const char*)(wxString() << value1).c_str());
-+}
++void CLogging::LogMessage(MessageType nMessageType, const wxChar *msgFormat, int value1) const
++{
++ LogMessage(nMessageType, msgFormat, (const char*)(wxString() << value1).c_str());
++}
+
-+void CLogging::LogMessage(MessageType nMessageType, const wxChar *msgFormat, int value1, wxCStrData value2) const
-+{
-+ LogMessage(nMessageType, msgFormat, (const char*)(wxString() << value1).c_str(), value2.AsWChar());
-+}
++void CLogging::LogMessage(MessageType nMessageType, const wxChar *msgFormat, int value1, wxCStrData value2) const
++{
++ LogMessage(nMessageType, msgFormat, (const char*)(wxString() << value1).c_str(), value2.AsWChar());
++}
+
-+void CLogging::LogMessage(MessageType nMessageType, const wxChar *msgFormat, int value1, wxCStrData value2, wxCStrData value3) const
-+{
-+ LogMessage(nMessageType, msgFormat, (const char*)(wxString() << value1).c_str(), value2.AsWChar(), value3.AsWChar());
-+}
++void CLogging::LogMessage(MessageType nMessageType, const wxChar *msgFormat, int value1, wxCStrData value2, wxCStrData value3) const
++{
++ LogMessage(nMessageType, msgFormat, (const char*)(wxString() << value1).c_str(), value2.AsWChar(), value3.AsWChar());
++}
+
-+void CLogging::LogMessage(MessageType nMessageType, const wxChar *msgFormat, wxCStrData value1) const
-+{
-+ LogMessage(nMessageType, msgFormat, value1.AsWChar());
-+}
++void CLogging::LogMessage(MessageType nMessageType, const wxChar *msgFormat, wxCStrData value1) const
++{
++ LogMessage(nMessageType, msgFormat, value1.AsWChar());
++}
+
-+void CLogging::LogMessage(MessageType nMessageType, const wxChar *msgFormat, wxCStrData value1, wxCStrData value2) const
-+{
-+ LogMessage(nMessageType, msgFormat, value1.AsWChar(), value2.AsWChar());
++void CLogging::LogMessage(MessageType nMessageType, const wxChar *msgFormat, wxCStrData value1, wxCStrData value2) const
++{
++ LogMessage(nMessageType, msgFormat, value1.AsWChar(), value2.AsWChar());
+}
+
-+void CLogging::LogMessage(MessageType nMessageType, const wxChar *msgFormat, wxCStrData value1, wxCStrData value2, wxCStrData value3, wxCStrData value4) const
-+{
-+ LogMessage(nMessageType, msgFormat, value1.AsWChar(), value2.AsWChar(), value3.AsWChar(), value4.AsWChar());
++void CLogging::LogMessage(MessageType nMessageType, const wxChar *msgFormat, wxCStrData value1, wxCStrData value2, wxCStrData value3, wxCStrData value4) const
++{
++ LogMessage(nMessageType, msgFormat, value1.AsWChar(), value2.AsWChar(), value3.AsWChar(), value4.AsWChar());
+}
-+#endif
++#endif
+
void CLogging::LogMessage(MessageType nMessageType, const wxChar *msgFormat, ...) const
{
InitLogFile();
--- src/engine/logging_private.h.orig
+++ src/engine/logging_private.h
-@@ -6,6 +6,15 @@ class CLogging
- public:
+@@ -7,6 +7,15 @@ public:
CLogging(CFileZillaEnginePrivate *pEngine);
virtual ~CLogging();
-+
-+#if wxCHECK_VERSION(2, 9, 0)
-+ void LogMessage(MessageType nMessageType, const wxChar *msgFormat, int value1) const;
+
++#if wxCHECK_VERSION(2, 9, 0)
++ void LogMessage(MessageType nMessageType, const wxChar *msgFormat, int value1) const;
+ void LogMessage(MessageType nMessageType, const wxChar *msgFormat, int value1, wxCStrData value2) const;
+ void LogMessage(MessageType nMessageType, const wxChar *msgFormat, int value1, wxCStrData value2, wxCStrData value3) const;
-+ 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;
-+#endif
-
++ 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;
++#endif
++
void LogMessage(MessageType nMessageType, const wxChar *msgFormat, ...) const;
void LogMessageRaw(MessageType nMessageType, const wxChar *msg) const;
+ void LogMessage(wxString sourceFile, int nSourceLine, void *pInstance, MessageType nMessageType, const wxChar *msgFormat, ...) const;
--- src/engine/misc.cpp.orig
+++ src/engine/misc.cpp
-@@ -365,9 +365,19 @@ void MakeLowerAscii(wxString& str)
+@@ -365,11 +365,24 @@ void MakeLowerAscii(wxString& str)
{
for (size_t i = 0; i < str.Len(); i++)
{
@@ -273,11 +272,16 @@
+ {
+ c += 32;
+ str.SetChar(i, wxUniChar(c));
++ } else if (c == 0x130 || c == 0x131) {
++ c = 'i';
++ str.SetChar(i, wxUniChar(c));
+ }
+#else
wxChar& c = str[i];
if (c >= 'A' && c <= 'Z')
c += 32;
+ else if (c == 0x130 || c == 0x131)
+ c = 'i';
+#endif
}
}
@@ -305,7 +309,7 @@
--- src/engine/serverpath.cpp.orig
+++ src/engine/serverpath.cpp
-@@ -276,8 +276,13 @@ wxString CServerPath::GetSafePath() const
+@@ -272,8 +272,13 @@ wxString CServerPath::GetSafePath() const
len += iter->Length() + 2 + INTLENGTH;
wxString safepath;
@@ -319,7 +323,7 @@
t = fast_sprint_number(t, m_type);
*(t++) = ' ';
-@@ -299,8 +304,11 @@ wxString CServerPath::GetSafePath() const
+@@ -295,8 +300,11 @@ wxString CServerPath::GetSafePath() const
t += iter->size();
}
*t = 0;
@@ -372,7 +376,7 @@
#include <vector>
--- src/interface/FileZilla.cpp.orig
+++ src/interface/FileZilla.cpp
-@@ -267,7 +267,7 @@
+@@ -267,7 +267,7 @@ bool CFileZillaApp::OnInit()
#else
if (!pInfo || !SetLocale(pInfo->Language))
{
@@ -439,7 +443,7 @@
}
--- src/interface/QueueView.cpp.orig
+++ src/interface/QueueView.cpp
-@@ -3419,9 +3419,13 @@ wxString CQueueView::ReplaceInvalidCharacters(const wxString& filename)
+@@ -3423,9 +3423,13 @@ wxString CQueueView::ReplaceInvalidCharacters(const wxString& filename)
const wxChar replace = COptions::Get()->GetOption(OPTION_INVALID_CHAR_REPLACE)[0];
wxString result;
@@ -454,7 +458,7 @@
const wxChar* p = filename.c_str();
while (*p)
-@@ -3456,9 +3460,11 @@ wxString CQueueView::ReplaceInvalidCharacters(const wxString& filename)
+@@ -3460,9 +3464,11 @@ wxString CQueueView::ReplaceInvalidCharacters(const wxString& filename)
p++;
}
*buf = 0;
@@ -481,7 +485,7 @@
SafeSelectItem(parent);
--- src/interface/StatusView.cpp.orig
+++ src/interface/StatusView.cpp
-@@ -58,7 +58,7 @@ public:
+@@ -71,7 +71,7 @@ public:
{
wxWindow* parent = GetParent();
event.SetEventObject(parent);
@@ -490,7 +494,7 @@
}
#else
void OnKeyDown(wxKeyEvent& event)
-@@ -76,7 +76,7 @@ public:
+@@ -89,7 +89,7 @@ public:
navEvent.SetDirection(!event.ShiftDown());
navEvent.SetFromTab(true);
navEvent.ResumePropagation(1);
@@ -507,7 +511,7 @@
+#if wxCHECK_VERSION(2, 9, 0)
+wxColor wxAuiStepColour(const wxColor& c, int ialpha)
-+{
++{
+ wxColor* result = new wxColor(c);
+ result->ChangeLightness(ialpha);
+ return *result;
@@ -657,9 +661,9 @@
{
-#ifdef __WXMAC__
+#if defined(__WXMAC__) && !wxCHECK_VERSION(2, 9, 0)
- return (wxScrolledWindow*)m_genericImpl->m_mainWin;
+ return (wxScrolledWindow*)m_genericImpl->m_mainWin;
#else
- return (wxScrolledWindow*)m_mainWin;
+ return (wxScrolledWindow*)m_mainWin;
--- src/interface/netconfwizard.cpp.orig
+++ src/interface/netconfwizard.cpp
@@ -777,7 +777,12 @@ void CNetConfWizard::SendNextCommand()
@@ -712,7 +716,7 @@
}
};
-@@ -544,9 +548,11 @@ bool CQueueStorage::Impl::Bind(sqlite3_stmt* statement, int index, wxLongLong_t
+@@ -561,9 +565,11 @@ bool CQueueStorage::Impl::Bind(sqlite3_stmt* statement, int index, wxLongLong_t
extern "C" {
static void custom_free(void* v)
{
@@ -725,7 +729,7 @@
#else
char* s = reinterpret_cast<char*>(v);
delete [] s;
-@@ -557,11 +563,16 @@ static void custom_free(void* v)
+@@ -574,11 +580,16 @@ static void custom_free(void* v)
bool CQueueStorage::Impl::Bind(sqlite3_stmt* statement, int index, const wxString& value)
{
#ifdef __WXMSW__
@@ -742,7 +746,7 @@
#else
char* out = new char[value.size() * 2];
size_t outlen = utf16_.FromWChar(out, value.size() * 2, value.c_str(), value.size());
-@@ -814,9 +825,18 @@ wxString CQueueStorage::Impl::GetColumnText(sqlite3_stmt* statement, int index,
+@@ -831,9 +842,18 @@ wxString CQueueStorage::Impl::GetColumnText(sqlite3_stmt* statement, int index,
int len = sqlite3_column_bytes16(statement, index);
if (text)
{
@@ -793,7 +797,7 @@
<object class="sizeritem">
<object class="wxListCtrl" name="ID_KEYS">
<style>wxLC_REPORT|wxSUNKEN_BORDER</style>
-+ <size>400,-1</size>
++ <size>400,-1</size>
</object>
- <option>1</option>
- <flag>wxGROW</flag>
@@ -801,7 +805,7 @@
</object>
<vgap>5</vgap>
<growablecols>0</growablecols>
-@@ -1363,7 +1363,7 @@
+@@ -1368,7 +1368,7 @@
<object class="sizeritem">
<object class="wxFlexGridSizer">
<cols>2</cols>
@@ -810,7 +814,7 @@
<object class="sizeritem">
<object class="wxStaticText">
<label>&Theme:</label>
-@@ -2076,7 +2076,6 @@
+@@ -2081,7 +2081,6 @@
</object>
<growablecols>1</growablecols>
</object>
@@ -840,7 +844,7 @@
SetText(XRCID("ID_CUSTOM_TIMEFORMAT"), timeFormat.Mid(1), failure);
--- src/interface/sitemanager.cpp.orig
+++ src/interface/sitemanager.cpp
-@@ -516,6 +516,8 @@ CSiteManagerItemData_Site* CSiteManager::GetSiteByPath(wxString sitePath)
+@@ -515,6 +515,8 @@ CSiteManagerItemData_Site* CSiteManager::GetSiteByPath(wxString sitePath)
bool CSiteManager::GetBookmarks(wxString sitePath, std::list<wxString> &bookmarks)
{
@@ -886,7 +890,7 @@
m_dateTimeFormat += _T("%X");
--- src/interface/viewheader.cpp.orig
+++ src/interface/viewheader.cpp
-@@ -24,7 +24,11 @@
+@@ -24,7 +24,11 @@ class CComboBoxEx : public wxComboBox
{
public:
CComboBoxEx(CViewHeader* parent)
@@ -899,7 +903,7 @@
{
m_parent = parent;
}
-@@ -67,7 +71,7 @@
+@@ -67,7 +71,7 @@ protected:
navEvent.SetDirection(!event.ShiftDown());
navEvent.SetFromTab(true);
navEvent.ResumePropagation(1);
@@ -910,7 +914,7 @@
void OnChar(wxKeyEvent& event)
--- src/interface/wrapengine.cpp.orig
+++ src/interface/wrapengine.cpp
-@@ -234,24 +234,24 @@ bool CWrapEngine::WrapText(wxWindow* parent, wxString& text, unsigned long maxLe
+@@ -232,24 +232,24 @@ bool CWrapEngine::WrapText(wxWindow* parent, wxString& text, unsigned long maxLe
bool containsURL = false;
for (int i = 0; i <= strLen; i++)
{
@@ -940,7 +944,7 @@
segment = text.Mid(start, i - start + 1);
else
segment = text.Mid(start, i - start);
-@@ -259,7 +259,7 @@ bool CWrapEngine::WrapText(wxWindow* parent, wxString& text, unsigned long maxLe
+@@ -257,7 +257,7 @@ bool CWrapEngine::WrapText(wxWindow* parent, wxString& text, unsigned long maxLe
}
else
{
@@ -949,7 +953,7 @@
segment = text.Mid(wrapAfter + 1, i - wrapAfter);
else
segment = text.Mid(wrapAfter + 1, i - wrapAfter - 1);
-@@ -274,7 +274,7 @@ bool CWrapEngine::WrapText(wxWindow* parent, wxString& text, unsigned long maxLe
+@@ -272,7 +272,7 @@ bool CWrapEngine::WrapText(wxWindow* parent, wxString& text, unsigned long maxLe
if (wrappedText != _T(""))
wrappedText += _T("\n");
wrappedText += text.Mid(start, wrapAfter - start);
@@ -958,7 +962,7 @@
wrappedText += text[wrapAfter];
if (width + spaceWidth >= (int)maxLength)
-@@ -304,7 +304,7 @@ bool CWrapEngine::WrapText(wxWindow* parent, wxString& text, unsigned long maxLe
+@@ -302,7 +302,7 @@ bool CWrapEngine::WrapText(wxWindow* parent, wxString& text, unsigned long maxLe
if (wrappedText != _T(""))
wrappedText += _T("\n");
wrappedText += text.Mid(start, i - start);
@@ -967,7 +971,7 @@
wrappedText += text[i];
start = i + 1;
wrapAfter = -1;
-@@ -318,7 +318,7 @@ bool CWrapEngine::WrapText(wxWindow* parent, wxString& text, unsigned long maxLe
+@@ -316,7 +316,7 @@ bool CWrapEngine::WrapText(wxWindow* parent, wxString& text, unsigned long maxLe
wrapAfter = i;
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140210/ee1fc36f/attachment-0001.html>
More information about the macports-changes
mailing list