[arch-commits] Commit in lib3mf-1/trunk (PKGBUILD)

[Jonas Witschel]

    Date: Sunday, November 3, 2019 @ 13:56:33
  Author: diabonas
Revision: 522521

upgpkg: lib3mf-1 1.8.1-2

Use system libzip and zlib instead of the ones provided by lib3mf.

Modified:
  lib3mf-1/trunk/PKGBUILD

----------+
 PKGBUILD |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-03 13:46:14 UTC (rev 522520)
+++ PKGBUILD	2019-11-03 13:56:33 UTC (rev 522521)
@@ -1,28 +1,32 @@
 # Maintainer: Jonas Witschel <diabonas at archlinux.org>
 pkgname=lib3mf-1
 pkgver=1.8.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Implementation of the 3D Manufacturing Format file standard (legacy version)'
 arch=('x86_64')
 url='https://3mf.io/'
 license=('BSD')
-depends=('gcc-libs' 'libutil-linux') 
+depends=('libzip' 'zlib') 
 makedepends=('cmake')
 checkdepends=('gtest')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/3MFConsortium/lib3mf/archive/v$pkgver.tar.gz"
-        'lib3mf-1_use-system-gtest.patch')
+        'lib3mf-1_use-system-gtest.patch'
+        'lib3mf-1_link-libzip-and-zlib.patch::https://github.com/3MFConsortium/lib3mf/commit/07dec180622d6a3b94b915ae3716a926b2cd473b.patch')
 sha512sums=('f7fd75bcb6472de1595a018e5add516d0d78ab0aee92462b686b77f8d2bef05270e7b737cb7e1d31fc5850815056e753874c2f9ec456a455e8461c4010fe914a'
-            'b6bd55163b1532ce1b0fa19b1963e063ba49b3930079a781ad5a796648baa00e800e75fe6198aaf97395a5c540e947dff7dbee2bc7bd95679eb9f72cd7270414')
+            'b6bd55163b1532ce1b0fa19b1963e063ba49b3930079a781ad5a796648baa00e800e75fe6198aaf97395a5c540e947dff7dbee2bc7bd95679eb9f72cd7270414'
+            '198fb50372222499e537ab350e5f5bad5563870bd8ee4eb5d3f34fb0543c0b119dc13355b6363e172c258c3b943450dd90195a62f398b60929f6eaf50e140945')
 
 prepare() {
 	mkdir build
 	cd "${pkgname%-1}-$pkgver"
 	patch --strip=1 --input="$srcdir/lib3mf-1_use-system-gtest.patch"
+	patch --strip=1 --input="$srcdir/lib3mf-1_link-libzip-and-zlib.patch"
 }
 
 build() {
 	cd build
 	cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_INCLUDEDIR="include/$pkgname" \
+	      -DUSE_INCLUDED_LIBZIP=OFF -DUSE_INCLUDED_ZLIB=OFF \
 	      $( ((CHECKFUNC)) || echo -DLIB3MF_TESTS=OFF) \
 	      "$srcdir/${pkgname%-1}-$pkgver"
 	make