fixed/simplified pkgbuild according to jonathons advice

2 files changed, 9 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 041a050f887c..60e7bafc08d5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,7 +9,9 @@ pkgbase = libzrtpcpp
 	makedepends = cmake
 	depends = ccrtp
 	source = libzrtpcpp-4.7.0.tar.gz::https://github.com/wernerd/ZRTPCPP/archive/4.7.0.tar.gz
-	md5sums = 24bcaa5ee64083e9da76ee3cb68c90a3
+	source = type_fix.patch
+	b2sums = ffa8bb3c4a18cacf5aa0da08dcbbef225564bece3f282308352d7c3dffc2265815fac287fe219d991acde2a4745fefb750bc634708f1fe26866dd2cb4f5ebc56
+	b2sums = 6c599f893815aa550d5c3de41470e0b7f72b76dd259baa918b1269353b387ef8732a6b8c0fb0d014f4e6b68f07284dbf8e0388b51cc1ba17c875671076c8dc56
 
 pkgname = libzrtpcpp
 
diff --git a/PKGBUILD b/PKGBUILD
index e25e4d23741d..4554ee9b1c34 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,12 +12,14 @@ url='https://github.com/wernerd/ZRTPCPP'
 license=('GPL3')
 depends=('ccrtp')
 makedepends=('cmake')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/wernerd/ZRTPCPP/archive/$pkgver.tar.gz")
-md5sums=('24bcaa5ee64083e9da76ee3cb68c90a3')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/wernerd/ZRTPCPP/archive/$pkgver.tar.gz"
+        type_fix.patch)
+b2sums=('ffa8bb3c4a18cacf5aa0da08dcbbef225564bece3f282308352d7c3dffc2265815fac287fe219d991acde2a4745fefb750bc634708f1fe26866dd2cb4f5ebc56'
+        '6c599f893815aa550d5c3de41470e0b7f72b76dd259baa918b1269353b387ef8732a6b8c0fb0d014f4e6b68f07284dbf8e0388b51cc1ba17c875671076c8dc56')
 
 prepare() {
   sed 's/lib64/lib/g' -i ZRTPCPP-${pkgver}/CMakeLists.txt
-  git -C "${srcdir}/ZRTPCPP-${pkgver}" apply -v "${srcdir}/.."/*patch || git apply -v -p2 ../*.patch
+  patch -Np2 -i type_fix.patch
 }
 
 build() {
@@ -26,7 +28,7 @@ build() {
   cmake ../ZRTPCPP-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release
-  make ${MAKEFLAGS:--j1}
+  make
 }
 
 package() {