From b855006996982e55a983b15e167db9359447e744 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Fri, 5 Oct 2018 08:46:07 +0200 Subject: [PATCH] filezilla: update to 3.37.4. --- .../patches/revert_fz_to_wstring.patch | 49 ------------------- srcpkgs/filezilla/template | 4 +- 2 files changed, 2 insertions(+), 51 deletions(-) delete mode 100644 srcpkgs/filezilla/patches/revert_fz_to_wstring.patch diff --git a/srcpkgs/filezilla/patches/revert_fz_to_wstring.patch b/srcpkgs/filezilla/patches/revert_fz_to_wstring.patch deleted file mode 100644 index 9ded8c0ecae..00000000000 --- a/srcpkgs/filezilla/patches/revert_fz_to_wstring.patch +++ /dev/null @@ -1,49 +0,0 @@ -Source: Hoshpak -Upstream: https://trac.filezilla-project.org/ticket/11760 -Reason: Reverts upstream changes that lead to compilation failures ---- src/interface/queue.cpp 2018-10-02 12:09:20.545473576 +0200 -+++ src/interface/queue.cpp 2018-10-02 12:11:39.761472912 +0200 -@@ -330,7 +330,7 @@ - void CFileItem::SetTargetFile(wxString const& file) - { - if (!file.empty() && file != m_sourceFile) { -- m_targetFile = fz::sparse_optional(fz::to_wstring(file)); -+ m_targetFile = fz::sparse_optional(to_wstring(file)); - } - else { - m_targetFile.clear(); ---- src/interface/state.cpp 2018-10-02 12:12:10.641029712 +0200 -+++ src/interface/state.cpp 2018-10-02 12:13:08.456200318 +0200 -@@ -780,12 +780,12 @@ - fz::local_filesys::type type = fz::local_filesys::get_file_info(fz::to_native(file), is_link, &size, 0, 0); - if (type == fz::local_filesys::file) { - std::wstring localFile; -- CLocalPath const localPath(fz::to_wstring(file), &localFile); -+ CLocalPath const localPath(to_wstring(file), &localFile); - mainFrame.GetQueue()->QueueFile(queueOnly, false, localFile, wxEmptyString, localPath, path, state.GetServer(), size); - mainFrame.GetQueue()->QueueFile_Finish(!queueOnly); - } - else if (type == fz::local_filesys::dir) { -- CLocalPath localPath(fz::to_wstring(file)); -+ CLocalPath localPath(to_wstring(file)); - if (localPath.HasParent()) { - - CServerPath remotePath = path; -@@ -863,7 +863,7 @@ - fz::local_filesys::type type = fz::local_filesys::get_file_info(fz::to_native(file), is_link, &size, 0, 0); - if (type == fz::local_filesys::file) { - std::wstring name; -- CLocalPath sourcePath(fz::to_wstring(file), &name); -+ CLocalPath sourcePath(to_wstring(file), &name); - if (name.empty()) { - continue; - } -@@ -880,7 +880,7 @@ - } - } - else if (type == fz::local_filesys::dir) { -- CLocalPath sourcePath(fz::to_wstring(file)); -+ CLocalPath sourcePath(to_wstring(file)); - if (sourcePath == path || sourcePath.GetParent() == path) { - continue; - } diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template index e758f184386..fc41cea4eee 100644 --- a/srcpkgs/filezilla/template +++ b/srcpkgs/filezilla/template @@ -1,6 +1,6 @@ # Template file for 'filezilla' pkgname=filezilla -version=3.37.3 +version=3.37.4 revision=1 build_style=gnu-configure configure_args="--disable-static --disable-manualupdatecheck --disable-autoupdatecheck @@ -15,7 +15,7 @@ license="GPL-2.0-or-later" homepage="https://filezilla-project.org" changelog="https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/NEWS?view=co" distfiles="https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2" -checksum=33b2c5dd77c1f619f62bb5a513875e8a58e572be49ee05d1aec364204ed90555 +checksum=71bc4778b89facc48adbb1265621fbabff09aac9554e1b5945a1404de3f13c99 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" wxWidgets-gtk3-devel xdg-utils"