diff options
author | graziano.giuliani | 2019-04-22 23:31:35 +0200 |
---|---|---|
committer | graziano.giuliani | 2019-04-22 23:31:35 +0200 |
commit | 43e7f512cf3e6ff489c4c49a0f7907e187907d21 (patch) | |
tree | d05223ed5c9ea0a0985ae6e68202922cd52d130f | |
parent | a3acd9dcfaae0302f79228d3203fe3ba0dfac28d (diff) | |
download | aur-43e7f512cf3e6ff489c4c49a0f7907e187907d21.tar.gz |
new upstream
-rw-r--r-- | .SRCINFO | 10 | ||||
-rw-r--r-- | PKGBUILD | 16 | ||||
-rw-r--r-- | qtpatch.patch | 11 |
3 files changed, 9 insertions, 28 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Thu Dec 13 17:23:42 UTC 2018 +# Mon Apr 22 21:31:00 UTC 2019 pkgbase = metview pkgdesc = ECMWF interactive meteorological application - pkgver = 5.3.0 + pkgver = 5.5.0 pkgrel = 1 url = https://software.ecmwf.int/wiki/display/METV/Metview arch = i686 @@ -19,10 +19,8 @@ pkgbase = metview depends = qtwebkit depends = libxpm depends = libtirpc - source = https://software.ecmwf.int/wiki/download/attachments/3964985/Metview-5.3.0-Source.tar.gz - source = qtpatch.patch - md5sums = 9da7bb4f1eaebc5930d83df8afcb3e17 - md5sums = 75a0ea34147b5df93ea9442e80878ffd + source = https://software.ecmwf.int/wiki/download/attachments/3964985/Metview-5.5.0-Source.tar.gz + md5sums = 72c6c22325b25692dc0b55433384fa3e pkgname = metview @@ -1,6 +1,6 @@ # Contributor: Graziano Giuliani <graziano.giuliani@poste.it> pkgname=metview -pkgver=5.3.0 +pkgver=5.5.0 pkgrel=1 pkgdesc="ECMWF interactive meteorological application" arch=(i686 x86_64) @@ -15,18 +15,15 @@ replaces=() backup=() options=() install= -source=(https://software.ecmwf.int/wiki/download/attachments/3964985/Metview-${pkgver}-Source.tar.gz qtpatch.patch) +source=(https://software.ecmwf.int/wiki/download/attachments/3964985/Metview-${pkgver}-Source.tar.gz) noextract=() -md5sums=('9da7bb4f1eaebc5930d83df8afcb3e17' - '75a0ea34147b5df93ea9442e80878ffd') +md5sums=('72c6c22325b25692dc0b55433384fa3e') build() { cd Metview-${pkgver}-Source # Fix problem for libc deprived of rpc. I will use tirpc package. - ln -sf /usr/include/tirpc/rpc src/libMarsClient - ln -sf /usr/include/tirpc/netconfig.h src/libMarsClient - # Add an include file. - patch -p0 -i ${srcdir}/qtpatch.patch + ln -sf /usr/include/tirpc/rpc mars-client/src + ln -sf /usr/include/tirpc/netconfig.h mars-client/src mkdir -p build && cd build cmake -DCMAKE_CXX_COMPILER=g++ -DCMAKE_CC_COMPILER=/usr/bin/gcc \ -Dmagics_DIR=/usr/share/magics/cmake \ @@ -34,9 +31,6 @@ build() { -DCMAKE_INSTALL_DATADIR=/usr/share \ -DPYTHON_EXECUTABLE=/usr/bin/python2 \ -DCMAKE_CXX_STANDARD_LIBRARIES="-ltirpc" .. - # Kludge to fix compilation. Not much time to find real solution. - sed -i src/PottF/CMakeFiles/PottF.dir/link.txt \ - -e 's!-ltirpc!-ltirpc ../../lib/libMvMars.so!' make || return 1 } diff --git a/qtpatch.patch b/qtpatch.patch deleted file mode 100644 index d6e8e50d5981..000000000000 --- a/qtpatch.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/libMvQtGui/MvQTreeViewSearchLine.cc 2018-08-14 12:16:26.877605383 +0200 -+++ src/libMvQtGui/MvQTreeViewSearchLine.cc 2018-08-14 12:14:45.433777266 +0200 -@@ -9,6 +9,8 @@ - - #include <assert.h> - -+#include <QObject> -+#include <QtWidgets/QHeaderView> - #include <QDebug> - #include <QLineEdit> - #include <QPushButton> |