summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorholishing2020-05-29 03:00:07 +0800
committerholishing2020-05-29 03:00:07 +0800
commit4624df2424a2ad5fd7a6aca83d1687a599164db7 (patch)
treed48e3421fb0e95167d43ed0a98c534a55e794a4b
parentcac8e8dee1a0b071051026a7b635bfbad16b94e6 (diff)
downloadaur-4624df2424a2ad5fd7a6aca83d1687a599164db7.tar.gz
fix build for gcc-10
Applying patch from upstream master: https://github.com/GenericMappingTools/gmt/pull/2510 Related issue discussion: https://github.com/GenericMappingTools/gmt/issues/2493
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD9
2 files changed, 10 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index eb0e9dc12c57..466ae01684ff 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = gmt6
pkgdesc = Generic Mapping Tools: Tools for manipulating and plotting geographic and Cartesian data
pkgver = 6.0.0
- pkgrel = 3
+ pkgrel = 4
url = https://www.generic-mapping-tools.org
install = gmt.install
arch = x86_64
@@ -17,7 +17,9 @@ pkgbase = gmt6
conflicts = gmt4
conflicts = gmt
source = https://github.com/GenericMappingTools/gmt/releases/download/6.0.0/gmt-6.0.0-src.tar.xz
- sha256sums = 8b91af18775a90968cdf369b659c289ded5b6cb2719c8c58294499ba2799b650
+ source = https://github.com/GenericMappingTools/gmt/commit/2e159324ecfa38093c72119f62e9edb72f6f7424.patch
+ sha512sums = 9719c8e3206a1c2b8ed05816e728549099c73673ae0c03fb3fbbb984bc7e0b20154ac93f6a74ed8e442d07636aba517818520cec41d4ffab1859e8fdb3435db2
+ sha512sums = 0ac53589b116a55b84879d3e6f7c6f119b3bee616e909c6ca01c8d20a7ed3015cda0b14444aa1c2679b2e9fa686250629768e32c76553c4d919a98c92ff2ea7c
pkgname = gmt6
diff --git a/PKGBUILD b/PKGBUILD
index a38c9c986002..781fd551f68b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=gmt6
_pkgname=gmt
pkgver=6.0.0
-pkgrel=3
+pkgrel=4
pkgdesc="Generic Mapping Tools: Tools for manipulating and plotting geographic and Cartesian data"
arch=(x86_64)
url="https://www.generic-mapping-tools.org"
@@ -22,11 +22,14 @@ install='gmt.install'
#source=("ftp://ftp.star.nesdis.noaa.gov/pub/sod/lsa/gmt/${_pkgname}-${pkgver}-src.tar.xz")
#source=("ftp://ftp.iris.washington.edu/pub/gmt/${_pkgname}-${pkgver}-src.tar.xz")
#source=("ftp://ftp.iag.usp.br/pub/gmt/${_pkgname}-${pkgver}-src.tar.xz")
-source=("https://github.com/GenericMappingTools/gmt/releases/download/${pkgver}/${_pkgname}-${pkgver}-src.tar.xz")
-sha256sums=('8b91af18775a90968cdf369b659c289ded5b6cb2719c8c58294499ba2799b650')
+source=("https://github.com/GenericMappingTools/gmt/releases/download/${pkgver}/${_pkgname}-${pkgver}-src.tar.xz"
+ "https://github.com/GenericMappingTools/gmt/commit/2e159324ecfa38093c72119f62e9edb72f6f7424.patch")
+sha512sums=('9719c8e3206a1c2b8ed05816e728549099c73673ae0c03fb3fbbb984bc7e0b20154ac93f6a74ed8e442d07636aba517818520cec41d4ffab1859e8fdb3435db2'
+ '0ac53589b116a55b84879d3e6f7c6f119b3bee616e909c6ca01c8d20a7ed3015cda0b14444aa1c2679b2e9fa686250629768e32c76553c4d919a98c92ff2ea7c')
prepare() {
cd "${srcdir}/${_pkgname}-${pkgver}"
+ patch --forward --strip=1 --input="${srcdir}/2e159324ecfa38093c72119f62e9edb72f6f7424.patch"
rm -fr build && mkdir build
}