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

[Bruno Pagani]

    Date: Monday, July 19, 2021 @ 22:24:56
  Author: archange
Revision: 978951

upgpkg: cgns 4.2.0-1

Includes hdf5 1.12.1 rebuild

Modified:
  cgns/trunk/PKGBUILD

----------+
 PKGBUILD |   18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-07-19 21:56:20 UTC (rev 978950)
+++ PKGBUILD	2021-07-19 22:24:56 UTC (rev 978951)
@@ -2,7 +2,7 @@
 
 _pkgname=CGNS
 pkgname=cgns
-pkgver=4.1.2
+pkgver=4.2.0
 pkgrel=1
 pkgdesc="Standard for recording and recovering computer data associated with the numerical solution of fluid dynamics equations"
 arch=(x86_64)
@@ -11,15 +11,9 @@
 depends=(tk hdf5 libxmu glu)
 makedepends=(gcc-fortran cmake)
 options=(!makeflags)
-source=(https://github.com/${_pkgname}/${_pkgname}/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz
-        cgns-fix-gfortran10.patch::https://github.com/CGNS/CGNS/commit/d463a92cd05545b0c76207589665e3827b3a10ed.patch)
-sha256sums=('951653956f509b8a64040f1440c77f5ee0e6e2bf0a9eef1248d370f60a400050'
-            '44a27ae954ac38106236148ff9058aa90646127ef105eb5a89c951372e5efa06')
+source=(https://github.com/${_pkgname}/${_pkgname}/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz)
+sha256sums=('090ec6cb0916d90c16790183fc7c2bd2bd7e9a5e3764b36c8196ba37bf1dc817')
 
-prepare() {
-    cd ${_pkgname}-${pkgver}
-    patch -Np1 -i ../cgns-fix-gfortran10.patch
-}
 
 build() {
     cmake -B build -S ${_pkgname}-${pkgver} \
@@ -31,20 +25,20 @@
         -DCGNS_ENABLE_LEGACY=ON \
         -DCGNS_ENABLE_SCOPING=OFF \
         -DCGNS_ENABLE_TESTS=ON \
-        -DHDF5_FOUND=OFF \
         -DCMAKE_BUILD_TYPE="Release" \
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DCMAKE_SKIP_RPATH=ON
-# HDF5_FOUND=OFF is a (silly) workaround for https://cgnsorg.atlassian.net/browse/CGNS-143
     make -C build
 }
 
 
 check() {
-    make -C build test
+    LD_LIBRARY_PATH="${srcdir}"/build/src/ make -C build test
 }
 
 package() {
     make -C build DESTDIR="${pkgdir}" install
     install -Dm644 ${_pkgname}-${pkgver}/license.txt -t "${pkgdir}"/usr/share/licenses/${pkgname}/
+    # Remove broken .desktop files
+    rm "${pkgdir}"/usr/bin/*.desktop
 }