update to 0.8.5.12

3 files changed, 65 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 690dbe39cd1e..b1ff65ac0d3e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Mar 19 19:44:07 UTC 2018
+# Sun Jul 22 03:16:01 UTC 2018
 pkgbase = gostcoin-git
 	pkgdesc = Coin based on GOST R 34.10 and GOST R 34.11-2012 with I2P support
-	pkgver = 0.8.5.11
+	pkgver = 0.8.5.12
 	pkgrel = 1
 	url = http://gostcoin.i2p
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 8796874ac229..062211a8a409 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ then
 pkgname+=('gostcoin-qt-git')
 fi
 
-pkgver=0.8.5.11
+pkgver=0.8.5.12
 pkgrel=1
 pkgdesc="Coin based on GOST R 34.10 and GOST R 34.11-2012 with I2P support"
 arch=('i686' 'x86_64' 'armv7h' 'aarch64')
@@ -26,7 +26,8 @@ optdepends=('i2pd: I2P network transport')
 
 source=("${pkgbase%%-git}::git+https://github.com/GOSTSec/gostcoin"
         "gostcoind.service"
-        "gostcoind.conf")
+        "gostcoind.conf"
+        "link-boost-chrono.patch")
 
 
 pkgver() {
@@ -34,6 +35,11 @@ pkgver() {
   echo $(git describe --tags --long | sed 's/^v//' | sed 's/\([^-]*-g\)/r\1/;s/-/./g')
 }
 
+prepare() {
+  cd $srcdir/${pkgbase%%-git}
+  patch -p1 < ../link-boost-chrono.patch
+}
+
 build() {
   cd $srcdir/${pkgbase%%-git}/src
 
@@ -72,4 +78,5 @@ package_gostcoin-qt-git(){
 
 md5sums=('SKIP'
          '5fd2ff66d55bdfcba99755bb7c88b7f0'
-         'a2811c45f7bdbb9dc66775f6f897631e')
+         'a2811c45f7bdbb9dc66775f6f897631e'
+         '96720e3e4fd7dcee27462df0f6e97c8b')
diff --git a/link-boost-chrono.patch b/link-boost-chrono.patch
new file mode 100644
index 000000000000..0b282a8d6a20
--- /dev/null
+++ b/link-boost-chrono.patch
@@ -0,0 +1,53 @@
+diff --git a/gostcoin-qt.pro b/gostcoin-qt.pro
+index feacfd3..70e6fe0 100644
+--- a/gostcoin-qt.pro
++++ b/gostcoin-qt.pro
+@@ -452,11 +452,15 @@ macx:QMAKE_INFO_PLIST = share/qt/Info.plist
+ INCLUDEPATH += $$BOOST_INCLUDE_PATH $$BDB_INCLUDE_PATH $$OPENSSL_INCLUDE_PATH $$QRENCODE_INCLUDE_PATH
+ LIBS += $$join(BOOST_LIB_PATH,,-L,) $$join(BDB_LIB_PATH,,-L,) $$join(OPENSSL_LIB_PATH,,-L,) $$join(QRENCODE_LIB_PATH,,-L,)
+ LIBS += -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX -lz
+ # -lgdi32 has to happen after -lcrypto (see  #681)
+ win32:LIBS += -lws2_32 -lshlwapi -lmswsock -lole32 -loleaut32 -luuid -lgdi32
+-LIBS += -lboost_system$$BOOST_LIB_SUFFIX -lboost_filesystem$$BOOST_LIB_SUFFIX -lboost_program_options$$BOOST_LIB_SUFFIX -lboost_thread$$BOOST_THREAD_LIB_SUFFIX
++LIBS += -lboost_system$$BOOST_LIB_SUFFIX \
++	-lboost_filesystem$$BOOST_LIB_SUFFIX \
++	-lboost_program_options$$BOOST_LIB_SUFFIX \
++	-lboost_thread$$BOOST_THREAD_LIB_SUFFIX \
++	-lboost_chrono$$BOOST_THREAD_LIB_SUFFIX
+ 
+ win32|macx {
+     LIBS += -lboost_chrono$$BOOST_LIB_SUFFIX
+ }
+ 
+diff --git a/src/makefile.bsd b/src/makefile.bsd
+index 028de1d..15861ed 100644
+--- a/src/makefile.bsd
++++ b/src/makefile.bsd
+@@ -36,10 +36,11 @@ LIBS += \
+    -Wl,-B$(LMODE) \
+    -l boost_system$(BOOST_LIB_SUFFIX) \
+    -l boost_filesystem$(BOOST_LIB_SUFFIX) \
+    -l boost_program_options$(BOOST_LIB_SUFFIX) \
+    -l boost_thread$(BOOST_LIB_SUFFIX) \
++   -l boost_chrono$(BOOST_LIB_SUFFIX) \
+    -l db_cxx$(BDB_LIB_SUFFIX) \
+    -l ssl \
+    -l crypto
+ 
+ TESTLIBS += \
+diff --git a/src/makefile.unix b/src/makefile.unix
+index 5d5edac..482cdf5 100644
+--- a/src/makefile.unix
++++ b/src/makefile.unix
+@@ -32,10 +32,11 @@ LIBS += \
+ 	-Wl,-B$(LMODE) \
+ 	-lboost_system$(BOOST_LIB_SUFFIX) \
+ 	-lboost_filesystem$(BOOST_LIB_SUFFIX) \
+ 	-lboost_program_options$(BOOST_LIB_SUFFIX) \
+ 	-lboost_thread$(BOOST_LIB_SUFFIX) \
++	-lboost_chrono$(BOOST_LIB_SUFFIX) \
+ 	-ldb_cxx$(BDB_LIB_SUFFIX) \
+ 	-lssl \
+ 	-lcrypto
+ 
+ TESTLIBS += \