Ticket #47319: 0001-Upgrade-FileZilla-to-3.10.3.patch

File 0001-Upgrade-FileZilla-to-3.10.3.patch, 3.0 KB (added by asedeno@…, 9 years ago)

  • dports/www/FileZilla/Portfile 

    From d967e99a99ba608f6fbf854a0f5172a5e5083a33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20R=2E=20Sede=C3=B1o?= <asedeno@mit.edu>
Date: Tue, 31 Mar 2015 09:47:06 -0400
Subject: [PATCH] Upgrade FileZilla to 3.10.3 No patches necessary!

---
 dports/www/FileZilla/Portfile                      |  8 ++---
 .../www/FileZilla/files/patch-upstream-r6543.diff  | 41 ----------------------
 2 files changed, 3 insertions(+), 46 deletions(-)
 delete mode 100644 dports/www/FileZilla/files/patch-upstream-r6543.diff

diff --git a/dports/www/FileZilla/Portfile b/dports/www/FileZilla/Portfile
index 4789306..ca1dd34 100644
    a b PortGroup wxWidgets 1.0 
    66PortGroup           compiler_blacklist_versions 1.0
    77
    88name                FileZilla
    9 version             3.10.2
     9version             3.10.3
    1010categories          www aqua
    1111platforms           darwin
    1212maintainers         mojca strasweb.fr:rudloff openmaintainer
    … … long_description FileZilla Client is a fast and reliable cross-platform \ 
    2121homepage            https://filezilla-project.org/
    2222master_sites        sourceforge:project/filezilla/FileZilla_Client/${version}
    2323
    24 checksums           rmd160  203f5ff359ec9742228c45375397a5178b286dc5 \
    25                     sha256  c08ee3bff4ce35010a5f32610ef699081662c9f8c51c20740f719e653ce9b611
     24checksums           rmd160  cdb1a073b66bedcb7930d804a588bc437a1e1e6b \
     25                    sha256  7968e2799437c0b89741bd7afbc077156525d930e9a18543fd087fbd8979de8d
    2626
    2727depends_build       port:pkgconfig
    2828
    … … distname ${name}_${version}_src 
    3838use_bzip2           yes
    3939worksrcdir          filezilla-${version}
    4040
    41 patchfiles          patch-upstream-r6543.diff
    42 
    4341# http://trac.filezilla-project.org/ticket/5473
    4442# http://sourceforge.net/p/tinyxml/patches/51/
    4543configure.args      --with-tinyxml=builtin \

  • deleted file dports/www/FileZilla/files/patch-upstream-r6543.diff 

    diff --git a/dports/www/FileZilla/files/patch-upstream-r6543.diff b/dports/www/FileZilla/files/patch-upstream-r6543.diff
deleted file mode 100644
index ca96b25..0000000
    + -  
    1 http://svn.filezilla-project.org/filezilla?view=revision&revision=6543
    2 
    3 --- src/interface/Mainfrm.h 2015/03/02 20:28:30 6542
    4 +++ src/interface/Mainfrm.h 2015/03/03 15:54:36 6543
    5 @@ -1,13 +1,18 @@
    6  #ifndef __MAINFRM_H__
    7  #define __MAINFRM_H__
    8  
    9 +#include "statusbar.h"
    10 +#include "engine_context.h"
    11 +
    12 +#include "wx/timer.h"
    13 +
    14  #ifndef __WXMAC__
    15  #include <wx/taskbar.h>
    16  #endif
    17  
    18 -#include "statusbar.h"
    19 -
    20 -#include "engine_context.h"
    21 +#if FZ_MANUALUPDATECHECK
    22 +#include "updater.h"
    23 +#endif
    24  
    25  class CAsyncRequestQueue;
    26  class CContextControl;
    27 @@ -25,13 +30,7 @@
    28  class CToolBar;
    29  class CWindowStateManager;
    30  
    31 -
    32 -#if FZ_MANUALUPDATECHECK
    33 -#include "updater.h"
    34 -#endif
    35 -class CWindowStateManager;
    36 -
    37 -class CMainFrame : public wxNavigationEnabled<wxFrame>
    38 +class CMainFrame final : public wxNavigationEnabled<wxFrame>
    39  #if FZ_MANUALUPDATECHECK
    40         , protected CUpdateHandler
    41  #endif