From a25db16beb10632983c065322455122493fded53 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Fri, 31 Oct 2025 14:34:21 +0100 Subject: [PATCH] filezilla, bump to 3.69.3 (#13167) --- ...-3.68.1.recipe => filezilla-3.69.3.recipe} | 10 +-- ...8.1.patchset => filezilla-3.69.3.patchset} | 76 +++++++++---------- 2 files changed, 43 insertions(+), 43 deletions(-) rename net-ftp/filezilla/{filezilla-3.68.1.recipe => filezilla-3.69.3.recipe} (93%) rename net-ftp/filezilla/patches/{filezilla-3.68.1.patchset => filezilla-3.69.3.patchset} (85%) diff --git a/net-ftp/filezilla/filezilla-3.68.1.recipe b/net-ftp/filezilla/filezilla-3.69.3.recipe similarity index 93% rename from net-ftp/filezilla/filezilla-3.68.1.recipe rename to net-ftp/filezilla/filezilla-3.69.3.recipe index e3715f42e..69c65d451 100644 --- a/net-ftp/filezilla/filezilla-3.68.1.recipe +++ b/net-ftp/filezilla/filezilla-3.69.3.recipe @@ -4,11 +4,11 @@ FTP, FTPS and SFTP client with lots of useful features and an intuitive \ graphical user interface." HOMEPAGE="https://filezilla-project.org/" -COPYRIGHT="2015-2024 Tim Kosse" +COPYRIGHT="2015-2025 Tim Kosse" LICENSE="GNU GPL v2" REVISION="1" SOURCE_URI="https://dev.gentoo.org/~dlan/distfiles/filezilla/FileZilla_${portVersion}_src.tar.xz" -CHECKSUM_SHA256="9df9209e29564ad92bcdee4a8ebe0e07648ef473028cdbde160f3d0612517679" +CHECKSUM_SHA256="77847c572388df9d64eb547b49b6be81896b57cf41d5e472659dfeb8053ae17e" PATCHES="filezilla-$portVersion.patchset" ADDITIONAL_FILES="filezilla.rdef.in" @@ -52,7 +52,7 @@ BUILD_REQUIRES=" wxgtk${secondaryArchSuffix}_devel xdg_utils xz_utils${secondaryArchSuffix}_devel - devel:libboost_regex$secondaryArchSuffix >= 1.83.0 + devel:libboost_regex$secondaryArchSuffix >= 1.88.0 devel:libfilezilla$secondaryArchSuffix devel:libgnutls$secondaryArchSuffix devel:libiconv$secondaryArchSuffix @@ -102,8 +102,8 @@ INSTALL() { make -C build install - mkdir -p $developLibDir - mv $libDir/*.la $developLibDir/ + # remove libtool file + rm -rf $libDir/*.la if [ $effectiveTargetArchitecture = x86 ]; then mv $binDir/* $prefix/bin/ diff --git a/net-ftp/filezilla/patches/filezilla-3.68.1.patchset b/net-ftp/filezilla/patches/filezilla-3.69.3.patchset similarity index 85% rename from net-ftp/filezilla/patches/filezilla-3.68.1.patchset rename to net-ftp/filezilla/patches/filezilla-3.69.3.patchset index 7aba3a60f..af88b4b1b 100644 --- a/net-ftp/filezilla/patches/filezilla-3.68.1.patchset +++ b/net-ftp/filezilla/patches/filezilla-3.69.3.patchset @@ -1,14 +1,14 @@ -From 0b7b06ea19c0c76f05eeafd3c836e8c939aee4e0 Mon Sep 17 00:00:00 2001 +From 595569fc63ccbf57ee14c45785eaea83dd497d43 Mon Sep 17 00:00:00 2001 From: David Karoly Date: Sat, 19 Nov 2022 13:44:51 +0100 Subject: configure: detect -lnetwork diff --git a/configure.ac b/configure.ac -index 7096136..01ffe07 100644 +index 15d103a..ac1dc3d 100644 --- a/configure.ac +++ b/configure.ac -@@ -256,7 +256,7 @@ if test "$buildmain" = "yes"; then +@@ -282,7 +282,7 @@ if test "$buildmain" = "yes"; then #include #include ]) @@ -18,20 +18,20 @@ index 7096136..01ffe07 100644 AC_SEARCH_LIBS([in6addr_loopback], [socket]) -- -2.37.3 +2.51.0 -From 9a933dde32a02d832c11b6bb0091f23b48ea9bfa Mon Sep 17 00:00:00 2001 +From 425a172bc5e2f1af67c5fb7961c6f845ad6594ec Mon Sep 17 00:00:00 2001 From: David Karoly Date: Wed, 1 Mar 2023 21:55:23 +0100 Subject: configure: check for wordexp.h diff --git a/configure.ac b/configure.ac -index 01ffe07..ae90927 100644 +index ac1dc3d..336a390 100644 --- a/configure.ac +++ b/configure.ac -@@ -256,6 +256,8 @@ if test "$buildmain" = "yes"; then +@@ -282,6 +282,8 @@ if test "$buildmain" = "yes"; then #include #include ]) @@ -41,7 +41,7 @@ index 01ffe07..ae90927 100644 AC_SEARCH_LIBS([getaddrinfo], [xnet]) AC_SEARCH_LIBS([in6addr_loopback], [socket]) diff --git a/src/commonui/fz_paths.cpp b/src/commonui/fz_paths.cpp -index a9f64f7..1f9b524 100644 +index 8654100..defef25 100644 --- a/src/commonui/fz_paths.cpp +++ b/src/commonui/fz_paths.cpp @@ -15,8 +15,10 @@ @@ -56,10 +56,10 @@ index a9f64f7..1f9b524 100644 using namespace std::literals; -- -2.37.3 +2.51.0 -From b8ab002d0ee6192365ceb54a856bcb8da6a53a3b Mon Sep 17 00:00:00 2001 +From 93b80e44cf41929d64848fcfebc5727882c6a278 Mon Sep 17 00:00:00 2001 From: David Karoly Date: Fri, 3 Mar 2023 14:36:17 +0100 Subject: Fallback to glob if wordexp is not available. Inspired by OpenBSD @@ -67,10 +67,10 @@ Subject: Fallback to glob if wordexp is not available. Inspired by OpenBSD diff --git a/configure.ac b/configure.ac -index ae90927..af4a66a 100644 +index 336a390..da5a21e 100644 --- a/configure.ac +++ b/configure.ac -@@ -256,8 +256,12 @@ if test "$buildmain" = "yes"; then +@@ -282,8 +282,12 @@ if test "$buildmain" = "yes"; then #include #include ]) @@ -84,7 +84,7 @@ index ae90927..af4a66a 100644 AC_SEARCH_LIBS([getaddrinfo], [xnet]) AC_SEARCH_LIBS([in6addr_loopback], [socket]) diff --git a/src/commonui/fz_paths.cpp b/src/commonui/fz_paths.cpp -index 1f9b524..4c84940 100644 +index defef25..7659337 100644 --- a/src/commonui/fz_paths.cpp +++ b/src/commonui/fz_paths.cpp @@ -15,6 +15,9 @@ @@ -97,7 +97,7 @@ index 1f9b524..4c84940 100644 #ifdef HAVE_WORDEXP_H #include #endif -@@ -489,6 +492,8 @@ char const* GetDownloadDirImpl(); +@@ -496,6 +499,8 @@ char const* GetDownloadDirImpl(); #elif !defined(FZ_WINDOWS) namespace { @@ -106,7 +106,7 @@ index 1f9b524..4c84940 100644 std::string ShellUnescape(std::string const& path) { std::string ret; -@@ -502,6 +507,26 @@ std::string ShellUnescape(std::string const& path) +@@ -509,6 +514,26 @@ std::string ShellUnescape(std::string const& path) return ret; } @@ -134,17 +134,17 @@ index 1f9b524..4c84940 100644 size_t next_line(fz::file& f, fz::buffer& buf, size_t maxlen = 16 * 1024) { -- -2.37.3 +2.51.0 -From 6b0efe250f1edab9fc1141810b34878df221602a Mon Sep 17 00:00:00 2001 +From be04ff12c786031cd41b0653ec12448e29e86c42 Mon Sep 17 00:00:00 2001 From: David Karoly Date: Sat, 19 Nov 2022 13:44:51 +0100 Subject: adjust folders for Haiku diff --git a/src/commonui/Makefile.am b/src/commonui/Makefile.am -index dbd9a00..c6ea81a 100644 +index cf74a26..a703cf1 100644 --- a/src/commonui/Makefile.am +++ b/src/commonui/Makefile.am @@ -5,6 +5,7 @@ lib_LTLIBRARIES = libfzclient-commonui-private.la @@ -156,10 +156,10 @@ index dbd9a00..c6ea81a 100644 libfzclient_commonui_private_la_CXXFLAGS = -fvisibility=hidden libfzclient_commonui_private_la_LDFLAGS = -no-undefined -release $(PACKAGE_VERSION_MAJOR).$(PACKAGE_VERSION_MINOR).$(PACKAGE_VERSION_MICRO) diff --git a/src/commonui/fz_paths.cpp b/src/commonui/fz_paths.cpp -index 4c84940..9c61680 100644 +index 7659337..4ae39d3 100644 --- a/src/commonui/fz_paths.cpp +++ b/src/commonui/fz_paths.cpp -@@ -290,6 +290,19 @@ CLocalPath GetFZDataDir(std::vector const& fileToFind, std::wstrin +@@ -297,6 +297,19 @@ CLocalPath GetFZDataDir(std::vector const& fileToFind, std::wstrin } } @@ -179,7 +179,7 @@ index 4c84940..9c61680 100644 std::wstring selfDir = GetOwnExecutableDir(); if (!selfDir.empty()) { if (searchSelfDir && testPath(selfDir)) { -@@ -352,7 +365,7 @@ CLocalPath GetDefaultsDir() +@@ -359,7 +372,7 @@ CLocalPath GetDefaultsDir() #endif if (path.empty()) { @@ -189,10 +189,10 @@ index 4c84940..9c61680 100644 return path; }(); diff --git a/src/interface/FileZilla.cpp b/src/interface/FileZilla.cpp -index 31f1d72..add523c 100644 +index 01dffce..da2d725 100644 --- a/src/interface/FileZilla.cpp +++ b/src/interface/FileZilla.cpp -@@ -298,7 +298,7 @@ int CFileZillaApp::OnExit() +@@ -300,7 +300,7 @@ int CFileZillaApp::OnExit() bool CFileZillaApp::LoadResourceFiles() { AddStartupProfileRecord("CFileZillaApp::LoadResourceFiles"sv); @@ -201,7 +201,7 @@ index 31f1d72..add523c 100644 wxImage::AddHandler(new wxPNGHandler()); -@@ -326,7 +326,7 @@ bool CFileZillaApp::LoadLocales() +@@ -328,7 +328,7 @@ bool CFileZillaApp::LoadLocales() } #ifndef __WXMAC__ else { @@ -211,10 +211,10 @@ index 31f1d72..add523c 100644 #endif if (!m_localesDir.empty()) { diff --git a/src/interface/locale_initializer.cpp b/src/interface/locale_initializer.cpp -index c7d2fc7..fac6aa7 100644 +index ea4859e..148980c 100644 --- a/src/interface/locale_initializer.cpp +++ b/src/interface/locale_initializer.cpp -@@ -204,7 +204,7 @@ std::string CInitializer::GetDefaultsXmlFile() +@@ -205,7 +205,7 @@ std::string CInitializer::GetDefaultsXmlFile() std::string selfPath = fz::to_string(GetOwnExecutableDir()); file = CheckPathForDefaults(selfPath, 0, "fzdefaults.xml"); if (selfPath.size() > 5 && fz::ends_with(selfPath, std::string("/bin/"))) { @@ -223,7 +223,7 @@ index c7d2fc7..fac6aa7 100644 if (!file.empty()) { return file; } -@@ -225,7 +225,7 @@ std::string CInitializer::GetDefaultsXmlFile() +@@ -226,7 +226,7 @@ std::string CInitializer::GetDefaultsXmlFile() path += '/'; } if (segment.size() > 5 && fz::ends_with(segment, std::string("/bin/"))) { @@ -233,17 +233,17 @@ index c7d2fc7..fac6aa7 100644 return file; } -- -2.37.3 +2.51.0 -From 8276c8bfb1fec087b5c812d51598e754ee356cc9 Mon Sep 17 00:00:00 2001 +From 1d309590068e977cad900fa4a699f3312e09aa62 Mon Sep 17 00:00:00 2001 From: David Karoly Date: Sat, 3 Dec 2022 16:39:13 +0100 Subject: Haiku: use BNotification diff --git a/src/interface/QueueView.cpp b/src/interface/QueueView.cpp -index a52d648..d0b28a3 100644 +index 31de7aa..13de49a 100644 --- a/src/interface/QueueView.cpp +++ b/src/interface/QueueView.cpp @@ -29,7 +29,9 @@ @@ -257,7 +257,7 @@ index a52d648..d0b28a3 100644 #include "../dbus/desktop_notification.h" #elif defined(__WXGTK__) || defined(__WXMSW__) #include -@@ -2701,7 +2703,13 @@ void CQueueView::ActionAfter(bool warned) +@@ -2706,7 +2708,13 @@ void CQueueView::ActionAfter(bool warned) msg = _("All files have been successfully transferred"); } @@ -273,7 +273,7 @@ index a52d648..d0b28a3 100644 m_desktop_notification = std::make_unique(); } diff --git a/src/interface/QueueView.h b/src/interface/QueueView.h -index 7b16d8a..8b120b6 100644 +index d512bba..812cf91 100644 --- a/src/interface/QueueView.h +++ b/src/interface/QueueView.h @@ -86,7 +86,9 @@ class CMainFrame; @@ -299,17 +299,17 @@ index 7b16d8a..8b120b6 100644 #elif defined(__WXGTK__) || defined(__WXMSW__) std::unique_ptr m_desktop_notification; -- -2.37.3 +2.51.0 -From aac199c59a3de86de0fa330ef9f2e389b467a673 Mon Sep 17 00:00:00 2001 +From b8df52510cebbc52b48dac135957e2929709961e Mon Sep 17 00:00:00 2001 From: David Karoly Date: Mon, 5 Dec 2022 23:03:41 +0100 Subject: Haiku: initialize XDG vars diff --git a/src/interface/locale_initializer.cpp b/src/interface/locale_initializer.cpp -index fac6aa7..7806c7f 100644 +index 148980c..ae1bac1 100644 --- a/src/interface/locale_initializer.cpp +++ b/src/interface/locale_initializer.cpp @@ -10,6 +10,12 @@ @@ -325,7 +325,7 @@ index fac6aa7..7806c7f 100644 std::wstring GetOwnExecutableDir(); struct t_fallbacks -@@ -76,6 +82,30 @@ static std::string mkstr(const char* str) +@@ -77,6 +83,30 @@ static std::string mkstr(const char* str) } } @@ -356,7 +356,7 @@ index fac6aa7..7806c7f 100644 int main(int argc, char** argv) { std::string locale = CInitializer::GetLocaleOption(); -@@ -93,6 +123,10 @@ int main(int argc, char** argv) +@@ -94,6 +124,10 @@ int main(int argc, char** argv) } } @@ -368,5 +368,5 @@ index fac6aa7..7806c7f 100644 } -- -2.37.3 +2.51.0