From 53af4c1779caedea8930928d33773bf6e72d1a20 Mon Sep 17 00:00:00 2001
From: jc <awiouy@gmail.com>
Date: Sun, 21 Aug 2016 23:57:05 +0200
Subject: [PATCH] syncthing: update to 0.14.3

---
 .../addons/service/syncthing/changelog.txt    |  4 ++-
 packages/addons/service/syncthing/package.mk  | 28 +++++++++----------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/packages/addons/service/syncthing/changelog.txt b/packages/addons/service/syncthing/changelog.txt
index ef15bafb1f..8c2cb21443 100644
--- a/packages/addons/service/syncthing/changelog.txt
+++ b/packages/addons/service/syncthing/changelog.txt
@@ -1,6 +1,8 @@
+7.0.102
+- Update to version 0.14.4
+
 7.0.101
 - Enable automatic upgrades
 
 7.0.100
 - Initial addon
-
diff --git a/packages/addons/service/syncthing/package.mk b/packages/addons/service/syncthing/package.mk
index a31a8cf19b..51661e7a04 100644
--- a/packages/addons/service/syncthing/package.mk
+++ b/packages/addons/service/syncthing/package.mk
@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="syncthing"
-PKG_VERSION="0.12.22"
-PKG_REV="101"
+PKG_VERSION="0.14.4"
+PKG_REV="102"
 PKG_ARCH="any"
 PKG_LICENSE="MPLv2"
 PKG_SITE="https://syncthing.net/"
@@ -26,19 +26,22 @@ PKG_URL="https://github.com/syncthing/syncthing/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain go:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="service/system"
-
-PKG_SHORTDESC="Open Source Continuous File Synchronization"
-PKG_LONGDESC="Syncthing replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to choose where it is stored, if it is shared with some third party and how it's transmitted over the Internet."
-PKG_MAINTAINER="Anton Voyl (awiouy at gmail dot com)"
-PKG_ADDON_REPOVERSION="7.0"
+PKG_SHORTDESC="Syncthing: open source continuous file synchronization"
+PKG_LONGDESC="Syncthing ($PKG_VERSION) replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to choose where it is stored, if it is shared with some third party and how it's transmitted over the Internet."
+PKG_AUTORECONF="no"
 
 PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="Syncthing"
 PKG_ADDON_TYPE="xbmc.service"
-PKG_ADDON_PROVIDES=""
-PKG_AUTORECONF="no"
+PKG_ADDON_REPOVERSION="7.0"
+PKG_MAINTAINER="Anton Voyl (awiouy)"
 
 configure_target() {
+  go run build.go assets
+
+  mkdir -p $ROOT/$PKG_BUILD $ROOT/$PKG_BUILD/src/github.com/syncthing
+  ln -fs $ROOT/$PKG_BUILD $ROOT/$PKG_BUILD/src/github.com/syncthing/syncthing
+  ln -fs $ROOT/$PKG_BUILD/vendor $ROOT/$PKG_BUILD/vendor/src
 
   case $TARGET_ARCH in
     x86_64)
@@ -66,16 +69,13 @@ configure_target() {
   export CGO_CFLAGS=$CFLAGS
   export LDFLAGS="-w -linkmode external -extldflags -Wl,--unresolved-symbols=ignore-in-shared-libs -extld $TARGET_CC -X main.Version=v$PKG_VERSION"
   export GOLANG=$ROOT/$TOOLCHAIN/lib/golang/bin/go
-  export GOPATH=$ROOT/$PKG_BUILD:$ROOT/$PKG_BUILD/Godeps/_workspace
+  export GOPATH=$ROOT/$PKG_BUILD/src/github.com/syncthing/syncthing:$ROOT/$PKG_BUILD/vendor:$ROOT/$PKG_BUILD/Godeps/_workspace
   export GOROOT=$ROOT/$TOOLCHAIN/lib/golang
   export PATH=$PATH:$GOROOT/bin
-
-  mkdir -p $ROOT/$PKG_BUILD $ROOT/$PKG_BUILD/src/github.com/syncthing
-  ln -fs $ROOT/$PKG_BUILD $ROOT/$PKG_BUILD/src/github.com/syncthing/syncthing
-
 }
 
 make_target() {
+  cd $ROOT/$PKG_BUILD/src/github.com/syncthing/syncthing
   mkdir -p bin
   $GOLANG build -v -o bin/syncthing -a -ldflags "$LDFLAGS" ./cmd/syncthing
 }