update to 5.15.1

4 files changed, 5 insertions, 130 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3cafac9a3e75..4f2c86da5c35 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = metview
 	pkgdesc = ECMWF interactive meteorological application
-	pkgver = 5.14.0
+	pkgver = 5.15.1
 	pkgrel = 1
 	url = https://confluence.ecmwf.int/display/METV/Metview
 	arch = i686
@@ -16,14 +16,10 @@ pkgbase = metview
 	depends = qt6-5compat
 	depends = qt6-svg
 	depends = snappy
-	source = https://confluence.ecmwf.int/download/attachments/3964985/Metview-5.14.0-Source.tar.gz
-	source = rpc.patch
-	source = blas.patch
+	source = https://confluence.ecmwf.int/download/attachments/3964985/Metview-5.15.1-Source.tar.gz
 	source = gfortran.patch
 	source = string.patch
-	sha256sums = aa3b3046e6c4475dcd02ee38c25cfb9487474aefd58a5a27307c9763c3ec511d
-	sha256sums = abd2f612ca08e9d2a7c288ab0d5512777411f9e6c6077e9b1ac62d4a444345a2
-	sha256sums = 778fff974ed99e01e82e792ab3c75d0e515a31aaec01a6f81fabc5767c6d957a
+	sha256sums = 3eef12dfc0be403885918605071449acf8f3de987ce9103e0ecae7df7dc7efb0
 	sha256sums = a86a2a0c8c7a52c38f2c37d2366d0ff22beabf81723f8c6f9696a1743221c3f0
 	sha256sums = 8e698feb27bb8c23f8db58f03c481d810ae14cbffde3860e33c6b0a6c328dfd4
 
diff --git a/PKGBUILD b/PKGBUILD
index 383b4576e5dc..3a7ac15597f5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Antonio Cervone <ant.cervone@gmail.com>
 
 pkgname=metview
-pkgver=5.14.0
+pkgver=5.15.1
 pkgrel=1
 pkgdesc="ECMWF interactive meteorological application"
 arch=(i686 x86_64)
@@ -18,23 +18,17 @@ backup=()
 options=()
 install=
 source=(https://confluence.ecmwf.int/download/attachments/3964985/Metview-${pkgver}-Source.tar.gz
-        rpc.patch
-        blas.patch
         gfortran.patch
         string.patch)
 
 
 noextract=()
