new upstream

4 files changed, 70 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 34a4f1fcac89..e5856248a88a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sun Mar 26 18:38:56 UTC 2017
+# Mon Jun  5 18:41:04 UTC 2017
 pkgbase = magics++
 	pkgdesc = Magics is the latest generation of the ECMWF's Meteorological plotting software MAGICS.
-	pkgver = 2.32.0
+	pkgver = 2.33.0
 	pkgrel = 1
 	url = https://software.ecmwf.int/wiki/display/MAGP
 	arch = i686
@@ -24,10 +24,12 @@ pkgbase = magics++
 	depends = python
 	optdepends = libaec
 	optdepends = odb_api
-	source = http://software.ecmwf.int/wiki/download/attachments/3473464/Magics-2.32.0-Source.tar.gz
+	source = http://software.ecmwf.int/wiki/download/attachments/3473464/Magics-2.33.0-Source.tar.gz
 	source = patch
-	md5sums = e17956fffce9ea826cf994f8d275e0f5
-	md5sums = da04828807d7fda1d767197c6d69ec0b
+	source = g++7.patch
+	md5sums = 740169caf9dca3a2ad4dfb61d6570448
+	md5sums = 73b04ae78df8c2f6e88b2a36dcd2dd96
+	md5sums = 729442b9fbce6ebe0ce52c588ae5ca9c
 
 pkgname = magics++
 
diff --git a/PKGBUILD b/PKGBUILD
index 22f521dafa83..3820a76de9fe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=magics++
 Pkgname=Magics
-pkgver=2.32.0
+pkgver=2.33.0
 _attnum=3473464
 pkgrel=1
 pkgdesc="Magics is the latest generation of the ECMWF's Meteorological plotting software MAGICS."
@@ -13,19 +13,22 @@ 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)
-md5sums=('e17956fffce9ea826cf994f8d275e0f5'
-         'da04828807d7fda1d767197c6d69ec0b')
+source=(http://software.ecmwf.int/wiki/download/attachments/${_attnum}/${Pkgname}-${pkgver}-Source.tar.gz patch g++7.patch)
+md5sums=('740169caf9dca3a2ad4dfb61d6570448'
+         '73b04ae78df8c2f6e88b2a36dcd2dd96'
+         '79ff00492ab8bbfce1a1c7b2e82c5e48')
 
 build() {
   cd "$srcdir/${Pkgname}-${pkgver}-Source"
   patch -p0 -i ../patch
+  patch -p2 -i ../g++7.patch
   mkdir -p build
   cd build
-  CC=gcc CXX=g++ \
+  CC=gcc CXX='g++' \
   cmake -DCMAKE_LINKER_FLAGS="-pthread" \
     -DCMAKE_SHARED_LINKER_FLAGS="-pthread" \
     -DCMAKE_EXE_LINKER_FLAGS="-pthread" \
+    -DODB_API_DIR=/usr \
     -DCMAKE_CXX_COMPILER=g++ -DCMAKE_CC_COMPILER=gcc \
     -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=production \
     -DCMAKE_INSTALL_DATADIR=/usr/share \
diff --git a/g++7.patch b/g++7.patch
new file mode 100644
index 000000000000..cd460ee3324e
--- /dev/null
+++ b/g++7.patch
@@ -0,0 +1,53 @@
+--- 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);
+     }
+ };
+ 
diff --git a/patch b/patch
index 3a5441ab5436..b67c8ff6dad3 100644
--- a/patch
+++ b/patch
@@ -1,5 +1,5 @@
---- cmake/ecbuild_pkgconfig.cmake.orig	2016-03-28 21:41:34.726196875 +0200
-+++ cmake/ecbuild_pkgconfig.cmake	2016-03-28 21:41:59.595426196 +0200
+--- cmake/ecbuild_pkgconfig.cmake.orig 2016-03-28 21:41:34.726196875 +0200
++++ cmake/ecbuild_pkgconfig.cmake      2016-03-28 21:41:59.595426196 +0200
 @@ -190,7 +190,7 @@
    foreach( _incdir ${${INCLUDE_DIRS}} )