From 46c2f2b75e5fc9a80ae85f2a5011911343adcfef Mon Sep 17 00:00:00 2001
From: Andrew Sun <adsun701@gmail.com>
Date: Wed, 19 Jun 2019 18:50:11 -0400
Subject: [PATCH] libfilezilla: update to 0.17.0

---
 ...1-libfilezilla-0.17.0-define-version.patch | 22 ++++++++++
 mingw-w64-libfilezilla/PKGBUILD               | 27 ++++++++++--
 mingw-w64-libfilezilla/libfilezilla.rc        | 13 ++++++
 mingw-w64-libfilezilla/manifest.xml           | 41 +++++++++++++++++++
 4 files changed, 99 insertions(+), 4 deletions(-)
 create mode 100644 mingw-w64-libfilezilla/0001-libfilezilla-0.17.0-define-version.patch
 create mode 100644 mingw-w64-libfilezilla/libfilezilla.rc
 create mode 100644 mingw-w64-libfilezilla/manifest.xml

diff --git a/mingw-w64-libfilezilla/0001-libfilezilla-0.17.0-define-version.patch b/mingw-w64-libfilezilla/0001-libfilezilla-0.17.0-define-version.patch
new file mode 100644
index 0000000000..b4901ccfe3
--- /dev/null
+++ b/mingw-w64-libfilezilla/0001-libfilezilla-0.17.0-define-version.patch
@@ -0,0 +1,22 @@
+diff -Naur libfilezilla-0.17.0.orig/lib/libfilezilla/version.hpp libfilezilla-0.17.0/lib/libfilezilla/version.hpp
+--- libfilezilla-0.17.0.orig/lib/libfilezilla/version.hpp	2019-06-19 17:09:11.580135600 -0400
++++ libfilezilla-0.17.0/lib/libfilezilla/version.hpp	2019-06-19 18:40:09.587217000 -0400
+@@ -11,13 +11,13 @@
+ /// \brief Version string of the libfilezilla headers
+ #define LIBFILEZILLA_VERSION "0.17.0"
+ 
+-#define LIBFILEZILLA_VERSION_MAJOR  
+-#define LIBFILEZILLA_VERSION_MINOR  
+-#define LIBFILEZILLA_VERSION_MICRO  
+-#define LIBFILEZILLA_VERSION_NANO   
++#define LIBFILEZILLA_VERSION_MAJOR  0
++#define LIBFILEZILLA_VERSION_MINOR  17
++#define LIBFILEZILLA_VERSION_MICRO  0
++#define LIBFILEZILLA_VERSION_NANO   0
+ 
+ /// \brief Suffix string, e.g. "rc1"
+-#define LIBFILEZILLA_VERSION_SUFFIX ""
++#define LIBFILEZILLA_VERSION_SUFFIX "0.17.0"
+ 
+ namespace fz {
+ /// \brief Get version string of libfilezilla
diff --git a/mingw-w64-libfilezilla/PKGBUILD b/mingw-w64-libfilezilla/PKGBUILD
index 42107523bc..b9784a8799 100644
--- a/mingw-w64-libfilezilla/PKGBUILD
+++ b/mingw-w64-libfilezilla/PKGBUILD
@@ -3,21 +3,40 @@
 _realname=libfilezilla
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-pkgver=0.16.0
+pkgver=0.17.0
 pkgrel=1
 pkgdesc="Small and modern C++ library, offering some basic functionality to build high-performing, platform-independent programs (mingw-w64)"
 arch=('any')
 url="https://lib.filezilla-project.org/"
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
-         "${MINGW_PACKAGE_PREFIX}-nettle")
+         "${MINGW_PACKAGE_PREFIX}-nettle"
+         "${MINGW_PACKAGE_PREFIX}-gnutls")
+makedepends=("${MINGW_PACKAGE_PREFIX}-gettext")
 checkdepends=("${MINGW_PACKAGE_PREFIX}-cppunit")
 license=('GPL')
-source=("${_realname}-${pkgver}.tar.bz2"::"https://download.filezilla-project.org/${_realname}/${_realname}-${pkgver}.tar.bz2")
-sha256sums=('3b6c4be3c57ad5e6e9bcfd365222e95db7f52d2f6a165a9c93747f4aeb0ea7b9')
+source=("${_realname}-${pkgver}.tar.bz2"::"https://download.filezilla-project.org/${_realname}/${_realname}-${pkgver}.tar.bz2"
+        "libfilezilla.rc"
+        "manifest.xml"
+        "0001-libfilezilla-0.17.0-define-version.patch")
+sha256sums=('c6ae014c7382d8ea0224defe3e5969f8d09c9e7f84f6fa249e576934b05bb23a'
+            '10e25d2f6e01af0d14f3f6c7fb842699a6acd1214842a8158567cf174199156c'
+            '687b11a79db3deaf4c3cb40fc452b56f0df8dff54068d5b7be9851912aad8f8a'
+            'cceaa47f769bdb02da527cd976ed29531bfd1db3c241b730d60f81f03ea85cb6')
+
+prepare() {
+  # copy missing .rc and manifest files to source tree.
+  cp -f ${srcdir}/libfilezilla.rc ${srcdir}/${_realname}-${pkgver}/lib/windows
+  cp -f ${srcdir}/manifest.xml ${srcdir}/${_realname}-${pkgver}/lib/windows
+  
+  cd "${srcdir}/${_realname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/0001-libfilezilla-0.17.0-define-version.patch"
+  autoreconf -fiv
+}
 
 build() {
   [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
   mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
diff --git a/mingw-w64-libfilezilla/libfilezilla.rc b/mingw-w64-libfilezilla/libfilezilla.rc
new file mode 100644
index 0000000000..66dd04906f
--- /dev/null
+++ b/mingw-w64-libfilezilla/libfilezilla.rc
@@ -0,0 +1,13 @@
+//{{NO_DEPENDENCIES}}
+
+#include "windows.h"
+
+#ifdef GNU_WINDRES
+1 24 "manifest.xml"
+#endif
+
+//appicon ICON "libfilezilla.ico"
+
+#ifdef HAS_VERSIONRC
+#include "version.rc"
+#endif
diff --git a/mingw-w64-libfilezilla/manifest.xml b/mingw-w64-libfilezilla/manifest.xml
new file mode 100644
index 0000000000..a37ef4eb8d
--- /dev/null
+++ b/mingw-w64-libfilezilla/manifest.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+  <assemblyIdentity
+    name="libfilezilla"
+    processorArchitecture="*"
+    version="0.16.0.0"
+    type="win32"
+  />
+  <description>libfilezilla</description>
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+        type="win32"
+        name="Microsoft.Windows.Common-Controls"
+        version="6.0.0.0"
+        processorArchitecture="*"
+        publicKeyToken="6595b64144ccf1df"
+        language="*"
+      />
+    </dependentAssembly>
+  </dependency>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!--7-->
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+      <!--8-->
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+      <!--8.1-->
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+      <!--10 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+    </application>
+  </compatibility>
+</assembly>