From 9a7fd35fda500a5ee731ef2fcb752eaa6318152e Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 29 Jul 2016 18:08:04 +0200
Subject: [PATCH] Update mingw-w64-{lib,}filezilla

---
 filezilla/mingw-w64-svn/PKGBUILD                  |  2 +-
 filezilla/mingw-w64/PKGBUILD                      |  4 ++--
 libfilezilla/mingw-w64/PKGBUILD                   | 15 +++++++--------
 .../mingw-w64/extern_template_instantiation.patch | 11 -----------
 4 files changed, 10 insertions(+), 22 deletions(-)
 delete mode 100644 libfilezilla/mingw-w64/extern_template_instantiation.patch

diff --git a/filezilla/mingw-w64-svn/PKGBUILD b/filezilla/mingw-w64-svn/PKGBUILD
index 8bf70945..a5d5bedf 100644
--- a/filezilla/mingw-w64-svn/PKGBUILD
+++ b/filezilla/mingw-w64-svn/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="Fast and reliable FTP, FTPS and SFTP client (mingw-w64)"
 arch=('any')
 url="https://filezilla-project.org/"
 license=('GPL')
-depends=('mingw-w64-crt' 'mingw-w64-libidn' 'mingw-w64-sqlite' 'mingw-w64-gnutls' 'mingw-w64-wxmsw' 'mingw-w64-libfilezilla-svn')
+depends=('mingw-w64-crt' 'mingw-w64-libidn' 'mingw-w64-sqlite' 'mingw-w64-gnutls' 'mingw-w64-wxmsw' 'mingw-w64-libfilezilla')
 makedepends=('mingw-w64-configure' 'wxgtk' 'subversion')
 provides=(${pkgname%-svn})
 conflicts=(${pkgname%-svn})
diff --git a/filezilla/mingw-w64/PKGBUILD b/filezilla/mingw-w64/PKGBUILD
index 5b047d70..cc248f88 100644
--- a/filezilla/mingw-w64/PKGBUILD
+++ b/filezilla/mingw-w64/PKGBUILD
@@ -5,7 +5,7 @@
 
 _name=filezilla
 pkgname=mingw-w64-filezilla
-pkgver=3.19.0
+pkgver=3.20.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=('8cbb61393e029f4bd71cfe1d1f32adeb')
+md5sums=('91c548a361e188bf21984246b5eba482')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
diff --git a/libfilezilla/mingw-w64/PKGBUILD b/libfilezilla/mingw-w64/PKGBUILD
index 6c1d74e6..64771e6b 100644
--- a/libfilezilla/mingw-w64/PKGBUILD
+++ b/libfilezilla/mingw-w64/PKGBUILD
@@ -5,7 +5,7 @@
 
 _name=libfilezilla
 pkgname=mingw-w64-libfilezilla
-pkgver=0.5.3
+pkgver=0.6.1
 pkgrel=1
 pkgdesc="Library used by FileZilla (mingw-w64)"
 arch=('any')
@@ -15,16 +15,13 @@ 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"
-        'extern_template_instantiation.patch')
-md5sums=('6192fd89318c1107b5b8095fd43dc3a5'
-         '06871d88895b83d56069be8f5952fdf4')
+source=("http://downloads.sourceforge.net/project/filezilla/libfilezilla/${pkgver}/${_name}-${pkgver}.tar.bz2")
+md5sums=('3d4728ce8949490b09198443e955c8b6')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 prepare() {
   cd "${srcdir}/${_name}-${pkgver}"
-  patch -p0 -i ../extern_template_instantiation.patch
   autoreconf -i
 }
 
@@ -32,7 +29,9 @@ build() {
   export CXXFLAGS='-O0'
   for _arch in ${_architectures}; do
     mkdir -p "${srcdir}/${_name}-${pkgver}/build-${_arch}" && cd "${srcdir}/${_name}-${pkgver}/build-${_arch}"
-    ${_arch}-configure
+    ${_arch}-configure --disable-shared
+    # shared build doesn't work because 'fz::simple_event<fz::timer_event_type, unsigned long long>::type()'
+    # is not exportet correctly
     make
   done
 }
@@ -42,6 +41,6 @@ package() {
     cd "${srcdir}/${_name}-${pkgver}/build-${_arch}"
     make DESTDIR="${pkgdir}" install
     ${_arch}-strip -g "${pkgdir}/usr/${_arch}/lib/"*.a
-    ${_arch}-strip --strip-unneeded "$pkgdir"/usr/${_arch}/bin/*.dll
+    #${_arch}-strip --strip-unneeded "$pkgdir"/usr/${_arch}/bin/*.dll
   done
 }
diff --git a/libfilezilla/mingw-w64/extern_template_instantiation.patch b/libfilezilla/mingw-w64/extern_template_instantiation.patch
deleted file mode 100644
index a8311881..00000000
--- a/libfilezilla/mingw-w64/extern_template_instantiation.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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<timer_event_type, timer_id>;
-+//extern template class FZ_PUBLIC_SYMBOL simple_event<timer_event_type, timer_id>;
- 
- }
-