<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0ab793f2b712a90991fe3f25ad63a471bbe45f3e">https://github.com/macports/macports-ports/commit/0ab793f2b712a90991fe3f25ad63a471bbe45f3e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0ab793f2b712a90991fe3f25ad63a471bbe45f3e
</span>Author: Dennis Camera <dennis.camera@riiengineering.ch>
AuthorDate: Fri Mar 17 14:57:18 2023 +0100
<span style='display:block; white-space:pre;color:#404040;'> www/filezilla: update to 3.63.2.1
</span>---
www/FileZilla/Portfile | 12 +++---
....diff => patch-src-commonui-buildinfo.cpp.diff} | 6 +--
.../files/patch-src-engine-version.cpp.diff | 50 ++++++++++++++++++++++
.../files/patch-src-interface-mainfrm.cpp.diff | 11 +++++
4 files changed, 71 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/FileZilla/Portfile b/www/FileZilla/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e3a009cccc5..23be007d0d4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/FileZilla/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/FileZilla/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup wxWidgets 1.0
</span> PortGroup compiler_blacklist_versions 1.0
name FileZilla
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.51.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.63.2.1
</span>
categories www aqua
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,9 +21,9 @@ long_description FileZilla Client is a fast and reliable cross-platform \
</span> homepage https://filezilla-project.org/
master_sites https://download.filezilla-project.org/client
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 1f7380bd1cec6c17d9b80d3d47214506cb197d14 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 82be1c4a4f51bb32a599d0b4cc3a24127ba948c0af0f957233cc6a13ea3b6c4c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4808717
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 16051a71384d6c5c760c30354b3fd54b29820c9e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6dc14c6f7f4de7e44c8429b32f7f9edbbf10732d21dd75d8974ae44007b7b79d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4966152
</span>
# wxWidgets-3.0 with support for C++11 on < 10.9
wxWidgets.use wxWidgets-3.0-cxx11
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,7 +45,9 @@ distname ${name}_${version}_src
</span> use_bzip2 yes
worksrcdir filezilla-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-src-interface-buildinfo.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-src-commonui-buildinfo.cpp.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src-engine-version.cpp.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src-interface-mainfrm.cpp.diff
</span>
# http://trac.filezilla-project.org/ticket/5473
# http://sourceforge.net/p/tinyxml/patches/51/
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/FileZilla/files/patch-src-interface-buildinfo.cpp.diff b/www/FileZilla/files/patch-src-commonui-buildinfo.cpp.diff
</span>similarity index 63%
rename from www/FileZilla/files/patch-src-interface-buildinfo.cpp.diff
rename to www/FileZilla/files/patch-src-commonui-buildinfo.cpp.diff
<span style='display:block; white-space:pre;color:#808080;'>index 9973bb1fd50..b48c9141807 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/FileZilla/files/patch-src-interface-buildinfo.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/FileZilla/files/patch-src-commonui-buildinfo.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span> temporary workaround (needs a proper patch)
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/interface/buildinfo.cpp.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/interface/buildinfo.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -218,7 +218,7 @@ bool CBuildInfo::IsUnstable()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/commonui/buildinfo.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/commonui/buildinfo.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -137,7 +137,7 @@
</span>
#if defined(__i386__) || defined(__x86_64__) || defined(_M_X64) || defined(_M_IX86)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/FileZilla/files/patch-src-engine-version.cpp.diff b/www/FileZilla/files/patch-src-engine-version.cpp.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..861152253f6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/FileZilla/files/patch-src-engine-version.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,50 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/engine/version.cpp.orig 2021-05-29 05:30:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/engine/version.cpp 2023-03-17 14:05:16.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9,7 +9,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif FZ_UNIX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/utsname.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <sys/sysctl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MIN_REQUIRED < 101500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <Carbon/Carbon.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define CARBON_AVAILABLE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_CONFIG_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -145,13 +150,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif FZ_MAC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SystemVersion GetSystemVersion()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SInt32 major{};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Gestalt(gestaltSystemVersionMajor, &major);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ unsigned int major = 0, minor = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SInt32 minor{};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Gestalt(gestaltSystemVersionMinor, &minor);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ size_t vers_len = 32;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ char vers[vers_len];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vers[0] = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (0 == sysctlbyname("kern.osproductversion", vers, &vers_len, NULL, 0)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ char *vp = vers;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ major = atoi(vp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ while (vp < (vers + vers_len) && *vp++ != '.');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ minor = atoi(vp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef CARBON_AVAILABLE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#pragma clang diagnostic push
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#pragma clang diagnostic ignored "-Wdeprecated-declarations"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* Carbon fallback */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Gestalt(gestaltSystemVersionMajor, (SInt32*)&major);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Gestalt(gestaltSystemVersionMinor, (SInt32*)&minor);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#pragma clang diagnostic pop
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</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;'>+- return {static_cast<unsigned int>(major), static_cast<unsigned int>(minor)};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return {major, minor};
</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;'>+ #else
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/FileZilla/files/patch-src-interface-mainfrm.cpp.diff b/www/FileZilla/files/patch-src-interface-mainfrm.cpp.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8faf892c276
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/FileZilla/files/patch-src-interface-mainfrm.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/interface/Mainfrm.cpp.orig 2023-03-03 15:06:10.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/interface/Mainfrm.cpp 2023-03-17 14:27:02.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -497,7 +497,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_pBottomSplitter->Initialize(m_pContextControl);
</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;'>+-#ifdef __WXMAC__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__WXMAC__) && wxCHECK_VERSION(3, 1, 6)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EnableFullScreenView(true, wxFULLSCREEN_NOMENUBAR);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>