diff options
| author | Antonio Cervone | 2020-07-09 15:27:15 +0200 |
|---|---|---|
| committer | Antonio Cervone | 2020-07-09 15:27:15 +0200 |
| commit | 147536852c97205b84ded0aa8a8802c3899a0926 (patch) | |
| tree | 40f5f4a020c444a121ceab50b3c7a2a58d6f6d09 | |
| parent | ee32e287fa0ef384dde07868aea8e0d6ade11972 (diff) | |
| download | aur-147536852c97205b84ded0aa8a8802c3899a0926.tar.gz | |
update to 5.9.0 and and better following of packaging guidelines
see https://wiki.archlinux.org/index.php/CMake_package_guidelines
| -rw-r--r-- | PKGBUILD | 22 | ||||
| -rw-r--r-- | string.patch | 11 |
2 files changed, 23 insertions, 10 deletions
@@ -2,7 +2,7 @@ # Contributor: Antonio Cervone <ant.cervone@gmail.com> pkgname=metview -pkgver=5.8.3 +pkgver=5.9.0 pkgrel=1 pkgdesc="ECMWF interactive meteorological application" arch=(i686 x86_64) @@ -25,25 +25,28 @@ install= source=(https://software.ecmwf.int/wiki/download/attachments/3964985/Metview-${pkgver}-Source.tar.gz rpc.patch blas.patch - gfortran.patch) + gfortran.patch + string.patch) noextract=() -sha256sums=('a1b3245e851471c94ad36d3fbba75ad1f0517d9ba7b47137300227585d7487e6' +sha256sums=('6bbcf15602a21c8fee4276ec11179c6f95247eeaf08a870181ec339a7c5b80ba' 'abd2f612ca08e9d2a7c288ab0d5512777411f9e6c6077e9b1ac62d4a444345a2' 'c80aed03a542364af5ff177a49e04052d017f992f9139300249be31466170096' - 'a86a2a0c8c7a52c38f2c37d2366d0ff22beabf81723f8c6f9696a1743221c3f0') + 'a86a2a0c8c7a52c38f2c37d2366d0ff22beabf81723f8c6f9696a1743221c3f0' + '8e698feb27bb8c23f8db58f03c481d810ae14cbffde3860e33c6b0a6c328dfd4') prepare() { cd Metview-${pkgver}-Source - patch --forward --strip=1 --input=$srcdir/rpc.patch + # patch --forward --strip=1 --input=$srcdir/rpc.patch patch --forward --strip=1 --input=$srcdir/blas.patch patch --forward --strip=1 --input=$srcdir/gfortran.patch + patch --forward --strip=1 --input=$srcdir/string.patch } build() { - cd Metview-${pkgver}-Source - mkdir -p build && cd build cmake \ + -B build \ + -S Metview-${pkgver}-Source \ -Dmagics_DIR=/usr/share/magics/cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=production \ @@ -51,13 +54,12 @@ build() { -DPYTHON_EXECUTABLE=/usr/bin/python3 \ .. - make + make -C build } package() { - cd Metview-${pkgver}-Source/build - make DESTDIR="$pkgdir" install + make -C build DESTDIR="$pkgdir" install } # vim:set ts=2 sw=2 et: diff --git a/string.patch b/string.patch new file mode 100644 index 000000000000..31d8fada8d51 --- /dev/null +++ b/string.patch @@ -0,0 +1,11 @@ +diff -u -r Metview-5.9.0-Source-orig/mir/src/mir/param/Rules.h Metview-5.9.0-Source/mir/src/mir/param/Rules.h +--- Metview-5.9.0-Source-orig/mir/src/mir/param/Rules.h 2020-07-09 11:49:47.693396296 +0200 ++++ Metview-5.9.0-Source/mir/src/mir/param/Rules.h 2020-07-09 11:50:42.360718782 +0200 +@@ -13,6 +13,7 @@ + #ifndef mir_param_Rules_h + #define mir_param_Rules_h + ++#include <string> + #include <map> + #include <set> + |