[120942] trunk/dports/www/FileZilla
mojca at macports.org
mojca at macports.org
Thu Jun 12 05:19:32 PDT 2014
Revision: 120942
https://trac.macports.org/changeset/120942
Author: mojca at macports.org
Date: 2014-06-12 05:19:32 -0700 (Thu, 12 Jun 2014)
Log Message:
-----------
FileZilla: upgrade to 3.8.1 (last release without official wxWidgets 3.0 support, #43969)
Modified Paths:
--------------
trunk/dports/www/FileZilla/Portfile
trunk/dports/www/FileZilla/files/patch-wxWidgets-3.0.diff
Modified: trunk/dports/www/FileZilla/Portfile
===================================================================
--- 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)
@@ -5,8 +5,7 @@
PortGroup wxWidgets 1.0
name FileZilla
-version 3.8.0
-revision 1
+version 3.8.1
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 rmd160 f161795774b03bbce8720e40ddff6a5ca6d4fe9a \
- sha256 8d9c1c9812f916f83676e1930933683828579b40a9fba331c4757f84a02ec308
+checksums rmd160 6a1692fc1b6ca73b878d8b9c2dd147b1885cacf0 \
+ sha256 66bc9c082843ffdcb915c7902900b92bdf921ed7310f2a40ff6b96b03cfa1e4f
depends_build port:pkgconfig
Modified: trunk/dports/www/FileZilla/files/patch-wxWidgets-3.0.diff
===================================================================
--- 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)
@@ -2,7 +2,7 @@
--- configure.orig
+++ configure
-@@ -692,6 +692,9 @@ PACKAGE_VERSION_MAJOR
+@@ -691,6 +691,9 @@ PACKAGE_VERSION_MAJOR
WINDRESFLAGS
WINDRES
WX_CONFIG_WITH_ARGS
@@ -12,7 +12,7 @@
WX_RESCOMP
WX_VERSION
WX_LIBS_STATIC
-@@ -15987,7 +15990,7 @@ $as_echo_n "checking for wxWidgets version >= $min_wx_version... " >&6; }
+@@ -16042,7 +16045,7 @@ $as_echo_n "checking for wxWidgets version >= $min_wx_version... " >&6; }
$as_echo_n "checking for wxWidgets version >= $min_wx_version (--unicode=yes --universal=no)... " >&6; }
fi
@@ -21,7 +21,7 @@
WX_VERSION=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null`
wx_config_major_version=`echo $WX_VERSION | \
-@@ -16026,14 +16029,13 @@ $as_echo_n "checking for wxWidgets version >= $min_wx_version (--unicode=yes --u
+@@ -16081,14 +16084,13 @@ $as_echo_n "checking for wxWidgets version >= $min_wx_version (--unicode=yes --u
if test -n "$wx_ver_ok"; then
@@ -38,7 +38,7 @@
if test "x$WX_LIBS_STATIC" = "x"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-@@ -16076,16 +16078,16 @@ $as_echo "yes" >&6; }
+@@ -16131,16 +16133,16 @@ $as_echo "yes" >&6; }
fi
if test "x$wx_has_cppflags" = x ; then
@@ -59,7 +59,7 @@
WX_CFLAGS_ONLY=`echo $WX_CFLAGS | sed "s@^$WX_CPPFLAGS *@@"`
WX_CXXFLAGS_ONLY=`echo $WX_CXXFLAGS | sed "s@^$WX_CFLAGS *@@"`
-@@ -16109,7 +16111,32 @@ $as_echo "no (version $WX_VERSION is not new enough)" >&6; }
+@@ -16164,7 +16166,32 @@ $as_echo "no (version $WX_VERSION is not new enough)" >&6; }
WX_LIBS=""
WX_LIBS_STATIC=""
WX_RESCOMP=""
@@ -93,7 +93,7 @@
fi
else
-@@ -16135,6 +16162,13 @@ $as_echo "no (version $WX_VERSION is not new enough)" >&6; }
+@@ -16190,6 +16217,13 @@ $as_echo "no (version $WX_VERSION is not new enough)" >&6; }
@@ -107,7 +107,7 @@
if test "$wxWin" != 1; then
as_fn_error $? "
wxWidgets must be installed on your system
-@@ -16150,9 +16184,6 @@ $as_echo "no (version $WX_VERSION is not new enough)" >&6; }
+@@ -16205,9 +16239,6 @@ $as_echo "no (version $WX_VERSION is not new enough)" >&6; }
equivalent variable and wxWidgets version is $MIN_WX_VERSION or above.
" "$LINENO" 5
fi
@@ -317,7 +317,7 @@
--- src/engine/serverpath.cpp.orig
+++ src/engine/serverpath.cpp
-@@ -272,8 +272,13 @@ wxString CServerPath::GetSafePath() const
+@@ -258,8 +258,13 @@ wxString CServerPath::GetSafePath() const
len += iter->Length() + 2 + INTLENGTH;
wxString safepath;
@@ -331,7 +331,7 @@
t = fast_sprint_number(t, m_type);
*(t++) = ' ';
-@@ -295,8 +300,11 @@ wxString CServerPath::GetSafePath() const
+@@ -281,8 +286,11 @@ wxString CServerPath::GetSafePath() const
t += iter->size();
}
*t = 0;
@@ -346,7 +346,7 @@
return safepath;
--- src/engine/socket.cpp.orig
+++ src/engine/socket.cpp
-@@ -1298,7 +1298,7 @@ void CSocket::SetEventHandler(CSocketEventHandler* pEvtHandler)
+@@ -1187,7 +1187,7 @@ void CSocket::SetEventHandler(CSocketEventHandler* pEvtHandler)
}
}
@@ -360,7 +360,7 @@
@@ -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).
+ // comparison in its less and/or equal operator(s).
+#if wxCHECK_VERSION(2, 9, 0)
+ return lhs == rhs;
+#else
@@ -393,7 +393,7 @@
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
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()
+@@ -694,7 +694,7 @@ void CFileZillaApp::CheckExistsFzsftp()
if (!wxFileName::FileExists(executable))
{
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()),
@@ -451,7 +451,7 @@
}
--- src/interface/QueueView.cpp.orig
+++ src/interface/QueueView.cpp
-@@ -3451,9 +3451,13 @@ wxString CQueueView::ReplaceInvalidCharacters(const wxString& filename)
+@@ -3443,9 +3443,13 @@ wxString CQueueView::ReplaceInvalidCharacters(const wxString& filename)
const wxChar replace = COptions::Get()->GetOption(OPTION_INVALID_CHAR_REPLACE)[0];
wxString result;
@@ -466,7 +466,7 @@
const wxChar* p = filename.c_str();
while (*p)
-@@ -3488,9 +3492,11 @@ wxString CQueueView::ReplaceInvalidCharacters(const wxString& filename)
+@@ -3480,9 +3484,11 @@ wxString CQueueView::ReplaceInvalidCharacters(const wxString& filename)
p++;
}
*buf = 0;
@@ -482,7 +482,7 @@
--- src/interface/RemoteTreeView.cpp.orig
+++ src/interface/RemoteTreeView.cpp
-@@ -350,7 +350,7 @@ void CRemoteTreeView::SetDirectoryListing(const CSharedPointer<const CDirectoryL
+@@ -351,7 +351,7 @@ void CRemoteTreeView::SetDirectoryListing(const CSharedPointer<const CDirectoryL
SetItemImages(parent, false);
#ifndef __WXMSW__
@@ -790,8 +790,8 @@
}
else
event.Skip();
---- src/interface/resources/settings.xrc.orig
-+++ src/interface/resources/settings.xrc
+--- src/interface/resources/xrc/settings.xrc.orig
++++ src/interface/resources/xrc/settings.xrc
@@ -427,7 +427,7 @@
</object>
<cols>1</cols>
@@ -813,7 +813,7 @@
</object>
<vgap>5</vgap>
<growablecols>0</growablecols>
-@@ -1368,7 +1368,7 @@
+@@ -1393,7 +1393,7 @@
<object class="sizeritem">
<object class="wxFlexGridSizer">
<cols>2</cols>
@@ -822,7 +822,7 @@
<object class="sizeritem">
<object class="wxStaticText">
<label>&Theme:</label>
-@@ -2080,7 +2080,6 @@
+@@ -2105,7 +2105,6 @@
</object>
<growablecols>1</growablecols>
</object>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140612/149c20ff/attachment-0001.html>
More information about the macports-changes
mailing list