diff options
| author | Adam J. Stewart <ajstewart426@gmail.com> | 2020-07-05 21:06:05 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-05 21:06:05 -0500 |
| commit | 466f7fd9966ae47c6f5fd64a5fe63f001aac3cb0 (patch) | |
| tree | 05e207040b9594dd9c7f8626a936c2d3b281033f /var | |
| parent | 58cfe4e078227da6b442b71b2024934fdf0c428c (diff) | |
| download | spack-466f7fd9966ae47c6f5fd64a5fe63f001aac3cb0.tar.gz spack-466f7fd9966ae47c6f5fd64a5fe63f001aac3cb0.tar.bz2 spack-466f7fd9966ae47c6f5fd64a5fe63f001aac3cb0.tar.xz spack-466f7fd9966ae47c6f5fd64a5fe63f001aac3cb0.zip | |
GMT: add v6.1.0 (#17384)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/gmt/package.py | 7 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/gmt/regexp.patch | 11 |
2 files changed, 16 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/gmt/package.py b/var/spack/repos/builtin/packages/gmt/package.py index 003c0d24be..02400cb66e 100644 --- a/var/spack/repos/builtin/packages/gmt/package.py +++ b/var/spack/repos/builtin/packages/gmt/package.py @@ -15,12 +15,13 @@ class Gmt(Package): """ homepage = "https://www.generic-mapping-tools.org/" - url = "https://github.com/GenericMappingTools/gmt/archive/6.0.0.tar.gz" + url = "https://github.com/GenericMappingTools/gmt/archive/6.1.0.tar.gz" git = "https://github.com/GenericMappingTools/gmt.git" maintainers = ['adamjstewart'] version('master', branch='master') + version('6.1.0', sha256='f76ad7f444d407dfd7e5762644eec3a719c6aeb06d877bf746fe51abd79b1a9e') version('6.0.0', sha256='7a733e670f01d99f8fc0da51a4337320d764c06a68746621f83ccf2e3453bcb7') version('5.4.4', sha256='b593dfb101e6507c467619f3d2190a9f78b09d49fe2c27799750b8c4c0cd2da0') version('4.5.9', sha256='9b13be96ccf4bbd38c14359c05dfa7eeeb4b5f06d6f4be9c33d6c3ea276afc86', @@ -41,7 +42,7 @@ class Gmt(Package): # https://github.com/GenericMappingTools/gmt/blob/master/MAINTENANCE.md # Required dependencies - depends_on('cmake@2.8.7:', type='build', when='@5:') + depends_on('cmake@2.8.12:', type='build', when='@5:') depends_on('netcdf-c@4:') depends_on('curl', when='@5.4:') @@ -59,6 +60,8 @@ class Gmt(Package): depends_on('graphicsmagick', type='test') + # https://github.com/GenericMappingTools/gmt/pull/3603 + patch('regexp.patch', when='@6.1.0') patch('type.patch', when='@4.5.9') @when('@5:') diff --git a/var/spack/repos/builtin/packages/gmt/regexp.patch b/var/spack/repos/builtin/packages/gmt/regexp.patch new file mode 100644 index 0000000000..00011591a9 --- /dev/null +++ b/var/spack/repos/builtin/packages/gmt/regexp.patch @@ -0,0 +1,11 @@ +--- a/src/gmt_regexp.c 2020-07-04 15:13:40.000000000 -0500 ++++ b/src/gmt_regexp.c 2020-07-05 18:35:02.000000000 -0500 +@@ -217,7 +217,7 @@ + /* this is when errors have been encountered */ + regerror(status, &re, err_msg, MAX_ERR_LENGTH); + GMT_Report (GMT->parent, GMT_MSG_ERROR, "gmtlib_regexp_match: POSIX ERE matching error: %s\n", err_msg); /* Report error. */ +- return (-GMT_RUNTIME_ERROR;) ++ return (-GMT_RUNTIME_ERROR); + } + return (0); /* No match */ + |