Update version

3 files changed, 111 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 427ec2ac503a..fae7e96066d1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-syncthingtray
 	pkgdesc = Tray application for Syncthing (mingw-w64)
-	pkgver = 0.9.1
+	pkgver = 0.10.0
 	pkgrel = 1
 	url = https://github.com/Martchus/syncthingtray
 	arch = any
@@ -9,6 +9,12 @@ pkgbase = mingw-w64-syncthingtray
 	makedepends = mingw-w64-cmake
 	makedepends = mingw-w64-qt5-tools
 	makedepends = ffmpeg
+	makedepends = git
+	makedepends = go
+	makedepends = mingw-w64-qt5-base-static
+	makedepends = mingw-w64-qt5-translations
+	makedepends = breeze-icons
+	makedepends = numix-icon-theme-git
 	depends = mingw-w64-crt
 	depends = mingw-w64-qt5-svg
 	depends = mingw-w64-qtutilities
@@ -19,7 +25,8 @@ pkgbase = mingw-w64-syncthingtray
 	options = staticlibs
 	options = !strip
 	options = !emptydirs
-	source = syncthingtray-0.9.1.tar.gz::https://github.com/Martchus/syncthingtray/archive/v0.9.1.tar.gz
+	source = syncthingtray-0.10.0.tar.gz::https://github.com/Martchus/syncthingtray/archive/v0.10.0.tar.gz
+	source = syncthing::git+https://github.com/Martchus/syncthing.git#branch=libsyncthing3
 	sha256sums = 7db8661a16af117dd7ad494bb3264911a7dc926bcbdea887b4def396cf7e019e
 
 pkgname = mingw-w64-syncthingtray
diff --git a/.sync-conflict-20190519-131732-PKPUQWZ.SRCINFO b/.sync-conflict-20190519-131732-PKPUQWZ.SRCINFO
new file mode 100644
index 000000000000..4025a3976979
--- /dev/null
+++ b/.sync-conflict-20190519-131732-PKPUQWZ.SRCINFO
@@ -0,0 +1,26 @@
+pkgbase = mingw-w64-syncthingtray
+	pkgdesc = Tray application for Syncthing (mingw-w64)
+	pkgver = 0.9.0
+	pkgrel = 1
+	url = https://github.com/Martchus/syncthingtray
+	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-svg
+	depends = mingw-w64-qtutilities
+	depends = mingw-w64-openssl
+	depends = mingw-w64-qt5-base
+	depends = mingw-w64-qt5-declarative
+	options = !buildflags
+	options = staticlibs
+	options = !strip
+	options = !emptydirs
+	source = syncthingtray-0.9.0.tar.gz::https://github.com/Martchus/syncthingtray/archive/v0.9.0.tar.gz
+	sha256sums = 48e6f18302e820ae599c3028db246cec553d1a3c33b20a021a471273c84b30e9
+
+pkgname = mingw-w64-syncthingtray
+
diff --git a/PKGBUILD b/PKGBUILD
index f8b1373f36ab..b26814d54e58 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,15 +4,18 @@
 # you also find the URL of a binary repository.
 
 # set the web view provider: either webkit, webengine, auto or none
-_webview_provider=${SYNCTHING_TRAY_WEBVIEW_PROVIDER:-none}
+_webview_provider=${MINGW_W64_SYNCTHING_TRAY_WEBVIEW_PROVIDER:-none}
 
 # set the JavaScript provider: either script, qml, auto or none
-_js_provider=${SYNCTHING_TRAY_JS_PROVIDER:-qml}
+_js_provider=${MINGW_W64_SYNCTHING_TRAY_JS_PROVIDER:-qml}
+
+# set whether libsyncthing should be enabled: either ON or OFF
+_enable_libsyncthing=${MINGW_W64_SYNCTHING_TRAY_JS_PROVIDER:-ON}
 
 _reponame=syncthingtray
 pkgname=mingw-w64-syncthingtray
 _name=${pkgname#mingw-w64-}
-pkgver=0.9.1
+pkgver=0.10.0
 pkgrel=1
 arch=('any')
 pkgdesc='Tray application for Syncthing (mingw-w64)'
@@ -24,37 +27,87 @@ depends=('mingw-w64-crt' 'mingw-w64-qt5-svg' 'mingw-w64-qtutilities' 'mingw-w64-
 [[ $_js_provider == script ]] && depends+=('mingw-w64-qt5-script')
 [[ $_js_provider == qml ]] && depends+=('mingw-w64-qt5-declarative')
 makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'mingw-w64-qt5-tools' 'ffmpeg')
+[[ $_enable_libsyncthing == ON ]] && makedepends+=('git' 'go')
 url="https://github.com/Martchus/${_reponame}"
 source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
+[[ $_enable_libsyncthing == ON ]] && source+=("syncthing::git+https://github.com/Martchus/syncthing.git#branch=libsyncthing3")
 sha256sums=('7db8661a16af117dd7ad494bb3264911a7dc926bcbdea887b4def396cf7e019e')
 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' 'breeze-icons' 'numix-icon-theme-git')
+[[ $_enable_libsyncthing == ON ]] && _disable_libsyncthing=OFF || _disable_libsyncthing=ON
+
+prepare() {
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+
+  mkdir -p 'libsyncthing/go/src/github.com/syncthing'
+  pushd 'libsyncthing/go/src/github.com/syncthing'
+  #[[ -d syncthing ]] && rm -r syncthing
+  ln -sf "$srcdir/syncthing" .
+  popd
+}
 
 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}" \
-      -DWEBVIEW_PROVIDER="${_webview_provider}" \
-      -DJS_PROVIDER="${_js_provider}" \
-      -DSYSTEMD_SUPPORT=OFF \
-      -DNO_FILE_ITEM_ACTION_PLUGIN=ON \
-      -DENABLE_STATIC_LIBS:BOOL=OFF \
-      -DDISABLE_SHARED_LIBS:BOOL=OFF \
-      -DSTATIC_LINKAGE:BOOL=OFF \
-      ../
-    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
+        -DSYNCTHINGCTL_CONFIGURATION_TARGET_SUFFIX:STRING=static
+        -DSYNCTHINGTRAY_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}" \
+        -DWEBVIEW_PROVIDER:STRING="${_webview_provider}" \
+        -DJS_PROVIDER:STRING="${_js_provider}" \
+        -DSYSTEMD_SUPPORT=OFF \
+        -DNO_FILE_ITEM_ACTION_PLUGIN=ON \
+        -DENABLE_TARGETS_FOR_MINGW64_CROSS_PACKAGING:BOOL=ON \
+        -DNO_LIBSYNCTHING:BOOL="${_disable_libsyncthing}" \
+        -DUSE_LIBSYNCTHING:BOOL="${_enable_libsyncthing}" \
+        ${_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
 }