-sha256sums=('aa3b3046e6c4475dcd02ee38c25cfb9487474aefd58a5a27307c9763c3ec511d'
-            'abd2f612ca08e9d2a7c288ab0d5512777411f9e6c6077e9b1ac62d4a444345a2'
-            '778fff974ed99e01e82e792ab3c75d0e515a31aaec01a6f81fabc5767c6d957a'
+sha256sums=('3eef12dfc0be403885918605071449acf8f3de987ce9103e0ecae7df7dc7efb0'
             'a86a2a0c8c7a52c38f2c37d2366d0ff22beabf81723f8c6f9696a1743221c3f0'
             '8e698feb27bb8c23f8db58f03c481d810ae14cbffde3860e33c6b0a6c328dfd4')
 
 prepare() {
   cd Metview-${pkgver}-Source
-  # patch --forward --strip=1 --input=$srcdir/rpc.patch
-  patch --forward --strip=1 --input=$srcdir/blas.patch
   patch --forward --strip=1 --input=$srcdir/gfortran.patch
   patch --forward --strip=1 --input=$srcdir/string.patch
 }
diff --git a/blas.patch b/blas.patch
deleted file mode 100644
index 8f5dc4332f39..000000000000
--- a/blas.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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 -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}"
-                                         "${eckit_linalg_OMP_LIBRARIES}" )
- 
diff --git a/rpc.patch b/rpc.patch
deleted file mode 100644
index f9cc4fb1d941..000000000000
--- a/rpc.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-diff -u -r Metview-5.7.0-Source_orig/mars-client/CMakeLists.txt Metview-5.7.0-Source/mars-client/CMakeLists.txt
---- Metview-5.7.0-Source_orig/mars-client/CMakeLists.txt	2019-10-04 15:21:50.000000000 +0200
-+++ Metview-5.7.0-Source/mars-client/CMakeLists.txt	2019-12-02 12:08:37.022157827 +0100
-@@ -126,6 +126,8 @@
-
- find_package( CURL )
- find_package( CMath )
-+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/metview/cmake)
-+find_package(RPC REQUIRED)
-
- set( CMAKE_THREAD_PREFER_PTHREAD 1 ) # find thread library, but prefer pthreads
- find_package(Threads REQUIRED)
-diff -u -r Metview-5.7.0-Source_orig/mars-client/src/CMakeLists.txt Metview-5.7.0-Source/mars-client/src/CMakeLists.txt
---- Metview-5.7.0-Source_orig/mars-client/src/CMakeLists.txt	2019-10-04 15:21:50.000000000 +0200
-+++ Metview-5.7.0-Source/mars-client/src/CMakeLists.txt	2019-12-02 12:09:59.583267605 +0100
-@@ -254,6 +254,7 @@
-         ${GRIB_API_INCLUDE_DIRS}
-         ${MIR_INCLUDE_DIRS}
-         ${CURL_INCLUDE_DIRS}
-+        ${RPC_INCLUDE_DIRS}
-     INSTALL_HEADERS_LIST ${MARSC_HEADER_FILES_TO_INSTALL}
-     HEADER_DESTINATION ${INSTALL_INCLUDE_DIR}/marsclient
-     DEFINITIONS
-@@ -263,6 +264,7 @@
-         ${FDB5_LIBRARIES}
-         ${MARS_FEATURE_LIBRARIES}
-         ${CURL_LIBRARIES}
-+        ${RPC_LIBRARIES}
-         ${CMATH_LIBRARIES}
-         ${CMAKE_THREAD_LIBS_INIT}
- )
-@@ -271,7 +273,7 @@
-
- ecbuild_add_executable(
-     TARGET    mars.bin
--    INCLUDES  ${MIR_INCLUDE_DIRS} ${LIBEMOS_INCLUDE_DIRS} ${GRIB_API_INCLUDE_DIRS}
-+    INCLUDES  ${MIR_INCLUDE_DIRS} ${LIBEMOS_INCLUDE_DIRS} ${GRIB_API_INCLUDE_DIRS} ${RPC_INCLUDE_DIRS}
-     SOURCES   mars.c
-     LIBS      marsclient
- )
-diff -u -r Metview-5.7.0-Source_orig/mars-client/src/tools/CMakeLists.txt Metview-5.7.0-Source/mars-client/src/tools/CMakeLists.txt
---- Metview-5.7.0-Source_orig/mars-client/src/tools/CMakeLists.txt	2019-10-04 15:21:50.000000000 +0200
-+++ Metview-5.7.0-Source/mars-client/src/tools/CMakeLists.txt	2019-11-19 17:07:42.022402557 +0100
-@@ -9,7 +9,7 @@
-     # here we use the fact that each tool has only one C file that matches its name
-     ecbuild_add_executable( TARGET     ${tool}
-                             SOURCES    ${tool}.c
--                            INCLUDES   ${GRIB_API_INCLUDE_DIRS}
-+                            INCLUDES   ${GRIB_API_INCLUDE_DIRS} ${RPC_INCLUDE_DIRS}
-                             LIBS       marsclient )
-
- endforeach()
-@@ -43,7 +43,7 @@
- ecbuild_add_executable( TARGET     filterbufr
-                         SOURCES    filterbufr.c
-                         CONDITION  HAVE_BUFR_TOOLS AND LIBEMOS_HAVE_LIBEMOS_BUFRDC
--                        INCLUDES   ${GRIB_API_INCLUDE_DIRS}
-+                        INCLUDES   ${GRIB_API_INCLUDE_DIRS} ${RPC_INCLUDE_DIRS}
-                         LIBS       marsclient emos )
-
- ecbuild_add_executable( TARGET     ncmerge
-@@ -101,7 +101,7 @@
- ecbuild_add_executable( TARGET     netcdf2request
-                         SOURCES    netcdf2request.c
-                         CONDITION  HAVE_NETCDF
--                        INCLUDES   ${NETCDF_INCLUDE_DIRS}  ${GRIB_API_INCLUDE_DIRS}
-+                        INCLUDES   ${NETCDF_INCLUDE_DIRS}  ${GRIB_API_INCLUDE_DIRS} ${RPC_INCLUDE_DIRS}
-                         LIBS       marsclient ${NETCDF_LIBRARIES} )
-
-
-diff -u -r Metview-5.7.0-Source_orig/metview/CMakeLists.txt Metview-5.7.0-Source/metview/CMakeLists.txt
---- Metview-5.7.0-Source_orig/metview/CMakeLists.txt	2019-10-04 15:21:52.000000000 +0200
-+++ Metview-5.7.0-Source/metview/CMakeLists.txt	2019-12-02 12:20:06.194798411 +0100
-@@ -129,6 +129,7 @@
- # ensure we don't build shared libraries
- set(BUILD_SHARED_LIBS OFF)
-
-+find_package(RPC REQUIRED)
-
- # Weather Room plot export (ECMWF only)
- if(ENABLE_WEATHER_ROOM)
-@@ -561,7 +562,8 @@
-         ${CMAKE_CURRENT_BINARY_DIR}/src/libMars        # for generated header files
-         ${CMAKE_CURRENT_SOURCE_DIR}/src
-         ${CMAKE_CURRENT_SOURCE_DIR}/src/libFTimeUtil
--        ${Boost_INCLUDE_DIRS} )
-+        ${Boost_INCLUDE_DIRS}
-+        ${RPC_INCLUDE_DIRS})
-
- #message(FATAL_ERROR "METVIEW_STANDARD_INCLUDE_DIRS: ${METVIEW_STANDARD_INCLUDE_DIRS}")
- if( METVIEW_ODB )