diff options
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 8 | ||||
| -rw-r--r-- | c++.patch | 31 | ||||
| -rw-r--r-- | imagemagick_xpm_fix.patch | 8 |
4 files changed, 7 insertions, 50 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Wed May 25 10:25:04 UTC 2016 +# Sun Oct 9 10:05:28 UTC 2016 pkgbase = metview pkgdesc = ECMWF interactive meteorological application - pkgver = 4.6.6 + pkgver = 4.7.0 pkgrel = 1 url = https://software.ecmwf.int/wiki/display/METV/Metview arch = i686 @@ -16,10 +16,8 @@ pkgbase = metview depends = grib_api depends = qtwebkit depends = libxpm - source = https://software.ecmwf.int/wiki/download/attachments/3964985/Metview-4.6.6-Source.tar.gz - source = c++.patch - md5sums = 897c2ec36a0d36a6a9827817a1fafbe2 - md5sums = ab0719eee5c21164747f715a953ec01a + source = https://software.ecmwf.int/wiki/download/attachments/3964985/Metview-4.7.0-Source.tar.gz + md5sums = 8665335fa0d4e6f9bd0f0969fd20b960 pkgname = metview @@ -1,6 +1,6 @@ # Contributor: Graziano Giuliani <graziano.giuliani@poste.it> pkgname=metview -pkgver=4.6.6 +pkgver=4.7.0 pkgrel=1 pkgdesc="ECMWF interactive meteorological application" arch=(i686 x86_64) @@ -15,14 +15,12 @@ replaces=() backup=() options=() install= -source=(https://software.ecmwf.int/wiki/download/attachments/3964985/Metview-${pkgver}-Source.tar.gz c++.patch) +source=(https://software.ecmwf.int/wiki/download/attachments/3964985/Metview-${pkgver}-Source.tar.gz) noextract=() -md5sums=('897c2ec36a0d36a6a9827817a1fafbe2' - 'ab0719eee5c21164747f715a953ec01a') +md5sums=('8665335fa0d4e6f9bd0f0969fd20b960') build() { cd Metview-${pkgver}-Source - patch -p0 -i ${srcdir}/c++.patch mkdir -p build && cd build cmake -DCMAKE_CXX_COMPILER=g++ -DCMAKE_CC_COMPILER=gcc \ -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=production \ diff --git a/c++.patch b/c++.patch deleted file mode 100644 index 73d01a22ed73..000000000000 --- a/c++.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- src/libMarsClient/rpcmars.x.orig 2016-05-25 11:53:59.408000659 +0200 -+++ src/libMarsClient/rpcmars.x 2016-05-25 11:54:31.136928249 +0200 -@@ -2,7 +2,7 @@ - %#include <rpc/xdr.h> - #ifdef RPC_HDR - %typedef char *cache_t; --%typedef void *void_t; -+%typedef void *myvoid_t; - #endif - - struct value { -@@ -31,7 +31,7 @@ - cache_t kind; - - #ifdef RPC_HDR -- void_t data; /* user data */ -+ myvoid_t data; /* user data */ - long order; - #endif - ---- src/libUtil/MvFlextra.cc.orig 2016-05-25 11:56:40.842544314 +0200 -+++ src/libUtil/MvFlextra.cc 2016-05-25 11:57:01.998495926 +0200 -@@ -682,7 +682,7 @@ - string comment=blocks_[i]->comment(); - bool cstep=blocks_[i]->constantStep(); - -- pair<string,bool> p=make_pair<string,bool>(comment,cstep); -+ pair<string,bool> p=make_pair(comment,cstep); - - bool newRef=true; - for(unsigned int j=0; j < ref.size(); j++) diff --git a/imagemagick_xpm_fix.patch b/imagemagick_xpm_fix.patch deleted file mode 100644 index fdb8005f0361..000000000000 --- a/imagemagick_xpm_fix.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- share/metview/icons/fix_last_line 2013-05-21 11:48:31.762669289 +0200 -+++ share/metview/icons/fix_last_line 2013-05-21 11:47:39.427685317 +0200 -@@ -11,4 +11,5 @@ - - sed -e 's/"};/"\ - };/' $1 > fixed.xpm - -+sed -i fixed.xpm -e 's/white/#FFFFFF/' -e 's/snow1/#FFFAFA/' |