Changeset 120942


Ignore:
Timestamp:
Jun 12, 2014, 12:19:32 PM (6 years ago)
Author:
mojca@…
Message:

FileZilla: upgrade to 3.8.1 (last release without official wxWidgets 3.0 support, #43969)

Location:
trunk/dports/www/FileZilla
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/www/FileZilla/Portfile

    r120565 r120942  
    66
    77name                FileZilla
    8 version             3.8.0
    9 revision            1
     8version             3.8.1
    109categories          www aqua
    1110platforms           darwin
     
    2221master_sites        sourceforge:project/filezilla/FileZilla_Client/${version}
    2322
    24 checksums           rmd160  f161795774b03bbce8720e40ddff6a5ca6d4fe9a \
    25                     sha256  8d9c1c9812f916f83676e1930933683828579b40a9fba331c4757f84a02ec308
     23checksums           rmd160  6a1692fc1b6ca73b878d8b9c2dd147b1885cacf0 \
     24                    sha256  66bc9c082843ffdcb915c7902900b92bdf921ed7310f2a40ff6b96b03cfa1e4f
    2625
    2726depends_build       port:pkgconfig
  • trunk/dports/www/FileZilla/files/patch-wxWidgets-3.0.diff

    r120490 r120942  
    33--- configure.orig
    44+++ configure
    5 @@ -692,6 +692,9 @@ PACKAGE_VERSION_MAJOR
     5@@ -691,6 +691,9 @@ PACKAGE_VERSION_MAJOR
    66 WINDRESFLAGS
    77 WINDRES
     
    1313 WX_VERSION
    1414 WX_LIBS_STATIC
    15 @@ -15987,7 +15990,7 @@ $as_echo_n "checking for wxWidgets version >= $min_wx_version... " >&6; }
     15@@ -16042,7 +16045,7 @@ $as_echo_n "checking for wxWidgets version >= $min_wx_version... " >&6; }
    1616 $as_echo_n "checking for wxWidgets version >= $min_wx_version (--unicode=yes --universal=no)... " >&6; }
    1717     fi
     
    2222     WX_VERSION=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null`
    2323     wx_config_major_version=`echo $WX_VERSION | \
    24 @@ -16026,14 +16029,13 @@ $as_echo_n "checking for wxWidgets version >= $min_wx_version (--unicode=yes --u
     24@@ -16081,14 +16084,13 @@ $as_echo_n "checking for wxWidgets version >= $min_wx_version (--unicode=yes --u
    2525 
    2626 
     
    3939         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    4040 $as_echo "no" >&6; }
    41 @@ -16076,16 +16078,16 @@ $as_echo "yes" >&6; }
     41@@ -16131,16 +16133,16 @@ $as_echo "yes" >&6; }
    4242       fi
    4343 
     
    6060          WX_CFLAGS_ONLY=`echo $WX_CFLAGS | sed "s@^$WX_CPPFLAGS *@@"`
    6161          WX_CXXFLAGS_ONLY=`echo $WX_CXXFLAGS | sed "s@^$WX_CFLAGS *@@"`
    62 @@ -16109,7 +16111,32 @@ $as_echo "no (version $WX_VERSION is not new enough)" >&6; }
     62@@ -16164,7 +16166,32 @@ $as_echo "no (version $WX_VERSION is not new enough)" >&6; }
    6363        WX_LIBS=""
    6464        WX_LIBS_STATIC=""
     
    9494     fi
    9595   else
    96 @@ -16135,6 +16162,13 @@ $as_echo "no (version $WX_VERSION is not new enough)" >&6; }
     96@@ -16190,6 +16217,13 @@ $as_echo "no (version $WX_VERSION is not new enough)" >&6; }
    9797 
    9898 
     
    108108     as_fn_error $? "
    109109         wxWidgets must be installed on your system
    110 @@ -16150,9 +16184,6 @@ $as_echo "no (version $WX_VERSION is not new enough)" >&6; }
     110@@ -16205,9 +16239,6 @@ $as_echo "no (version $WX_VERSION is not new enough)" >&6; }
    111111         equivalent variable and wxWidgets version is $MIN_WX_VERSION or above.
    112112     " "$LINENO" 5
     
    318318--- src/engine/serverpath.cpp.orig
    319319+++ src/engine/serverpath.cpp
    320 @@ -272,8 +272,13 @@ wxString CServerPath::GetSafePath() const
     320@@ -258,8 +258,13 @@ wxString CServerPath::GetSafePath() const
    321321                len += iter->Length() + 2 + INTLENGTH;
    322322 
     
    332332        t = fast_sprint_number(t, m_type);
    333333        *(t++) = ' ';
    334 @@ -295,8 +300,11 @@ wxString CServerPath::GetSafePath() const
     334@@ -281,8 +286,11 @@ wxString CServerPath::GetSafePath() const
    335335                t += iter->size();
    336336        }
     
    347347--- src/engine/socket.cpp.orig
    348348+++ src/engine/socket.cpp
    349 @@ -1298,7 +1298,7 @@ void CSocket::SetEventHandler(CSocketEventHandler* pEvtHandler)
     349@@ -1187,7 +1187,7 @@ void CSocket::SetEventHandler(CSocketEventHandler* pEvtHandler)
    350350        }
    351351 }
     
    361361        {
    362362                // wxString is CoW, yet it doesn't even do this fast pointer
    363                 // comparison in it's less and/or equal operator(s).
     363                // comparison in its less and/or equal operator(s).
    364364+#if wxCHECK_VERSION(2, 9, 0)
    365365+               return lhs == rhs;
     
    394394                        else
    395395                                wxMessageBoxEx(wxString::Format(_("Failed to set language to %s, using default system language"), language.c_str()), _("Failed to change language"), wxICON_EXCLAMATION);
    396 @@ -689,7 +689,7 @@ void CFileZillaApp::CheckExistsFzsftp()
     396@@ -694,7 +694,7 @@ void CFileZillaApp::CheckExistsFzsftp()
    397397        if (!wxFileName::FileExists(executable))
    398398        {
     
    452452--- src/interface/QueueView.cpp.orig
    453453+++ src/interface/QueueView.cpp
    454 @@ -3451,9 +3451,13 @@ wxString CQueueView::ReplaceInvalidCharacters(const wxString& filename)
     454@@ -3443,9 +3443,13 @@ wxString CQueueView::ReplaceInvalidCharacters(const wxString& filename)
    455455        const wxChar replace = COptions::Get()->GetOption(OPTION_INVALID_CHAR_REPLACE)[0];
    456456 
     
    467467        const wxChar* p = filename.c_str();
    468468        while (*p)
    469 @@ -3488,9 +3492,11 @@ wxString CQueueView::ReplaceInvalidCharacters(const wxString& filename)
     469@@ -3480,9 +3484,11 @@ wxString CQueueView::ReplaceInvalidCharacters(const wxString& filename)
    470470                p++;
    471471        }
     
    483483--- src/interface/RemoteTreeView.cpp.orig
    484484+++ src/interface/RemoteTreeView.cpp
    485 @@ -350,7 +350,7 @@ void CRemoteTreeView::SetDirectoryListing(const CSharedPointer<const CDirectoryL
     485@@ -351,7 +351,7 @@ void CRemoteTreeView::SetDirectoryListing(const CSharedPointer<const CDirectoryL
    486486        SetItemImages(parent, false);
    487487 
     
    791791        else
    792792                event.Skip();
    793 --- src/interface/resources/settings.xrc.orig
    794 +++ src/interface/resources/settings.xrc
     793--- src/interface/resources/xrc/settings.xrc.orig
     794+++ src/interface/resources/xrc/settings.xrc
    795795@@ -427,7 +427,7 @@
    796796               </object>
     
    814814               <vgap>5</vgap>
    815815               <growablecols>0</growablecols>
    816 @@ -1368,7 +1368,7 @@
     816@@ -1393,7 +1393,7 @@
    817817           <object class="sizeritem">
    818818             <object class="wxFlexGridSizer">
     
    823823                 <object class="wxStaticText">
    824824                   <label>&amp;Theme:</label>
    825 @@ -2080,7 +2080,6 @@
     825@@ -2105,7 +2105,6 @@
    826826                   </object>
    827827                   <growablecols>1</growablecols>
Note: See TracChangeset for help on using the changeset viewer.