From f00b18276dd49132e71f4b3ff5274e502d7f8e3d Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Thu, 7 Mar 2019 13:51:10 +0100
Subject: [PATCH] Update qtutilities and syncthingtray

---
 c++utilities/mingw-w64/PKGBUILD          | 2 +-
 devel/versions.sh                        | 4 ++--
 passwordfile/mingw-w64/PKGBUILD          | 2 +-
 qtutilities/android-aarch64/PKGBUILD     | 4 ++--
 qtutilities/android-armv7a-eabi/PKGBUILD | 4 ++--
 qtutilities/default/PKGBUILD             | 4 ++--
 qtutilities/doc/PKGBUILD                 | 4 ++--
 qtutilities/mingw-w64/PKGBUILD           | 4 ++--
 syncthingtray/default/PKGBUILD           | 4 ++--
 syncthingtray/mingw-w64-static/PKGBUILD  | 8 ++++++--
 syncthingtray/mingw-w64-webview/PKGBUILD | 4 ++--
 syncthingtray/mingw-w64/PKGBUILD         | 4 ++--
 tagparser/mingw-w64/PKGBUILD             | 2 +-
 13 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/c++utilities/mingw-w64/PKGBUILD b/c++utilities/mingw-w64/PKGBUILD
index e8d3f017..418457fc 100644
--- a/c++utilities/mingw-w64/PKGBUILD
+++ b/c++utilities/mingw-w64/PKGBUILD
@@ -7,7 +7,7 @@ _reponame=cpp-utilities
 pkgname=mingw-w64-c++utilities
 _name=${pkgname#mingw-w64-}
 pkgver=4.17.0
-pkgrel=1
+pkgrel=2
 arch=('any')
 pkgdesc='Common C++ classes and routines such as argument parser, IO and conversion utilities (mingw-w64)'
 license=('GPL')
diff --git a/devel/versions.sh b/devel/versions.sh
index 52519e61..28d41994 100755
--- a/devel/versions.sh
+++ b/devel/versions.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 declare -A versions=(
-    [syncthingtray]=0.8.4
+    [syncthingtray]=0.9.0
     [c++utilities]=4.17.0
-    [qtutilities]=5.12.2
+    [qtutilities]=5.13.0
     [tagparser]=8.2.0
     [tageditor]=3.2.0
     [passwordfile]=4.0.1
diff --git a/passwordfile/mingw-w64/PKGBUILD b/passwordfile/mingw-w64/PKGBUILD
index 1239a30d..fd84665b 100644
--- a/passwordfile/mingw-w64/PKGBUILD
+++ b/passwordfile/mingw-w64/PKGBUILD
@@ -7,7 +7,7 @@ _reponame=passwordfile
 pkgname=mingw-w64-passwordfile
 _name=${pkgname#mingw-w64-}
 pkgver=4.0.1
-pkgrel=1
+pkgrel=2
 arch=('any')
 pkgdesc='C++ library to read/write passwords from/to encrypted files using AES-256-CBC via OpenSSL (mingw-w64)'
 license=('GPL')
diff --git a/qtutilities/android-aarch64/PKGBUILD b/qtutilities/android-aarch64/PKGBUILD
index 15b55995..8fc65219 100644
--- a/qtutilities/android-aarch64/PKGBUILD
+++ b/qtutilities/android-aarch64/PKGBUILD
@@ -11,7 +11,7 @@ _android_platform=22
 _prefix=/opt/android-libs/$_pkg_arch
 
 pkgname=android-$_pkg_arch-$_pkgname
-pkgver=5.12.2
+pkgver=5.13.0
 pkgrel=1
 arch=('any')
 pkgdesc="Common Qt related C++ classes and routines used by my applications such as dialogs, widgets and models (Android, $_pkg_arch)"
@@ -23,7 +23,7 @@ conflicts=("android-$_pkgname-$_android_arch")
 replaces=("android-$_pkgname-$_android_arch")
 url="https://github.com/Martchus/${_reponame}"
 source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('636d3bc9f378e413d14d349b03849ad3da70290f6a25b36bdc80e4fda35776b0')
+sha256sums=('f12204958d4181154fed7a9d027756cde6fe8a7b84f1c353b06c8c89abb542c5')
 options=(!buildflags staticlibs !strip !emptydirs)
 
 prepare() {
diff --git a/qtutilities/android-armv7a-eabi/PKGBUILD b/qtutilities/android-armv7a-eabi/PKGBUILD
index b390dcac..76f836ec 100644
--- a/qtutilities/android-armv7a-eabi/PKGBUILD
+++ b/qtutilities/android-armv7a-eabi/PKGBUILD
@@ -11,7 +11,7 @@ _android_platform=21
 _prefix=/opt/android-libs/$_pkg_arch
 
 pkgname=android-$_pkg_arch-$_pkgname
-pkgver=5.12.2
+pkgver=5.13.0
 pkgrel=1
 arch=('any')
 pkgdesc="Common Qt related C++ classes and routines used by my applications such as dialogs, widgets and models (Android, $_pkg_arch)"
@@ -23,7 +23,7 @@ conflicts=("android-$_pkgname-$_android_arch")
 replaces=("android-$_pkgname-$_android_arch")
 url="https://github.com/Martchus/${_reponame}"
 source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('636d3bc9f378e413d14d349b03849ad3da70290f6a25b36bdc80e4fda35776b0')
+sha256sums=('f12204958d4181154fed7a9d027756cde6fe8a7b84f1c353b06c8c89abb542c5')
 options=(!buildflags staticlibs !strip !emptydirs)
 
 prepare() {
diff --git a/qtutilities/default/PKGBUILD b/qtutilities/default/PKGBUILD
index a6d69789..2522ad7d 100644
--- a/qtutilities/default/PKGBUILD
+++ b/qtutilities/default/PKGBUILD
@@ -5,7 +5,7 @@
 
 _reponame=qtutilities
 pkgname=qtutilities
-pkgver=5.12.2
+pkgver=5.13.0
 pkgrel=1
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
 pkgdesc='Common Qt related C++ classes and routines used by my applications such as dialogs, widgets and models'
@@ -15,7 +15,7 @@ makedepends=('cmake' 'qt5-tools' 'mesa')
 optdepends=("$pkgname-doc: API documentation")
 url="https://github.com/Martchus/${_reponame}"
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('636d3bc9f378e413d14d349b03849ad3da70290f6a25b36bdc80e4fda35776b0')
+sha256sums=('f12204958d4181154fed7a9d027756cde6fe8a7b84f1c353b06c8c89abb542c5')
 
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
diff --git a/qtutilities/doc/PKGBUILD b/qtutilities/doc/PKGBUILD
index 88f7c187..2e36045f 100644
--- a/qtutilities/doc/PKGBUILD
+++ b/qtutilities/doc/PKGBUILD
@@ -6,7 +6,7 @@
 _name=qtutilities
 _reponame=$_name
 pkgname=$_name-doc
-pkgver=5.12.2
+pkgver=5.13.0
 pkgrel=1
 arch=('any')
 pkgdesc='Common Qt related C++ classes and routines used by my applications such as dialogs, widgets and models (API documentation)'
@@ -14,7 +14,7 @@ license=('GPL')
 makedepends=('cmake' 'doxygen' 'dia' 'graphviz' 'c++utilities' 'qt5-tools' 'mesa')
 url="https://github.com/Martchus/${_reponame}"
 source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('636d3bc9f378e413d14d349b03849ad3da70290f6a25b36bdc80e4fda35776b0')
+sha256sums=('f12204958d4181154fed7a9d027756cde6fe8a7b84f1c353b06c8c89abb542c5')
 
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
diff --git a/qtutilities/mingw-w64/PKGBUILD b/qtutilities/mingw-w64/PKGBUILD
index 5c075bd5..5fcd59ae 100644
--- a/qtutilities/mingw-w64/PKGBUILD
+++ b/qtutilities/mingw-w64/PKGBUILD
@@ -6,7 +6,7 @@
 _reponame=qtutilities
 pkgname=mingw-w64-qtutilities
 _name=${pkgname#mingw-w64-}
-pkgver=5.12.2
+pkgver=5.13.0
 pkgrel=1
 arch=('any')
 pkgdesc='Common Qt related C++ classes and routines used by my applications such as dialogs, widgets and models (mingw-w64)'
@@ -16,7 +16,7 @@ optdepends=("$_name-doc: API documentation")
 makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'mingw-w64-qt5-tools')
 url="https://github.com/Martchus/${_reponame}"
 source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('636d3bc9f378e413d14d349b03849ad3da70290f6a25b36bdc80e4fda35776b0')
+sha256sums=('f12204958d4181154fed7a9d027756cde6fe8a7b84f1c353b06c8c89abb542c5')
 options=(!buildflags staticlibs !strip !emptydirs)
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] ||
diff --git a/syncthingtray/default/PKGBUILD b/syncthingtray/default/PKGBUILD
index 4b165fc5..a5dffef8 100644
--- a/syncthingtray/default/PKGBUILD
+++ b/syncthingtray/default/PKGBUILD
@@ -24,7 +24,7 @@ _enable_plasmoid=${SYNCTHING_TRAY_ENABLE_PLASMOID:-1}
 
 _reponame=syncthingtray
 pkgname=syncthingtray
-pkgver=0.8.4
+pkgver=0.9.0
 pkgrel=1
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
 pkgdesc='Tray application for Syncthing'
@@ -43,7 +43,7 @@ checkdepends=('cppunit' 'syncthing')
 [[ $_enable_plasmoid ]] && makedepends+=('plasma-framework' 'extra-cmake-modules')
 url="https://github.com/Martchus/${_reponame}"
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('084289f3a295ef41ae4ebbc3976ca5782b47949ab73a7e12e33c72d271e869ea')
+sha256sums=('48e6f18302e820ae599c3028db246cec553d1a3c33b20a021a471273c84b30e9')
 
 ephemeral_port() {
   comm -23 <(seq 49152 65535) <(ss -tan | awk '{print $4}' | cut -d':' -f2 | grep "[0-9]\{1,5\}" | sort | uniq) | shuf | head -n 1
diff --git a/syncthingtray/mingw-w64-static/PKGBUILD b/syncthingtray/mingw-w64-static/PKGBUILD
index 6fdc6511..29422be0 100644
--- a/syncthingtray/mingw-w64-static/PKGBUILD
+++ b/syncthingtray/mingw-w64-static/PKGBUILD
@@ -12,7 +12,7 @@ _js_provider=${SYNCTHING_TRAY_JS_PROVIDER:-qml}
 _reponame=syncthingtray
 pkgname=mingw-w64-syncthingtray-static
 _name=${_reponame}
-pkgver=0.8.4
+pkgver=0.9.0
 pkgrel=1
 arch=('any')
 pkgdesc='Tray application for Syncthing (mingw-w64)'
@@ -26,7 +26,7 @@ makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'mingw-w64-qt5-base-static' 'ming
 conflicts=("${pkgname%-static}")
 url="https://github.com/Martchus/${_reponame}"
 source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('084289f3a295ef41ae4ebbc3976ca5782b47949ab73a7e12e33c72d271e869ea')
+sha256sums=('48e6f18302e820ae599c3028db246cec553d1a3c33b20a021a471273c84b30e9')
 options=(!buildflags staticlibs !strip !emptydirs)
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
@@ -51,6 +51,10 @@ build() {
       -DSVG_SUPPORT:BOOL=ON \
       -DSVG_ICON_SUPPORT:BOOL=0N \
       ../
+
+    # workaround issue https://github.com/Martchus/PKGBUILDs/issues/86
+    find -iname 'linklibs.rsp' -exec sed -i -e 's|-Wl,-Bdynamic||' {} \; 
+
     make
     popd
   done
diff --git a/syncthingtray/mingw-w64-webview/PKGBUILD b/syncthingtray/mingw-w64-webview/PKGBUILD
index 74c5bdfa..d354378d 100644
--- a/syncthingtray/mingw-w64-webview/PKGBUILD
+++ b/syncthingtray/mingw-w64-webview/PKGBUILD
@@ -13,7 +13,7 @@ _reponame=syncthingtray
 pkgname=mingw-w64-syncthingtray-webview
 provides=('mingw-w64-syncthingtray')
 conflicts=('mingw-w64-syncthingtray')
-pkgver=0.8.4
+pkgver=0.9.0
 pkgrel=1
 arch=('any')
 pkgdesc='Tray application for Syncthing (mingw-w64)'
@@ -27,7 +27,7 @@ depends=('mingw-w64-crt' 'mingw-w64-qt5-svg' 'mingw-w64-qtutilities' 'mingw-w64-
 makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'mingw-w64-qt5-tools' 'ffmpeg')
 url="https://github.com/Martchus/${_reponame}"
 source=("${_reponame}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('084289f3a295ef41ae4ebbc3976ca5782b47949ab73a7e12e33c72d271e869ea')
+sha256sums=('48e6f18302e820ae599c3028db246cec553d1a3c33b20a021a471273c84b30e9')
 options=(!buildflags staticlibs !strip !emptydirs)
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
diff --git a/syncthingtray/mingw-w64/PKGBUILD b/syncthingtray/mingw-w64/PKGBUILD
index 29d05d85..cd4d169d 100644
--- a/syncthingtray/mingw-w64/PKGBUILD
+++ b/syncthingtray/mingw-w64/PKGBUILD
@@ -12,7 +12,7 @@ _js_provider=${SYNCTHING_TRAY_JS_PROVIDER:-qml}
 _reponame=syncthingtray
 pkgname=mingw-w64-syncthingtray
 _name=${pkgname#mingw-w64-}
-pkgver=0.8.4
+pkgver=0.9.0
 pkgrel=1
 arch=('any')
 pkgdesc='Tray application for Syncthing (mingw-w64)'
@@ -26,7 +26,7 @@ depends=('mingw-w64-crt' 'mingw-w64-qt5-svg' 'mingw-w64-qtutilities' 'mingw-w64-
 makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'mingw-w64-qt5-tools' 'ffmpeg')
 url="https://github.com/Martchus/${_reponame}"
 source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('084289f3a295ef41ae4ebbc3976ca5782b47949ab73a7e12e33c72d271e869ea')
+sha256sums=('48e6f18302e820ae599c3028db246cec553d1a3c33b20a021a471273c84b30e9')
 options=(!buildflags staticlibs !strip !emptydirs)
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
diff --git a/tagparser/mingw-w64/PKGBUILD b/tagparser/mingw-w64/PKGBUILD
index bdda24bb..3bd191b5 100644
--- a/tagparser/mingw-w64/PKGBUILD
+++ b/tagparser/mingw-w64/PKGBUILD
@@ -7,7 +7,7 @@ _reponame=tagparser
 pkgname=mingw-w64-tagparser
 _name=${pkgname#mingw-w64-}
 pkgver=8.2.0
-pkgrel=1
+pkgrel=2
 arch=('any')
 pkgdesc='C++ library for reading and writing MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska tags (mingw-w64)'
 license=('GPL')