update 3.13.2.1355

3 files changed, 6 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ce5d92d29083..0b42ff74f518 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = libdigidocpp
 	pkgdesc = Library for creating DigiDoc signature files
-	pkgver = 3.13.0.1353
+	pkgver = 3.13.2.1355
 	pkgrel = 1
 	url = http://www.id.ee/
 	arch = x86_64
@@ -13,11 +13,9 @@ pkgbase = libdigidocpp
 	makedepends = xxd
 	depends = xml-security-c
 	depends = libdigidoc
-	source = https://installer.id.ee/media/ubuntu/pool/main/libd/libdigidocpp/libdigidocpp_3.13.0.1353.orig.tar.xz
-	source = fix-compile-3.13.0.1353.patch
+	source = https://installer.id.ee/media/ubuntu/pool/main/libd/libdigidocpp/libdigidocpp_3.13.2.1355.orig.tar.xz
 	validpgpkeys = 43650273CE9516880D7EB581B339B36D592073D4
-	sha256sums = fc34c1344891dfebc28e539858d2c72942014469e8deabba57bbae3a5c4ade50
-	sha256sums = 995880ab4f84f01fbe44b6b4a87c0d70fbf534e4ecf7969e751a008841e94afe
+	sha256sums = 5f48ecaf79813a6bbd267479dd21ca0a0a984c41ac37587e5b29dc8b688096c2
 
 pkgname = libdigidocpp
 
diff --git a/PKGBUILD b/PKGBUILD
index 2268fe701ab6..13a19ab672bc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: kevku <kevku@gmx.com>
 pkgname=libdigidocpp
-pkgver=3.13.0.1353
+pkgver=3.13.2.1355
 pkgrel=1
 pkgdesc="Library for creating DigiDoc signature files"
 arch=('x86_64' 'i686')
@@ -8,15 +8,12 @@ url="http://www.id.ee/"
 license=('LGPL')
 depends=('xml-security-c' 'libdigidoc')
 makedepends=('cmake' 'xsd>=4.0' 'pcsclite' 'opensc' 'xxd')
-source=("https://installer.id.ee/media/ubuntu/pool/main/libd/$pkgname/${pkgname}_$pkgver.orig.tar.xz"
-        "fix-compile-3.13.0.1353.patch")
-sha256sums=('fc34c1344891dfebc28e539858d2c72942014469e8deabba57bbae3a5c4ade50'
-            '995880ab4f84f01fbe44b6b4a87c0d70fbf534e4ecf7969e751a008841e94afe')
+source=("https://installer.id.ee/media/ubuntu/pool/main/libd/$pkgname/${pkgname}_$pkgver.orig.tar.xz")
+sha256sums=('5f48ecaf79813a6bbd267479dd21ca0a0a984c41ac37587e5b29dc8b688096c2')
 validpgpkeys=('43650273CE9516880D7EB581B339B36D592073D4')
 
 build() {
   cd "$srcdir/"
-  patch -p1 -i fix-compile-3.13.0.1353.patch
   export PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig
   cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR="lib" -DCMAKE_INSTALL_SYSCONFDIR="/etc" -DINSTALL_DOC=NO -DSWIG_EXECUTABLE="" -DBoost_INCLUDE_DIR="" -DMINIZIP_INCLUDE_DIR=""
   make
diff --git a/fix-compile-3.13.0.1353.patch b/fix-compile-3.13.0.1353.patch
deleted file mode 100644
index 192915b153ec..000000000000
--- a/fix-compile-3.13.0.1353.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/src/crypto/Connect.cpp	2017-06-14 16:45:01.000000000 +0300
-+++ src/src/crypto/Connect.cpp.new	2017-06-30 11:02:51.189677609 +0300
-@@ -30,6 +30,8 @@
- #include <zlib.h>
-
- #include <thread>
-+#include <functional>
-+#include <cstring>
-
- #ifdef __ANDROID__
- #include <sys/select.h>