moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

filezilla: update to 3.37.3.

Browse source
This commit is contained in:
Helmut Pozimski 2018-10-02 12:20:40 +02:00
parent 0d616085c0
commit 7e42bdf4a7
2 changed files with 52 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

49
srcpkgs/filezilla/patches/revert_fz_to_wstring.patch Normal file
View file

@ -0,0 +1,49 @@
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<std::wstring>(fz::to_wstring(file));
+ m_targetFile = fz::sparse_optional<std::wstring>(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;
}

6
srcpkgs/filezilla/template
View file

@ -1,6 +1,6 @@
# Template file for 'filezilla'
pkgname=filezilla
version=3.37.1
version=3.37.3
revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-manualupdatecheck --disable-autoupdatecheck
@ -12,10 +12,10 @@ depends="xdg-utils hicolor-icon-theme desktop-file-utils"
short_desc="Fast and reliable FTP, FTPS and SFTP client"
maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="GPL-2.0-or-later"
homepage="http://filezilla-project.org/"
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=f4e853495561e63abc85596d64e57238a822e16ab376f46c942503f650a57dad
checksum=33b2c5dd77c1f619f62bb5a513875e8a58e572be49ee05d1aec364204ed90555
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" wxWidgets-gtk3-devel xdg-utils"