Date: Saturday, November 2, 2019 @ 19:48:57 Author: diabonas Revision: 522169
archrelease: copy trunk to community-x86_64 Added: lib3mf-1/repos/community-x86_64/ lib3mf-1/repos/community-x86_64/PKGBUILD (from rev 522168, lib3mf-1/trunk/PKGBUILD) lib3mf-1/repos/community-x86_64/lib3mf-1_use-system-gtest.patch (from rev 522168, lib3mf-1/trunk/lib3mf-1_use-system-gtest.patch) ---------------------------------+ PKGBUILD | 40 ++++++++++++++++++++++++++++++++++++++ lib3mf-1_use-system-gtest.patch | 24 ++++++++++++++++++++++ 2 files changed, 64 insertions(+) Copied: lib3mf-1/repos/community-x86_64/PKGBUILD (from rev 522168, lib3mf-1/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2019-11-02 19:48:57 UTC (rev 522169) @@ -0,0 +1,40 @@ +# Maintainer: Jonas Witschel <diabo...@archlinux.org> +pkgname=lib3mf-1 +pkgver=1.8.1 +pkgrel=1 +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') +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') +sha512sums=('f7fd75bcb6472de1595a018e5add516d0d78ab0aee92462b686b77f8d2bef05270e7b737cb7e1d31fc5850815056e753874c2f9ec456a455e8461c4010fe914a' + 'b6bd55163b1532ce1b0fa19b1963e063ba49b3930079a781ad5a796648baa00e800e75fe6198aaf97395a5c540e947dff7dbee2bc7bd95679eb9f72cd7270414') + +prepare() { + mkdir build + cd "${pkgname%-1}-$pkgver" + patch --strip=1 --input="$srcdir/lib3mf-1_use-system-gtest.patch" +} + +build() { + cd build + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_INCLUDEDIR="include/$pkgname" \ + $( ((CHECKFUNC)) || echo -DLIB3MF_TESTS=OFF) \ + "$srcdir/${pkgname%-1}-$pkgver" + make +} + +check() { + cd build + ctest +} + +package() { + cd build + make DESTDIR="$pkgdir" install + install -Dm644 "$srcdir/${pkgname%-1}-$pkgver/LICENSE" -t "$pkgdir/usr/share/licenses/$pkgname" +} Copied: lib3mf-1/repos/community-x86_64/lib3mf-1_use-system-gtest.patch (from rev 522168, lib3mf-1/trunk/lib3mf-1_use-system-gtest.patch) =================================================================== --- community-x86_64/lib3mf-1_use-system-gtest.patch (rev 0) +++ community-x86_64/lib3mf-1_use-system-gtest.patch 2019-11-02 19:48:57 UTC (rev 522169) @@ -0,0 +1,24 @@ +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 +