summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorgraziano.giuliani2018-12-02 18:19:04 +0100
committergraziano.giuliani2018-12-02 18:19:04 +0100
commitdd039f55255a092e42ef0e65a859b890507f5cfc (patch)
treec5c2e5c154f4c096d6acecd088ac3200fc81ced2
parent7769ae3c75d552daf622b445df58a7f15dd05cd9 (diff)
downloadaur-dd039f55255a092e42ef0e65a859b890507f5cfc.tar.gz
new upstream
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD13
-rw-r--r--g++7.patch53
3 files changed, 10 insertions, 66 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d251b53c60a..c45ea3140d6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Tue Aug 14 15:36:04 UTC 2018
+# Sun Dec 2 17:18:52 UTC 2018
pkgbase = magics++
pkgdesc = Magics is the latest generation of the ECMWF's Meteorological plotting software MAGICS.
- pkgver = 3.1.0
+ pkgver = 3.2.2
pkgrel = 2
url = https://software.ecmwf.int/wiki/display/MAGP
arch = i686
@@ -24,12 +24,10 @@ pkgbase = magics++
depends = python
optdepends = libaec
optdepends = odb_api
- source = http://software.ecmwf.int/wiki/download/attachments/3473464/Magics-3.1.0-Source.tar.gz
+ source = http://software.ecmwf.int/wiki/download/attachments/3473464/Magics-3.2.2-Source.tar.gz
source = patch
- source = g++7.patch
- md5sums = 0edcc544bcaadaba6d1771f810b44072
+ md5sums = 43439eb6b4aceefa05ea4244a9e41c10
md5sums = 73b04ae78df8c2f6e88b2a36dcd2dd96
- md5sums = 79ff00492ab8bbfce1a1c7b2e82c5e48
pkgname = magics++
diff --git a/PKGBUILD b/PKGBUILD
index 1abe982e501..b185ebdb290 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=magics++
Pkgname=Magics
-pkgver=3.1.0
+pkgver=3.2.2
_attnum=3473464
pkgrel=2
pkgdesc="Magics is the latest generation of the ECMWF's Meteorological plotting software MAGICS."
@@ -13,16 +13,15 @@ license=('Apache')
depends=('qt5-base' 'proj' 'fftw' 'pango' 'netcdf-cxx-legacy' 'eccodes' 'python')
optdepends=('libaec' 'odb_api')
makedepends=('perl-xml-parser' 'gcc-fortran' 'swig' 'python2-numpy' 'cmake' 'boost' 'emos')
-source=(http://software.ecmwf.int/wiki/download/attachments/${_attnum}/${Pkgname}-${pkgver}-Source.tar.gz patch g++7.patch)
-md5sums=('0edcc544bcaadaba6d1771f810b44072'
- '73b04ae78df8c2f6e88b2a36dcd2dd96'
- '79ff00492ab8bbfce1a1c7b2e82c5e48')
+source=(http://software.ecmwf.int/wiki/download/attachments/${_attnum}/${Pkgname}-${pkgver}-Source.tar.gz patch)
+md5sums=('43439eb6b4aceefa05ea4244a9e41c10'
+ '73b04ae78df8c2f6e88b2a36dcd2dd96')
build() {
cd "$srcdir/${Pkgname}-${pkgver}-Source"
patch -p0 -i ../patch
- patch -p2 -i ../g++7.patch
- rm -fr src/boost/range && ln -sf /usr/include/boost/range src/boost
+ # patch -p2 -i ../g++7.patch
+ rm -fr src/boost && ln -sf /usr/include/boost src
[ -x /usr/bin/odb ] && has_odb=ON || has_odb=OFF
mkdir -p build
cd build
diff --git a/g++7.patch b/g++7.patch
deleted file mode 100644
index cd460ee3324..00000000000
--- a/g++7.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- src/Magics-2.33.0-Source/src/boost/geometry/geometries/point.hpp 2017-05-17 10:35:00.000000000 +0200
-+++ src/Magics-2.33.0-Source/src/boost/geometry/geometries/point.hpp.new 2017-06-06 10:54:25.052432745 +0200
-@@ -92,6 +92,16 @@
- m_values[K] = value;
- }
-
-+ /// @brief Set a coordinate
-+ /// @tparam K coordinate to set
-+ /// @param value value to set
-+ template <std::size_t K>
-+ inline void xset(CoordinateType const& value)
-+ {
-+ BOOST_STATIC_ASSERT(K < DimensionCount);
-+ m_values[K] = value;
-+ }
-+
- private:
-
- CoordinateType m_values[DimensionCount];
-@@ -166,7 +176,7 @@
- model::point<CoordinateType, DimensionCount, CoordinateSystem>& p,
- CoordinateType const& value)
- {
-- p.template set<Dimension>(value);
-+ p.template xset<Dimension>(value);
- }
- };
-
---- src/Magics-2.33.0-Source/src/boost/geometry/geometries/point_xy.hpp 2017-05-17 10:35:00.000000000 +0200
-+++ src/Magics-2.33.0-Source/src/boost/geometry/geometries/point_xy.hpp.new 2017-06-06 10:54:37.669171037 +0200
-@@ -65,11 +65,11 @@
-
- /// Set x-value
- inline void x(CoordinateType const& v)
-- { this->template set<0>(v); }
-+ { this->template xset<0>(v); }
-
- /// Set y-value
- inline void y(CoordinateType const& v)
-- { this->template set<1>(v); }
-+ { this->template xset<1>(v); }
- };
-
-
-@@ -116,7 +116,7 @@
- static inline void set(model::d2::point_xy<CoordinateType, CoordinateSystem>& p,
- CoordinateType const& value)
- {
-- p.template set<Dimension>(value);
-+ p.template xset<Dimension>(value);
- }
- };
-