diff options
| author | graziano.giuliani | 2018-08-14 17:14:14 +0200 |
|---|---|---|
| committer | graziano.giuliani | 2018-08-14 17:14:14 +0200 |
| commit | e3a286354f449e3f3e846b1384b4e2365aeea225 (patch) | |
| tree | dc021e3463e8883447997c240aec2257fbf717dd | |
| parent | 295f2008ebaccc3ae3f53991905ff1877c6b63eb (diff) | |
| download | aur-e3a286354f449e3f3e846b1384b4e2365aeea225.tar.gz | |
new upstream
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 15 | ||||
| -rw-r--r-- | qtpatch.patch | 11 |
3 files changed, 28 insertions, 8 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Fri Jun 1 08:35:59 UTC 2018 +# Tue Aug 14 15:13:58 UTC 2018 pkgbase = metview pkgdesc = ECMWF interactive meteorological application - pkgver = 5.0.3 + pkgver = 5.1.1 pkgrel = 1 url = https://software.ecmwf.int/wiki/display/METV/Metview arch = i686 @@ -19,8 +19,10 @@ pkgbase = metview depends = qtwebkit depends = libxpm depends = libtirpc - source = https://software.ecmwf.int/wiki/download/attachments/3964985/Metview-5.0.3-Source.tar.gz - md5sums = 55dee664300e4811907790f3f5f6cfb9 + source = https://software.ecmwf.int/wiki/download/attachments/3964985/Metview-5.1.1-Source.tar.gz + source = qtpatch.patch + md5sums = eca65b682b4106f0962d878ad2b9e4e1 + md5sums = 75a0ea34147b5df93ea9442e80878ffd pkgname = metview @@ -1,6 +1,6 @@ # Contributor: Graziano Giuliani <graziano.giuliani@poste.it> pkgname=metview -pkgver=5.0.3 +pkgver=5.1.1 pkgrel=1 pkgdesc="ECMWF interactive meteorological application" arch=(i686 x86_64) @@ -15,21 +15,28 @@ replaces=() backup=() options=() install= -source=(https://software.ecmwf.int/wiki/download/attachments/3964985/Metview-${pkgver}-Source.tar.gz) +source=(https://software.ecmwf.int/wiki/download/attachments/3964985/Metview-${pkgver}-Source.tar.gz qtpatch.patch) noextract=() -md5sums=('55dee664300e4811907790f3f5f6cfb9') +md5sums=('eca65b682b4106f0962d878ad2b9e4e1' + '75a0ea34147b5df93ea9442e80878ffd') 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 mkdir -p build && cd build cmake -DCMAKE_CXX_COMPILER=g++ -DCMAKE_CC_COMPILER=/usr/bin/gcc \ -Dmagics_DIR=/usr/share/magics/cmake \ -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=production \ - -DCMAKE_INSTALL_DATADIR=/usr/share -DENABLE_QT5=ON \ + -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 new file mode 100644 index 000000000000..d6e8e50d5981 --- /dev/null +++ b/qtpatch.patch @@ -0,0 +1,11 @@ +--- 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> |