update to v5.14.0

4 files changed, 30 insertions, 74 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bceb1ec26694..3cafac9a3e75 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = metview
 	pkgdesc = ECMWF interactive meteorological application
-	pkgver = 5.13.1
+	pkgver = 5.14.0
 	pkgrel = 1
-	url = https://software.ecmwf.int/wiki/display/METV/Metview
+	url = https://confluence.ecmwf.int/display/METV/Metview
 	arch = i686
 	arch = x86_64
 	groups = science
@@ -12,21 +12,19 @@ pkgbase = metview
 	makedepends = rpcsvc-proto
 	makedepends = gcc-fortran
 	depends = cgal
-	depends = magics++>=4.9.0
+	depends = magics++>=4.10.0
 	depends = qt6-5compat
 	depends = qt6-svg
 	depends = snappy
-	source = https://software.ecmwf.int/wiki/download/attachments/3964985/Metview-5.13.1-Source.tar.gz
+	source = https://confluence.ecmwf.int/download/attachments/3964985/Metview-5.14.0-Source.tar.gz
 	source = rpc.patch
 	source = blas.patch
 	source = gfortran.patch
 	source = string.patch
-	source = format_security.patch
-	sha256sums = bbf3f6df727ea1ba2a5e22540f62ab0d4c95e2a9b09106370bd2a2f0e5226f76
+	sha256sums = aa3b3046e6c4475dcd02ee38c25cfb9487474aefd58a5a27307c9763c3ec511d
 	sha256sums = abd2f612ca08e9d2a7c288ab0d5512777411f9e6c6077e9b1ac62d4a444345a2
-	sha256sums = c80aed03a542364af5ff177a49e04052d017f992f9139300249be31466170096
+	sha256sums = 778fff974ed99e01e82e792ab3c75d0e515a31aaec01a6f81fabc5767c6d957a
 	sha256sums = a86a2a0c8c7a52c38f2c37d2366d0ff22beabf81723f8c6f9696a1743221c3f0
 	sha256sums = 8e698feb27bb8c23f8db58f03c481d810ae14cbffde3860e33c6b0a6c328dfd4
-	sha256sums = 55d0b927bf1af2ab7a31400cf72f77fc13d2bc047ce4b3c30463a6d3a40f01ed
 
 pkgname = metview
diff --git a/PKGBUILD b/PKGBUILD
index ba0019c856e6..383b4576e5dc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,14 +2,14 @@
 # Contributor: Antonio Cervone <ant.cervone@gmail.com>
 
 pkgname=metview
-pkgver=5.13.1
+pkgver=5.14.0
 pkgrel=1
 pkgdesc="ECMWF interactive meteorological application"
 arch=(i686 x86_64)
-url="https://software.ecmwf.int/wiki/display/METV/Metview"
+url="https://confluence.ecmwf.int/display/METV/Metview"
 license=('APACHE')
 groups=(science)
-depends=(cgal 'magics++>=4.9.0' qt6-5compat qt6-svg snappy)
+depends=(cgal 'magics++>=4.10.0' qt6-5compat qt6-svg snappy)
 makedepends=(boost cmake rpcsvc-proto gcc-fortran)
 provides=()
 conflicts=()
@@ -17,21 +17,19 @@ replaces=()
 backup=()
 options=()
 install=
-source=(https://software.ecmwf.int/wiki/download/attachments/3964985/Metview-${pkgver}-Source.tar.gz
+source=(https://confluence.ecmwf.int/download/attachments/3964985/Metview-${pkgver}-Source.tar.gz
         rpc.patch
         blas.patch
         gfortran.patch
-        string.patch
-        format_security.patch)
+        string.patch)
 
 
 noextract=()
