Update version

3 files changed, 84 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d30202cb070f..787cc6369363 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-passwordmanager
 	pkgdesc = A simple password store using AES-256-CBC encryption via OpenSSL (mingw-w64)
-	pkgver = 4.0.2
+	pkgver = 4.1.0
 	pkgrel = 1
 	url = https://github.com/Martchus/passwordmanager
 	arch = any
@@ -9,6 +9,11 @@ pkgbase = mingw-w64-passwordmanager
 	makedepends = mingw-w64-cmake
 	makedepends = mingw-w64-qt5-tools
 	makedepends = ffmpeg
+	makedepends = mingw-w64-qt5-base-static
+	makedepends = mingw-w64-qt5-translations
+	makedepends = mingw-w64-qt5-svg
+	makedepends = breeze-icons
+	makedepends = numix-icon-theme-git
 	depends = mingw-w64-crt
 	depends = mingw-w64-qt5-base
 	depends = mingw-w64-qtutilities
@@ -18,7 +23,7 @@ pkgbase = mingw-w64-passwordmanager
 	options = staticlibs
 	options = !strip
 	options = !emptydirs
-	source = passwordmanager-4.0.2.tar.gz::https://github.com/Martchus/passwordmanager/archive/v4.0.2.tar.gz
+	source = passwordmanager-4.1.0.tar.gz::https://github.com/Martchus/passwordmanager/archive/v4.1.0.tar.gz
 	sha256sums = 845e119ec24d073411c52b797c8b7a4e44fbce4c793aaf90a11a21f070fcd3fa
 
 pkgname = mingw-w64-passwordmanager
diff --git a/.sync-conflict-20190519-131728-PKPUQWZ.SRCINFO b/.sync-conflict-20190519-131728-PKPUQWZ.SRCINFO
new file mode 100644
index 000000000000..c468233c9d01
--- /dev/null
+++ b/.sync-conflict-20190519-131728-PKPUQWZ.SRCINFO
@@ -0,0 +1,25 @@
+pkgbase = mingw-w64-passwordmanager
+	pkgdesc = A simple password store using AES-256-CBC encryption via OpenSSL (mingw-w64)
+	pkgver = 4.0.1
+	pkgrel = 1
+	url = https://github.com/Martchus/passwordmanager
+	arch = any
+	license = GPL
+	makedepends = mingw-w64-gcc
+	makedepends = mingw-w64-cmake
+	makedepends = mingw-w64-qt5-tools
+	makedepends = ffmpeg
+	depends = mingw-w64-crt
+	depends = mingw-w64-qt5-base
+	depends = mingw-w64-qtutilities
+	depends = mingw-w64-passwordfile
+	depends = mingw-w64-openssl
+	options = !buildflags
+	options = staticlibs
+	options = !strip
+	options = !emptydirs
+	source = passwordmanager-4.0.1.tar.gz::https://github.com/Martchus/passwordmanager/archive/v4.0.1.tar.gz
+	sha256sums = 89f10b004c4a2dcbce13f0b24bd9acda3a6ea52d165ef178b42e76fcd3c58079
+
+pkgname = mingw-w64-passwordmanager
+
diff --git a/PKGBUILD b/PKGBUILD
index aba58911b886..0a213639178a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 _reponame=passwordmanager
 pkgname=mingw-w64-passwordmanager
 _name=${pkgname#mingw-w64-}
-pkgver=4.0.2
+pkgver=4.1.0
 pkgrel=1
 arch=('any')
 pkgdesc='A simple password store using AES-256-CBC encryption via OpenSSL (mingw-w64)'
@@ -17,23 +17,64 @@ url="https://github.com/Martchus/${_reponame}"
 source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
 sha256sums=('845e119ec24d073411c52b797c8b7a4e44fbce4c793aaf90a11a21f070fcd3fa')
 options=(!buildflags staticlibs !strip !emptydirs)
-_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
+
+_architectures=('i686-w64-mingw32' 'x86_64-w64-mingw32')
+_configurations=()
+[[ $NO_SHARED_LIBS ]] || _configurations+=('shared')
+[[ $NO_STATIC_LIBS ]] || _configurations+=('static') makedepends+=('mingw-w64-qt5-base-static' 'mingw-w64-qt5-translations' 'mingw-w64-qt5-svg' 'breeze-icons' 'numix-icon-theme-git')
 
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-  for _arch in ${_architectures}; do
-    mkdir -p build-${_arch} && pushd build-${_arch}
-    ${_arch}-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr/${_arch}" -DQUICK_GUI="no" ../
-    make
-    popd
+
+  declare -A _config_flags=(
+    [shared]='
+        -DBUILD_SHARED_LIBS:BOOL=ON
+    '
+    [static]='
+        -DBUILD_SHARED_LIBS:BOOL=OFF
+        -DCMAKE_FIND_LIBRARY_SUFFIXES:STRING=.a;.lib
+        -DSTATIC_LINKAGE:BOOL=ON
+        -DSTATIC_LIBRARY_LINKAGE:BOOL=ON
+        -DQT_PACKAGE_PREFIX=StaticQt5
+        -DKF_PACKAGE_PREFIX=StaticKF5
+        -DPASSWORD_MANAGER_CONFIGURATION_TARGET_SUFFIX:STRING=static
+        -DENABLE_QT_TRANSLATIONS:BOOL=ON
+        -DBUILTIN_TRANSLATIONS:BOOL=ON
+        -DBUILTIN_ICON_THEMES:STRING=breeze;breeze-dark;Numix
+        -DIMAGE_FORMAT_SUPPORT:STRING=Gif;ICO;Jpeg
+        -DSVG_SUPPORT:BOOL=ON
+        -DSVG_ICON_SUPPORT:BOOL=0N
+    '
+  )
+
+  for _arch in "${_architectures[@]}"; do
+    for _cfg in "${_configurations[@]}"; do
+      msg2 "${_arch}-${_cfg}"
+      mkdir -p "build-${_arch}-${_cfg}" && pushd "build-${_arch}-${_cfg}"
+      ${_arch}-cmake \
+        -DCMAKE_BUILD_TYPE:STRING='Release' \
+        -DCMAKE_INSTALL_PREFIX="/usr/${_arch}" \
+        -DCONFIGURATION_NAME:STRING="${_cfg}" \
+        -DCONFIGURATION_PACKAGE_SUFFIX:STRING="-${_cfg}" \
+	-DENABLE_TARGETS_FOR_MINGW64_CROSS_PACKAGING:BOOL=ON \
+        -DQUICK_GUI:BOOL=OFF \
+        ${_config_flags[$_cfg]} \
+        ../
+      make
+      popd
+    done
   done
 }
 
 package() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-  for _arch in ${_architectures}; do
-    pushd build-${_arch}
-    make DESTDIR="${pkgdir}" install-mingw-w64-strip
-    popd
+
+  for _arch in "${_architectures[@]}"; do
+    for _cfg in "${_configurations[@]}"; do
+      msg2 "${_arch}-${_cfg}"
+      pushd "build-${_arch}-${_cfg}"
+      make DESTDIR="${pkgdir}" install-mingw-w64-strip
+      popd
+    done
   done
 }