<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f68482a3c7bc566870f01f1a1efd1dfd27d937ea">https://github.com/macports/macports-ports/commit/f68482a3c7bc566870f01f1a1efd1dfd27d937ea</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new f68482a3c7b libfilezilla: update to 0.32.0, fix build for old systems
</span>f68482a3c7b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f68482a3c7bc566870f01f1a1efd1dfd27d937ea
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Sun Sep 4 14:45:22 2022 +0700
<span style='display:block; white-space:pre;color:#404040;'> libfilezilla: update to 0.32.0, fix build for old systems
</span>---
devel/libfilezilla/Portfile | 51 +++++++++++++++++++++++---------
devel/libfilezilla/files/patch-util.diff | 14 +++++++++
2 files changed, 51 insertions(+), 14 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libfilezilla/Portfile b/devel/libfilezilla/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8a40cbf03c5..b509db8ba3b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libfilezilla/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libfilezilla/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +1,19 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup legacysupport 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup legacysupport 1.1
</span>
# AT_SYMLINK_NOFOLLOW
legacysupport.newest_darwin_requires_legacy 13
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# 0.32.0 is the last version supporting old gnutls.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# 0.33.0+ require gnutls 3.7.0+, which is currently in gnutls-devel port.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Update libfilezilla once gnutls port is updated. 0.38.1 confirmed to build fine.
</span> name libfilezilla
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.25.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.32.0
</span> revision 0
categories devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> maintainers {@lhaeger gmx.net:lothar.haeger} openmaintainer
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,21 +26,23 @@ long_description Small and modern C++ library, offering some basic \
</span> homepage https://lib.filezilla-project.org/
master_sites https://download.filezilla-project.org/libfilezilla/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 880b3fd782670669a88038cc919eb4337f0c8fbb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3bf6feb5246ed3d11b72d74b485d1989724be0884568cd456195e7624f9c7b2a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 562726
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 8e9b05833261bb362c27ba45f2c1c6bf21aca368 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 60c912bff2867a36d97ea2bca01a06e293d42445795cedd43f5164a92e585b0f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 591199
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DX_PERL=/usr/bin/perl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-util.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:cppunit \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/perl:perl5 \
</span> port:gettext \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bin:perl:perl5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append path:lib/pkgconfig/gnutls.pc:gnutls \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gmp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libiconv \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:nettle
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:libiconv \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:nettle \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/gnutls.pc:gnutls
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_test-append port:cppunit
</span>
use_bzip2 yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,6 +50,25 @@ compiler.cxx_standard 2017
</span> # libfilezilla uses thread_local, which is not supported in Xcode < 8
compiler.thread_local_storage yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DX_PERL=${prefix}/bin/perl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-doxygen-doc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # process.cpp: error: invalid conversion from 'uint32_t*' {aka 'unsigned int*'} to 'UInt32*' {aka 'long unsigned int*'} [-fpermissive]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -fpermissive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[string match *gcc* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -latomic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> test.run yes
test.dir ${worksrcpath}/tests
test.cmd ./test
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libfilezilla/files/patch-util.diff b/devel/libfilezilla/files/patch-util.diff
</span>new file mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..09d5d6e6841
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libfilezilla/files/patch-util.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# random.h: error: 'u_int' has not been declared
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/util.cpp.orig 2021-09-14 20:31:27.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/util.cpp 2022-03-25 01:56:45.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18,6 +18,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if HAVE_GETENTROPY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #ifndef u_int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #define u_int unsigned int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <Availability.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/random.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span></pre><pre style='margin:0'>
</pre>