Ticket #46768: FileZilla-update.patch

File FileZilla-update.patch, 6.6 KB (added by asedeno@…, 9 years ago)

  • dports/www/FileZilla/Portfile

     
    55PortGroup           wxWidgets 1.0
    66
    77name                FileZilla
    8 version             3.8.1
    9 set nightly_date    2014-06-17
    10 revision            1
     8version             3.10.1.1
    119categories          www aqua
    1210platforms           darwin
    1311maintainers         mojca strasweb.fr:rudloff openmaintainer
    … …  
    2018                    and an intuitive graphical user interface.
    2119
    2220homepage            https://filezilla-project.org/
    23 # temporary switch to nightly versions until wxWidgets 3.0 support
    24 # master_sites      sourceforge:project/filezilla/FileZilla_Client/${version}
    25 master_sites        https://filezilla-project.org/nightlies/${nightly_date} \
    26                     https://trac.macports.org/raw-attachment/ticket/44126
     21master_sites        sourceforge:project/filezilla/FileZilla_Client/${version}
    2722
    28 checksums           rmd160  ff65842f17888b9492c706ca8eb10fcb6e46b291 \
    29                     sha256  896b189cc043dbf31a9bff547fc8e5c5e643bd08ab4efac424e1fbe742e19a78
     23checksums           rmd160  881b2aafffc207775df00d4371fd36c3821eb1a0 \
     24                    sha256  67dbd801b15edd446f35b8df093a24440b5fd41966928d018f03f81db12e636d
    3025
    3126depends_build       port:pkgconfig
    3227
    33 #wxWidgets.use      wxWidgets-3.0
    34 
    3528depends_lib         port:dbus \
    3629                    port:gettext \
    3730                    port:gmp \
    … …  
    4336                    port:nettle \
    4437                    port:sqlite3 \
    4538                    port:xdg-utils
    46 #                   port:${wxWidgets.port}
    4739
    48 # distname          ${name}_${version}_src
    49 # TODO: just for the nightly
    50 distname            FileZilla3-src
    51 dist_subdir         ${name}/${nightly_date}
    52 
     40distname            ${name}_${version}_src
    5341use_bzip2           yes
    5442worksrcdir          filezilla-${version}
     43patchfiles          patch-tlssocket.h.diff
    5544
    56 patchfiles          patch-configure.diff
    57 
    5845# http://trac.filezilla-project.org/ticket/5473
    5946# http://sourceforge.net/p/tinyxml/patches/51/
    6047configure.args      --with-tinyxml=builtin \
    6148                    --disable-manualupdatecheck \
    6249                    --disable-autoupdatecheck
    63 #                   --with-wxdir=${wxWidgets.wxdir}
    6450
    65 #configure.env-append \
    66 #                    WXRC=${wxWidgets.wxrc}
    67 #
    68 #destroot {
    69 #    copy ${worksrcpath}/FileZilla.app ${destroot}${applications_dir}
    70 #}
    71 
    7251# gcc 4.2 doesn't suffice to build FileZilla on 10.6 and earlier
    7352# newer gcc compilers should also work
    7453if {${os.major} <= 10} {

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

     
    1 http://trac.filezilla-project.org/ticket/9582
    2 
    3 --- configure.orig
    4 +++ configure
    5 @@ -17870,12 +17870,12 @@ if test -n "$LIBGTK_CFLAGS"; then
    6      pkg_cv_LIBGTK_CFLAGS="$LIBGTK_CFLAGS"
    7   elif test -n "$PKG_CONFIG"; then
    8      if test -n "$PKG_CONFIG" && \
    9 -    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\""; } >&5
    10 -  ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5
    11 +    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0\""; } >&5
    12 +  ($PKG_CONFIG --exists --print-errors "gtk+-3.0") 2>&5
    13    ac_status=$?
    14    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    15    test $ac_status = 0; }; then
    16 -  pkg_cv_LIBGTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0" 2>/dev/null`
    17 +  pkg_cv_LIBGTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0" 2>/dev/null`
    18                       test "x$?" != "x0" && pkg_failed=yes
    19  else
    20    pkg_failed=yes
    21 @@ -17887,12 +17887,12 @@ if test -n "$LIBGTK_LIBS"; then
    22      pkg_cv_LIBGTK_LIBS="$LIBGTK_LIBS"
    23   elif test -n "$PKG_CONFIG"; then
    24      if test -n "$PKG_CONFIG" && \
    25 -    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\""; } >&5
    26 -  ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5
    27 +    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0\""; } >&5
    28 +  ($PKG_CONFIG --exists --print-errors "gtk+-3.0") 2>&5
    29    ac_status=$?
    30    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    31    test $ac_status = 0; }; then
    32 -  pkg_cv_LIBGTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0" 2>/dev/null`
    33 +  pkg_cv_LIBGTK_LIBS=`$PKG_CONFIG --libs "gtk+-3.0" 2>/dev/null`
    34                       test "x$?" != "x0" && pkg_failed=yes
    35  else
    36    pkg_failed=yes
    37 @@ -17913,21 +17913,21 @@ else
    38          _pkg_short_errors_supported=no
    39  fi
    40          if test $_pkg_short_errors_supported = yes; then
    41 -               LIBGTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0" 2>&1`
    42 +               LIBGTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0" 2>&1`
    43          else
    44 -               LIBGTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0" 2>&1`
    45 +               LIBGTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0" 2>&1`
    46          fi
    47         # Put the nasty error message in config.log where it belongs
    48         echo "$LIBGTK_PKG_ERRORS" >&5
    49  
    50  
    51 -      as_fn_error $? "gtk+-2.0 was not found, even though the used version of wxWidgets depends on it. Are you missing the gtk+2.0 development files?" "$LINENO" 5
    52 +      as_fn_error $? "gtk+-3.0 was not found, even though the used version of wxWidgets depends on it. Are you missing the gtk+2.0 development files?" "$LINENO" 5
    53  
    54  elif test $pkg_failed = untried; then
    55         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    56  $as_echo "no" >&6; }
    57  
    58 -      as_fn_error $? "gtk+-2.0 was not found, even though the used version of wxWidgets depends on it. Are you missing the gtk+2.0 development files?" "$LINENO" 5
    59 +      as_fn_error $? "gtk+-3.0 was not found, even though the used version of wxWidgets depends on it. Are you missing the gtk+2.0 development files?" "$LINENO" 5
    60  
    61  else
    62         LIBGTK_CFLAGS=$pkg_cv_LIBGTK_CFLAGS

  • dports/www/FileZilla/files/patch-tlssocket.h.diff

     
     1--- src/engine/tlssocket.h.orig 2015-01-21 14:55:36.000000000 -0500
     2+++ src/engine/tlssocket.h      2015-02-02 11:57:27.000000000 -0500
     3@@ -2,6 +2,7 @@
     4 #define __TLSSOCKET_H__
     5 
     6 #include <gnutls/gnutls.h>
     7+#include <errno.h>
     8 #include "backend.h"
     9 #include "socket.h"