Date: Monday, November 18, 2019 @ 21:03:38 Author: diabonas Revision: 530348
upgpkg: lib3mf-1 1.8.1-3 use upstreamed patch to remove vendored gtest Modified: lib3mf-1/trunk/PKGBUILD Deleted: lib3mf-1/trunk/lib3mf-1_use-system-gtest.patch ---------------------------------+ PKGBUILD | 8 ++++---- lib3mf-1_use-system-gtest.patch | 24 ------------------------ 2 files changed, 4 insertions(+), 28 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-11-18 20:07:32 UTC (rev 530347) +++ PKGBUILD 2019-11-18 21:03:38 UTC (rev 530348) @@ -1,7 +1,7 @@ # Maintainer: Jonas Witschel <diabo...@archlinux.org> pkgname=lib3mf-1 pkgver=1.8.1 -pkgrel=2 +pkgrel=3 pkgdesc='Implementation of the 3D Manufacturing Format file standard (legacy version)' arch=('x86_64') url='https://3mf.io/' @@ -10,10 +10,10 @@ 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::https://github.com/3MFConsortium/lib3mf/commit/cf679cc3736d4b22ce5711b5e81d28b7b6f4f4b0.patch' 'lib3mf-1_link-libzip-and-zlib.patch::https://github.com/3MFConsortium/lib3mf/commit/07dec180622d6a3b94b915ae3716a926b2cd473b.patch') sha512sums=('f7fd75bcb6472de1595a018e5add516d0d78ab0aee92462b686b77f8d2bef05270e7b737cb7e1d31fc5850815056e753874c2f9ec456a455e8461c4010fe914a' - 'b6bd55163b1532ce1b0fa19b1963e063ba49b3930079a781ad5a796648baa00e800e75fe6198aaf97395a5c540e947dff7dbee2bc7bd95679eb9f72cd7270414' + '84da1e659ed52582aca3c6f9ce2b234aad000e96bb657ff2aa7d118a613d5bca9b3f05f117f5db0a91440a9d51494730a637ed844ca4adb4887f357c15394663' '198fb50372222499e537ab350e5f5bad5563870bd8ee4eb5d3f34fb0543c0b119dc13355b6363e172c258c3b943450dd90195a62f398b60929f6eaf50e140945') prepare() { @@ -26,7 +26,7 @@ build() { cd build cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_INCLUDEDIR="include/$pkgname" \ - -DUSE_INCLUDED_LIBZIP=OFF -DUSE_INCLUDED_ZLIB=OFF \ + -DUSE_INCLUDED_LIBZIP=OFF -DUSE_INCLUDED_ZLIB=OFF -DUSE_INCLUDED_GTEST=OFF \ $( ((CHECKFUNC)) || echo -DLIB3MF_TESTS=OFF) \ "$srcdir/${pkgname%-1}-$pkgver" make Deleted: lib3mf-1_use-system-gtest.patch =================================================================== --- lib3mf-1_use-system-gtest.patch 2019-11-18 20:07:32 UTC (rev 530347) +++ lib3mf-1_use-system-gtest.patch 2019-11-18 21:03:38 UTC (rev 530348) @@ -1,24 +0,0 @@ -From 211d72396a55b63696ed39d97c54e382d139ee15 Mon Sep 17 00:00:00 2001 -From: Jonas Witschel <diabo...@archlinux.org> -Date: Sat, 2 Nov 2019 19:02:49 +0100 -Subject: [PATCH] Use system gtest instead of building from submodule - ---- - UnitTests/CMakeLists.txt | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/UnitTests/CMakeLists.txt b/UnitTests/CMakeLists.txt -index 59ae773..ffad014 100644 ---- a/UnitTests/CMakeLists.txt -+++ b/UnitTests/CMakeLists.txt -@@ -1,7 +1,5 @@ --ADD_SUBDIRECTORY (googletest EXCLUDE_FROM_ALL) - enable_testing() - --SET(gtest_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/googletest/googletest") - add_definitions( -DTESTFILESPATH="${CMAKE_CURRENT_SOURCE_DIR}/../TestFiles") - add_definitions( -DLTESTFILESPATH=L"${CMAKE_CURRENT_SOURCE_DIR}/../TestFiles") - add_definitions( -DLOUTFILESPATH=L"${CMAKE_BINARY_DIR}/") --- -2.23.0 -