<pre style='margin:0'>
Takeshi Enomoto (tenomoto) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5b03f8ad9fd136c91e4f90c2d15f62a1dad97c67">https://github.com/macports/macports-ports/commit/5b03f8ad9fd136c91e4f90c2d15f62a1dad97c67</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 5b03f8a metview: update to 5.7.4
</span>5b03f8a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5b03f8ad9fd136c91e4f90c2d15f62a1dad97c67
</span>Author: Takeshi Enomoto <takeshi@macports.org>
AuthorDate: Sat Dec 7 22:12:48 2019 +0900
<span style='display:block; white-space:pre;color:#404040;'> metview: update to 5.7.4
</span>---
science/metview/Portfile | 42 ++++++++++----
science/metview/files/FindAEC.cmake | 39 +++++++++++++
science/metview/files/FindProj4.cmake | 64 ++++++++++++++++++++++
science/metview/files/patch-CMakeLists.txt.diff | 11 ----
.../files/patch-metview-CMakeLists.txt.diff | 6 +-
...-metview-src-Flextra-flexpartTrajectory.cc.diff | 10 ++++
6 files changed, 147 insertions(+), 25 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/metview/Portfile b/science/metview/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d08bcce..3e230c4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/metview/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/metview/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +1,11 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cmake 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup compilers 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup mpi 1.0
</span>
name metview
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 5.2.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 5.7.4
</span> platforms darwin
maintainers {takeshi @tenomoto}
license Apache-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,9 +14,9 @@ description meteorological workstation application
</span> homepage https://confluence.ecmwf.int/display/METV/
master_sites https://confluence.ecmwf.int/download/attachments/3964985/
distname Metview-${version}-Source
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 b2f61c2be7c0b6793071d4f249afeee187301620 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4bcde38088a2c2dca6a2b50dd3e07bfeddc26333fed7b3fe91d38370e2b94636 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6355558
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 006778b6adf255875fa7ef822b747d95b5a0f007 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a0bcaec6e7ce9340d5562437070a092d0367b245b2c3c7707e79024f2adf717c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 44426634
</span> long_description \
Metview is a meteorological workstation application designed to be \
a complete working environment for both the operational and research meteorologist. \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +25,7 @@ long_description \
</span> fetch.ignore_sslcert yes
compilers.choose cxx fc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compilers.setup require_fortran -g95
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+mpi.setup require_fortran -g95
</span> compilers.enforce_fortran \
port:ecCodes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,7 +50,7 @@ depends_lib-append port:boost \
</span> port:netcdf \
port:netcdf-cxx \
port:openjpeg \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:proj4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:proj6 \
</span> port:qt5-qtwebkit \
port:xorg-libice \
port:xorg-libsm \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,20 +63,41 @@ depends_lib-append port:boost \
</span> depends_run bin:ksh:ksh93
require_active_variants \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- magicspp metview
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ magicspp qt5
</span>
cmake.out_of_source yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-metview-CMakeLists.txt.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-metview-src-Flextra-flexpartTrajectory.cc.diff
</span>
configure.args-append \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_BUILD_TYPE=Release \
</span> -DECBUILD_GIT=OFF \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_AEC=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DAEC_PATH=${prefix}/lib/libaec \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_ARMADILLO=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_EIGEN=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_CUDA=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_GRIDTOOLS_STORAGE=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_LAPACK=OFF \
</span> -DENABLE_MARS=OFF \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_MKL=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_MPI=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_MIR_TOOLS=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_MIR_DOWNLOAD_MASKS=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_PNG=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_PROJ=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPROJ4_PATH=${prefix}/lib/proj6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_TEST_ASSERTIONS=OFF \
</span> -DENABLE_TESTS=OFF \
-DMETVIEW_INSTALL_EXE_BIN_DIR=lib/${name}/bin \
-DWITH_PLOTTING=ON \
-DMAGICS_PATH=${prefix} \
-DECCODES_PATH=${prefix}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${filespath}/FindAEC.cmake ${worksrcpath}/eckit/cmake/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${filespath}/FindProj4.cmake ${worksrcpath}/atlas/cmake/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
notes "
Binaries are installed in ${prefix}/lib/${name}/bin.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/metview/files/FindAEC.cmake b/science/metview/files/FindAEC.cmake
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ae1d7ff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/metview/files/FindAEC.cmake
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,39 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# (C) Copyright 2011- ECMWF.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This software is licensed under the terms of the Apache Licence Version 2.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# In applying this licence, ECMWF does not waive the privileges and immunities
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# granted to it by virtue of its status as an intergovernmental organisation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# nor does it submit to any jurisdiction.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# - Try to find AEC (Adaptive Entropy Coding library)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See https://www.dkrz.de/redmine/projects/aec/wiki
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Once done this will define
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# AEC_FOUND - System has AEC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# AEC_INCLUDE_DIRS - The AEC include directories
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# AEC_LIBRARIES - The libraries needed to use AEC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# The following paths will be searched with priority if set in CMake or env
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# AEC_DIR - prefix path of the AEC installation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# AEC_PATH - prefix path of the AEC installation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+find_path( AEC_INCLUDE_DIR szlib.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PATHS ${AEC_DIR} ${AEC_PATH} ENV AEC_DIR ENV AEC_PATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PATH_SUFFIXES include include/aec NO_DEFAULT_PATH )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+find_path( AEC_INCLUDE_DIR szlib.h PATH_SUFFIXES include include/aec )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+find_library( AEC_LIBRARY NAMES aec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PATHS ${AEC_DIR} ${AEC_PATH} ENV AEC_DIR ENV AEC_PATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PATH_SUFFIXES lib lib64 lib/aec lib64/aec NO_DEFAULT_PATH )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+find_library( AEC_LIBRARY NAMES aec PATH_SUFFIXES lib lib64 lib/aec lib64/aec )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set( AEC_LIBRARIES ${AEC_LIBRARY} )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set( AEC_INCLUDE_DIRS ${AEC_INCLUDE_DIR} )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+include(FindPackageHandleStandardArgs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+find_package_handle_standard_args(AEC DEFAULT_MSG AEC_LIBRARY AEC_INCLUDE_DIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+mark_as_advanced(AEC_INCLUDE_DIR AEC_LIBRARY )
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/metview/files/FindProj4.cmake b/science/metview/files/FindProj4.cmake
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..a41abe8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/metview/files/FindProj4.cmake
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,64 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# (C) Copyright 2011- ECMWF.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This software is licensed under the terms of the Apache Licence Version 2.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# In applying this licence, ECMWF does not waive the privileges and immunities
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# granted to it by virtue of its status as an intergovernmental organisation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# nor does it submit to any jurisdiction.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# - Try to find the proj4 library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Once done this will define
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# PROJ4_FOUND - system has proj4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# PROJ4_INCLUDE_DIRS - the proj4 include directory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# PROJ4_LIBRARIES - Link these to use proj4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Define PROJ4_MIN_VERSION for which version desired.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if( NOT PROJ4_PATH )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( NOT "$ENV{PROJ4_PATH}" STREQUAL "" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( PROJ4_PATH "$ENV{PROJ4_PATH}" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elseif ( NOT "$ENV{PROJ4_DIR}" STREQUAL "" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set( PROJ4_PATH "$ENV{PROJ4_DIR}" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if( NOT PROJ4_PATH )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(FindPkgConfig)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(PROJ4_MIN_VERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pkg_check_modules(PKPROJ4 ${_pkgconfig_REQUIRED} QUIET proj4>=${PROJ4_MIN_VERSION})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pkg_check_modules(PKPROJ4 ${_pkgconfig_REQUIRED} QUIET proj4)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( PKG_CONFIG_FOUND AND PKPROJ4_FOUND )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_path(PROJ4_INCLUDE_DIR proj_api.h HINTS ${PKPROJ4_INCLUDEDIR} ${PKPROJ4_INCLUDE_DIRS} PATH_SUFFIXES proj4 NO_DEFAULT_PATH )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_library(PROJ4_LIBRARY proj HINTS ${PKPROJ4_LIBDIR} ${PKPROJ4_LIBRARY_DIRS} PATH_SUFFIXES proj4 NO_DEFAULT_PATH )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if( PROJ4_PATH )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_path(PROJ4_INCLUDE_DIR NAMES proj_api.h PATHS ${PROJ4_PATH} ${PROJ4_PATH}/include PATH_SUFFIXES proj4 NO_DEFAULT_PATH )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_library(PROJ4_LIBRARY NAMES proj PATHS ${PROJ4_PATH} ${PROJ4_PATH}/lib PATH_SUFFIXES proj4 NO_DEFAULT_PATH )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+find_path(PROJ4_INCLUDE_DIR NAMES proj_api.h PATHS PATH_SUFFIXES proj4 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+find_library( PROJ4_LIBRARY NAMES proj PATHS PATH_SUFFIXES proj4 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# handle the QUIETLY and REQUIRED arguments and set GRIBAPI_FOUND
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+include(FindPackageHandleStandardArgs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+find_package_handle_standard_args(Proj4 DEFAULT_MSG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PROJ4_LIBRARY PROJ4_INCLUDE_DIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set( PROJ4_LIBRARIES ${PROJ4_LIBRARY} )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set( PROJ4_INCLUDE_DIRS ${PROJ4_INCLUDE_DIR} )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+mark_as_advanced( PROJ4_INCLUDE_DIR PROJ4_LIBRARY )
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/metview/files/patch-CMakeLists.txt.diff b/science/metview/files/patch-CMakeLists.txt.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 35382cd..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/metview/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2018-10-20 14:57:35.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2018-10-20 14:57:46.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -887,7 +887,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # install the metview.desktop file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/metview.desktop
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- DESTINATION share/applications/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ DESTINATION share/metview/applications/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/metview/files/patch-metview-CMakeLists.txt.diff b/science/metview/files/patch-metview-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 1420426..4f62ac3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/metview/files/patch-metview-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/metview/files/patch-metview-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- metview/CMakeLists.txt.orig 2019-02-15 17:25:07.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ metview/CMakeLists.txt 2019-03-24 11:52:26.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -876,7 +876,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- metview/CMakeLists.txt.orig 2019-12-06 19:40:29.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ metview/CMakeLists.txt 2019-12-07 13:40:53.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -817,7 +817,7 @@
</span>
# install the metview.desktop file
install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/metview.desktop
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/metview/files/patch-metview-src-Flextra-flexpartTrajectory.cc.diff b/science/metview/files/patch-metview-src-Flextra-flexpartTrajectory.cc.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..9984f95
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/metview/files/patch-metview-src-Flextra-flexpartTrajectory.cc.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- metview/src/Flextra/flexpartTrajectory.cc.orig 2019-12-06 19:40:29.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ metview/src/Flextra/flexpartTrajectory.cc 2019-12-07 17:34:14.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14,6 +14,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <map>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <cmath>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <iomanip>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <array>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <assert.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdlib.h>
</span></pre><pre style='margin:0'>
</pre>