-sha256sums=('bbf3f6df727ea1ba2a5e22540f62ab0d4c95e2a9b09106370bd2a2f0e5226f76'
+sha256sums=('aa3b3046e6c4475dcd02ee38c25cfb9487474aefd58a5a27307c9763c3ec511d'
             'abd2f612ca08e9d2a7c288ab0d5512777411f9e6c6077e9b1ac62d4a444345a2'
-            'c80aed03a542364af5ff177a49e04052d017f992f9139300249be31466170096'
+            '778fff974ed99e01e82e792ab3c75d0e515a31aaec01a6f81fabc5767c6d957a'
             'a86a2a0c8c7a52c38f2c37d2366d0ff22beabf81723f8c6f9696a1743221c3f0'
-            '8e698feb27bb8c23f8db58f03c481d810ae14cbffde3860e33c6b0a6c328dfd4'
-            '55d0b927bf1af2ab7a31400cf72f77fc13d2bc047ce4b3c30463a6d3a40f01ed')
+            '8e698feb27bb8c23f8db58f03c481d810ae14cbffde3860e33c6b0a6c328dfd4')
 
 prepare() {
   cd Metview-${pkgver}-Source
@@ -39,7 +37,6 @@ prepare() {
   patch --forward --strip=1 --input=$srcdir/blas.patch
   patch --forward --strip=1 --input=$srcdir/gfortran.patch
   patch --forward --strip=1 --input=$srcdir/string.patch
-  patch --forward --strip=1 --input=$srcdir/format_security.patch
 }
 
 build() {
diff --git a/blas.patch b/blas.patch
index 9152b4e933e4..8f5dc4332f39 100644
--- a/blas.patch
+++ b/blas.patch
@@ -1,24 +1,24 @@
-diff -u -r --text Metview-5.7.3-Source_orig/eckit/CMakeLists.txt Metview-5.7.3-Source/eckit/CMakeLists.txt
---- Metview-5.7.3-Source_orig/eckit/CMakeLists.txt	2019-11-28 11:54:51.000000000 +0100
-+++ Metview-5.7.3-Source/eckit/CMakeLists.txt	2019-12-02 17:00:35.667143818 +0100
-@@ -184,6 +184,8 @@
-                     DEFAULT OFF
-                     DESCRIPTION "Add additional unit/performance tests" )
-
+diff -u -u -r Metview-5.14.0-Source-orig/eckit/CMakeLists.txt Metview-5.14.0-Source/eckit/CMakeLists.txt
+--- Metview-5.14.0-Source-orig/eckit/CMakeLists.txt	2021-12-14 17:32:59.809398853 +0100
++++ Metview-5.14.0-Source/eckit/CMakeLists.txt	2021-12-14 17:27:24.265976787 +0100
+@@ -228,6 +228,8 @@
+                     CONDITION HAVE_CXX_CODECVT
+                     DESCRIPTION "Add support for Unicode characters in Yaml/JSON parsers" )
+ 
 +find_package(BLAS)
 +
  ### async io support
-
+ 
  find_package( AIO )
-diff -u -r --text Metview-5.7.3-Source_orig/eckit/src/eckit/linalg/CMakeLists.txt Metview-5.7.3-Source/eckit/src/eckit/linalg/CMakeLists.txt
---- Metview-5.7.3-Source_orig/eckit/src/eckit/linalg/CMakeLists.txt	2019-11-28 11:54:51.000000000 +0100
-+++ Metview-5.7.3-Source/eckit/src/eckit/linalg/CMakeLists.txt	2019-12-02 17:03:51.139897493 +0100
-@@ -38,7 +38,7 @@
-                      LIBS               eckit
+diff -u -u -r Metview-5.14.0-Source-orig/eckit/src/eckit/linalg/CMakeLists.txt Metview-5.14.0-Source/eckit/src/eckit/linalg/CMakeLists.txt
+--- Metview-5.14.0-Source-orig/eckit/src/eckit/linalg/CMakeLists.txt	2021-12-14 17:29:45.930755347 +0100
++++ Metview-5.14.0-Source/eckit/src/eckit/linalg/CMakeLists.txt	2021-12-14 17:30:24.687817276 +0100
+@@ -51,7 +51,7 @@
+                      PRIVATE_LIBS
                                          "${ARMADILLO_LIBRARIES}"
                                          "${CUDA_LIBRARIES}" "${CUDA_cusparse_LIBRARY}"
 -                                        "${LAPACK_LIBRARIES}"
 +                                        "${BLAS_LIBRARIES}" "${LAPACK_LIBRARIES}"
-                                         "${MKL_LIBRARIES}" )
-
- if (CUDA_FOUND)
+                                         "${MKL_LIBRARIES}"
+                                         "${eckit_linalg_OMP_LIBRARIES}" )
+ 
diff --git a/format_security.patch b/format_security.patch
deleted file mode 100644
index 55dc459bfd64..000000000000
--- a/format_security.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -u -r Metview-5.12.0-Source-orig/metview/src/Macro/mvector.cc Metview-5.12.0-Source/metview/src/Macro/mvector.cc
---- Metview-5.12.0-Source-orig/metview/src/Macro/mvector.cc	2021-05-28 14:08:01.975699414 +0200
-+++ Metview-5.12.0-Source/metview/src/Macro/mvector.cc	2021-05-28 14:08:25.042614971 +0200
-@@ -19,7 +19,7 @@
- /*
- 
-   To do:  (o = to do, * = done)
--  
-+
-     * allow nil & vector
-     * allow vector & vector
-     * vector op vector
-@@ -687,7 +687,7 @@
-     sprintf(typeBuffer, "%-10s", CArray::stringFromValuesType(values->type()).c_str());
- 
-     fprintf(f, "METVIEW_VECTOR");
--    fprintf(f, typeBuffer);
-+    fprintf(f, "%s", typeBuffer);
- 
-     int size = values->count();
-     fwrite(&size, sizeof(int), 1, f);  // write the number of values
-@@ -1231,7 +1231,7 @@
- /*
- class VectorProductFunction : public Function {
- public:
--	VectorProductFunction(char *n) : Function(n,2,tvector,tvector) 
-+	VectorProductFunction(char *n) : Function(n,2,tvector,tvector)
- 	{info = "Vector product";};
- 	virtual Value Execute(int arity,Value *arg);
- };
-@@ -1254,7 +1254,7 @@
- 
- 	for(int i=0;i<a->Count();i++)
- 		;
--		
-+
- 	return Value(c);
- }
- */