From d6a40a632c27b70bfe8eed1bd100676176bd544e Mon Sep 17 00:00:00 2001 From: Martchus Date: Tue, 19 Jul 2016 15:47:13 +0200 Subject: [PATCH] Update mingw-w64-filezilla --- filezilla/mingw-w64-svn/PKGBUILD | 2 +- filezilla/mingw-w64/PKGBUILD | 4 ++-- filezilla/svn/PKGBUILD | 2 +- libfilezilla/mingw-w64-svn/PKGBUILD | 3 ++- libfilezilla/mingw-w64/PKGBUILD | 10 +++++++--- .../mingw-w64/extern_template_instantiation.patch | 11 +++++++++++ libfilezilla/svn/PKGBUILD | 2 +- 7 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 libfilezilla/mingw-w64/extern_template_instantiation.patch diff --git a/filezilla/mingw-w64-svn/PKGBUILD b/filezilla/mingw-w64-svn/PKGBUILD index 37e9e313..8bf70945 100644 --- a/filezilla/mingw-w64-svn/PKGBUILD +++ b/filezilla/mingw-w64-svn/PKGBUILD @@ -7,7 +7,7 @@ _name=filezilla pkgname=mingw-w64-filezilla-svn pkgver=r7253 pkgrel=1 -pkgdesc="Fast and reliable FTP, FTPS and SFTP client (mingw-w64, svn version)" +pkgdesc="Fast and reliable FTP, FTPS and SFTP client (mingw-w64)" arch=('any') url="https://filezilla-project.org/" license=('GPL') diff --git a/filezilla/mingw-w64/PKGBUILD b/filezilla/mingw-w64/PKGBUILD index 6fbda78f..5b047d70 100644 --- a/filezilla/mingw-w64/PKGBUILD +++ b/filezilla/mingw-w64/PKGBUILD @@ -5,7 +5,7 @@ _name=filezilla pkgname=mingw-w64-filezilla -pkgver=3.18.0 +pkgver=3.19.0 pkgrel=1 pkgdesc="Fast and reliable FTP, FTPS and SFTP client (mingw-w64)" arch=('any') @@ -16,7 +16,7 @@ makedepends=('mingw-w64-configure' 'wxgtk') options=(staticlibs !strip !buildflags) install= source=("http://downloads.sourceforge.net/project/filezilla/FileZilla_Client/${pkgver}/FileZilla_${pkgver}_src.tar.bz2") -md5sums=('9aaad9197ab3d80d658af8db6e8cbbcd') +md5sums=('8cbb61393e029f4bd71cfe1d1f32adeb') _architectures="i686-w64-mingw32 x86_64-w64-mingw32" diff --git a/filezilla/svn/PKGBUILD b/filezilla/svn/PKGBUILD index 1ed1cabb..5006114f 100644 --- a/filezilla/svn/PKGBUILD +++ b/filezilla/svn/PKGBUILD @@ -7,7 +7,7 @@ _name=filezilla pkgname=filezilla-svn pkgver=r7253 pkgrel=1 -pkgdesc="Fast and reliable FTP, FTPS and SFTP client (svn version)" +pkgdesc="Fast and reliable FTP, FTPS and SFTP client" arch=('i686' 'x86_64') url="https://filezilla-project.org/" license=('GPL') diff --git a/libfilezilla/mingw-w64-svn/PKGBUILD b/libfilezilla/mingw-w64-svn/PKGBUILD index 717170ba..be07154a 100644 --- a/libfilezilla/mingw-w64-svn/PKGBUILD +++ b/libfilezilla/mingw-w64-svn/PKGBUILD @@ -7,7 +7,7 @@ _name=libfilezilla pkgname=mingw-w64-libfilezilla-svn pkgver=r7253 pkgrel=1 -pkgdesc="Library used by FileZilla (mingw-w64, svn version)" +pkgdesc="Library used by FileZilla (mingw-w64)" arch=('any') url="https://filezilla-project.org/" license=('GPL') @@ -34,6 +34,7 @@ prepare() { } build() { + export CXXFLAGS='-O0' for _arch in ${_architectures}; do mkdir -p "${srcdir}/${_name}/build-${_arch}" && cd "${srcdir}/${_name}/build-${_arch}" ${_arch}-configure diff --git a/libfilezilla/mingw-w64/PKGBUILD b/libfilezilla/mingw-w64/PKGBUILD index 65fb2254..6c1d74e6 100644 --- a/libfilezilla/mingw-w64/PKGBUILD +++ b/libfilezilla/mingw-w64/PKGBUILD @@ -5,7 +5,7 @@ _name=libfilezilla pkgname=mingw-w64-libfilezilla -pkgver=0.5.2 +pkgver=0.5.3 pkgrel=1 pkgdesc="Library used by FileZilla (mingw-w64)" arch=('any') @@ -15,17 +15,21 @@ depends=('mingw-w64-crt') makedepends=('mingw-w64-configure') options=(staticlibs !strip !buildflags) install= -source=("http://downloads.sourceforge.net/project/filezilla/libfilezilla/${pkgver}/${_name}-${pkgver}.tar.bz2") -md5sums=('be50726969cabda0f1b1c9ee432c1f4e') +source=("http://downloads.sourceforge.net/project/filezilla/libfilezilla/${pkgver}/${_name}-${pkgver}.tar.bz2" + 'extern_template_instantiation.patch') +md5sums=('6192fd89318c1107b5b8095fd43dc3a5' + '06871d88895b83d56069be8f5952fdf4') _architectures="i686-w64-mingw32 x86_64-w64-mingw32" prepare() { cd "${srcdir}/${_name}-${pkgver}" + patch -p0 -i ../extern_template_instantiation.patch autoreconf -i } build() { + export CXXFLAGS='-O0' for _arch in ${_architectures}; do mkdir -p "${srcdir}/${_name}-${pkgver}/build-${_arch}" && cd "${srcdir}/${_name}-${pkgver}/build-${_arch}" ${_arch}-configure diff --git a/libfilezilla/mingw-w64/extern_template_instantiation.patch b/libfilezilla/mingw-w64/extern_template_instantiation.patch new file mode 100644 index 00000000..a8311881 --- /dev/null +++ b/libfilezilla/mingw-w64/extern_template_instantiation.patch @@ -0,0 +1,11 @@ +--- lib/libfilezilla/event.hpp.orig ++++ lib/libfilezilla/event.hpp +@@ -111,7 +111,7 @@ + + /// \private + /// This instantiation must be a public symbol +-extern template class FZ_PUBLIC_SYMBOL simple_event; ++//extern template class FZ_PUBLIC_SYMBOL simple_event; + + } + diff --git a/libfilezilla/svn/PKGBUILD b/libfilezilla/svn/PKGBUILD index 47d89fcb..a6f18611 100644 --- a/libfilezilla/svn/PKGBUILD +++ b/libfilezilla/svn/PKGBUILD @@ -7,7 +7,7 @@ _name=libfilezilla pkgname=libfilezilla-svn pkgver=r7253 pkgrel=1 -pkgdesc="Library used by FileZilla (svn version)" +pkgdesc="Library used by FileZilla" arch=('i686' 'x86_64') url="https://filezilla-project.org/" license=('GPL')