Ticket #47271: 0001-bump-FileZilla-to-v3.10.2.patch

File 0001-bump-FileZilla-to-v3.10.2.patch, 4.6 KB (added by asedeno@…, 10 years ago)

  • dports/www/FileZilla/Portfile 

    From 3d9d7d1fdb550aa622d26ceb0afa2c371f72fa5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20R=2E=20Sede=C3=B1o?= <asedeno@mit.edu>
Date: Thu, 26 Mar 2015 15:47:23 -0400
Subject: [PATCH] bump FileZilla to v3.10.2

---
 dports/www/FileZilla/Portfile                      |  9 +++--
 dports/www/FileZilla/files/patch-configure.diff    | 20 -----------
 dports/www/FileZilla/files/patch-r6543.diff        | 39 ++++++++++++++++++++++
 .../files/patch-src-include-socket.h.diff          | 13 --------
 4 files changed, 43 insertions(+), 38 deletions(-)
 delete mode 100644 dports/www/FileZilla/files/patch-configure.diff
 create mode 100644 dports/www/FileZilla/files/patch-r6543.diff
 delete mode 100644 dports/www/FileZilla/files/patch-src-include-socket.h.diff

diff --git a/dports/www/FileZilla/Portfile b/dports/www/FileZilla/Portfile
index 5c84134..32efd49 100644
    a b PortSystem 1.0 
    55PortGroup           wxWidgets 1.0
    66
    77name                FileZilla
    8 version             3.10.1.1
     8version             3.10.2
    99categories          www aqua
    1010platforms           darwin
    1111maintainers         mojca strasweb.fr:rudloff openmaintainer
    … … long_description FileZilla Client is a fast and reliable cross-platform \ 
    2020homepage            https://filezilla-project.org/
    2121master_sites        sourceforge:project/filezilla/FileZilla_Client/${version}
    2222
    23 checksums           rmd160  881b2aafffc207775df00d4371fd36c3821eb1a0 \
    24                     sha256  67dbd801b15edd446f35b8df093a24440b5fd41966928d018f03f81db12e636d
     23checksums           rmd160  203f5ff359ec9742228c45375397a5178b286dc5 \
     24                    sha256  c08ee3bff4ce35010a5f32610ef699081662c9f8c51c20740f719e653ce9b611
    2525
    2626depends_build       port:pkgconfig
    2727
    … … distname ${name}_${version}_src 
    3737use_bzip2           yes
    3838worksrcdir          filezilla-${version}
    3939
    40 patchfiles          patch-src-include-socket.h.diff \
    41                     patch-configure.diff
     40patchfiles          patch-r6543.diff
    4241
    4342# http://trac.filezilla-project.org/ticket/5473
    4443# http://sourceforge.net/p/tinyxml/patches/51/

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

    diff --git a/dports/www/FileZilla/files/patch-configure.diff b/dports/www/FileZilla/files/patch-configure.diff
deleted file mode 100644
index 575da85..0000000
    + -  
    1 --- configure.orig
    2 +++ configure
    3 @@ -16392,7 +16391,7 @@ main ()
    4    return 0;
    5  }
    6  _ACEOF
    7 -if ac_fn_cxx_try_cpp "$LINENO"; then :
    8 +if ac_fn_cxx_try_compile "$LINENO"; then :
    9    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
    10  $as_echo "yes" >&6; }
    11  else
    12 @@ -16406,7 +16405,7 @@ $as_echo "no" >&6; }
    13  
    14  
    15  fi
    16 -rm -f conftest.err conftest.i conftest.$ac_ext
    17 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    18    CPPFLAGS="$CPPFLAGS_OLD"
    19    ac_ext=c
    20  ac_cpp='$CPP $CPPFLAGS'

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

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

  • deleted file dports/www/FileZilla/files/patch-src-include-socket.h.diff 

    diff --git a/dports/www/FileZilla/files/patch-src-include-socket.h.diff b/dports/www/FileZilla/files/patch-src-include-socket.h.diff
deleted file mode 100644
index 31841b5..0000000
    + -  
    1 http://svn.filezilla-project.org/filezilla?view=revision&revision=6415
    2 
    3 --- src/include/socket.h.orig
    4 +++ src/include/socket.h
    5 @@ -3,6 +3,8 @@
    6  
    7  #include "event_handler.h"
    8  
    9 +#include <errno.h>
    10 +
    11  // IPv6 capable, non-blocking socket class for use with wxWidgets.
    12  // Error codes are the same as used by the POSIX socket functions,
    13  // see 'man 2 socket', 'man 2 connect', ...