Date: Sunday, September 13, 2020 @ 18:00:30 Author: arojas Revision: 396001
Update to 2020.2 Modified: qhull/trunk/PKGBUILD Deleted: qhull/trunk/qhull-no-static.patch -----------------------+ PKGBUILD | 17 ++++++----------- qhull-no-static.patch | 42 ------------------------------------------ 2 files changed, 6 insertions(+), 53 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-09-13 14:38:54 UTC (rev 396000) +++ PKGBUILD 2020-09-13 18:00:30 UTC (rev 396001) @@ -5,8 +5,8 @@ # Contributor: Darwin Bautista <[email protected]> pkgname=qhull -pkgver=2020.1 -_pkgver=8.0.0 +pkgver=2020.2 +_pkgver=8.0.2 pkgrel=1 pkgdesc="A general dimension code for computing convex hulls and related structures" arch=(x86_64) @@ -14,18 +14,13 @@ license=(custom) depends=(glibc) makedepends=(cmake) -source=("http://www.qhull.org/download/qhull-${pkgver%.*}-src-$_pkgver.tgz"; - qhull-no-static.patch) -sha256sums=('1ac92a5538f61e297c72aebe4d4ffd731ceb3e6045d6d15faf1c212713798df4' - '8c9e7bda62da8f9c02429b0839610adf6e22525e0de6eb6df2a95cf3dad8b7ab') +source=("http://www.qhull.org/download/qhull-${pkgver%.*}-src-$_pkgver.tgz";) +sha256sums=('b5c2d7eb833278881b952c8a52d20179eab87766b00b865000469a45c1838b7e') -prepare() { - patch -d $pkgname-$pkgver -p1 -i ../qhull-no-static.patch # Disable static libraries -} - build() { cmake -B build -S $pkgname-$pkgver \ - -DCMAKE_INSTALL_PREFIX=/usr + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_STATIC_LIBS=OFF cmake --build build } Deleted: qhull-no-static.patch =================================================================== --- qhull-no-static.patch 2020-09-13 14:38:54 UTC (rev 396000) +++ qhull-no-static.patch 2020-09-13 18:00:30 UTC (rev 396001) @@ -1,42 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 09aa249..f1f4b50 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -353,7 +353,7 @@ endif() - - set( - qhull_TARGETS_INSTALL -- ${qhull_CPP} ${qhull_STATIC} ${qhull_STATICR} ${qhull_SHAREDR} -+ ${qhull_CPP} ${qhull_SHAREDR} - qhull rbox qconvex qdelaunay qvoronoi qhalf - ${qhull_SHARED} ${qhull_SHAREDP} # Deprecated, use qhull_r instead - ) -@@ -485,22 +485,22 @@ set(qvoronoi_SOURCES src/qvoronoi/qvoronoi.c) - set(qhalf_SOURCES src/qhalf/qhalf.c) - - add_executable(qhull ${qhull_SOURCES}) --target_link_libraries(qhull ${qhull_STATICR}) -+target_link_libraries(qhull ${qhull_SHAREDR}) - - add_executable(rbox ${rbox_SOURCES}) --target_link_libraries(rbox ${qhull_STATIC}) -+target_link_libraries(rbox ${qhull_SHARED}) - - add_executable(qconvex ${qconvex_SOURCES}) --target_link_libraries(qconvex ${qhull_STATIC}) -+target_link_libraries(qconvex ${qhull_SHARED}) - - add_executable(qdelaunay ${qdelaunay_SOURCES}) --target_link_libraries(qdelaunay ${qhull_STATIC}) -+target_link_libraries(qdelaunay ${qhull_SHARED}) - - add_executable(qvoronoi ${qvoronoi_SOURCES}) --target_link_libraries(qvoronoi ${qhull_STATIC}) -+target_link_libraries(qvoronoi ${qhull_SHARED}) - - add_executable(qhalf ${qhalf_SOURCES}) --target_link_libraries(qhalf ${qhull_STATIC}) -+target_link_libraries(qhalf ${qhull_SHARED}) - - # --------------------------------------- - # Define options for linking to qhull_SHAREDR or qhull_SHARED
