diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-03-05 09:25:57 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-03-05 09:25:57 +0000 |
| commit | 6d691ad5b6239929063441bbd14c489e92e7396e (patch) | |
| tree | e294f87b1ce66397fee1273bd6c7131aeb586f51 /sci-geosciences/gmt | |
| parent | d99093fb4bb5652015c06274d64083daa2439e4f (diff) | |
gentoo resync : 05.03.2021
Diffstat (limited to 'sci-geosciences/gmt')
| -rw-r--r-- | sci-geosciences/gmt/Manifest | 3 | ||||
| -rw-r--r-- | sci-geosciences/gmt/files/gmt-5.4.4-sighandler.patch | 14 | ||||
| -rw-r--r-- | sci-geosciences/gmt/gmt-5.4.4.ebuild | 7 |
3 files changed, 22 insertions, 2 deletions
diff --git a/sci-geosciences/gmt/Manifest b/sci-geosciences/gmt/Manifest index 5536c6e33199..c64b2f2d4951 100644 --- a/sci-geosciences/gmt/Manifest +++ b/sci-geosciences/gmt/Manifest @@ -1,8 +1,9 @@ AUX gmt-4.5.6-respect-ldflags.patch 2396 BLAKE2B 66d15afd6a6cbc7f4fbd16d34bfc8b3e02df56c1c3a72b55732bf2694b9699cb6059522d3648f8651af331a92a87d158ecdb43ff758cf3208d04531b0dd0e89d SHA512 c2cc4986a1211a75856391cd0c731f37d9cf8e2ad28fdf29f532ed03308f2ef7f309a0bc525bb08c976c4535e8cbe77789546eb8585ddcedf016af32769e5420 AUX gmt-4.5.9-no-strip.patch 1246 BLAKE2B f834f1b514a2ce59a56f52290b54ef80ec1580d88facfb77f2af6aa4472609638d627ff5a10a2b692a8b3357adb12cfde0f9587f0529e5c257c9c56037be946d SHA512 271be4c32607bd4776cace933ed0a81a76fb5ea8ccc0c92f0f11cdf17f6b4f8740e2345323236af94dd4eb52323625cc82e5c661e22a008dcdc85f4d1d452b23 +AUX gmt-5.4.4-sighandler.patch 573 BLAKE2B 1df9b28c9a23c929c86af060845a1e5346f366e4469656c0cc405c2979819870734666c5c777a725a04b2508dd85d84cbccce6ca8000ddd0b1e32f755038e17d SHA512 3e5b26234ecaef39658ef1e82f90b5ffd86ff5fd0a91eda829c92fd11a886e1c4106f0a578b5bd223e3ae9b75dec0c44022112197bed69fae09cd534f7e535a8 DIST gmt-4.5.18-non-gpl-src.tar.bz2 103378 BLAKE2B 3a52b547940f3e79a6dd8076b8279310e90b3f7a01a5b9e68186fc3d1711af4f5730fa20a8a04bdc57a8e06f9a656c8db71c5bc2b8d42292cb7434ad07880732 SHA512 57281e78cd40b168cfd49818a25523c1d1b44a8c4cab59aa5683052f14df25016b70485f79327bac37f5dd8b7c77d01a2264fe08045b7c13c3e1bd216323e50e DIST gmt-4.5.18-src.tar.bz2 39791396 BLAKE2B 2199c337707773f91c3372992821f35a4e2d0f7451881507d29798425d914e82cc8d038fee43e6a44bbc18190619134906424f4d5ca3261af69d43934661fd90 SHA512 6d28ac29049c480d22063bbbcdb0cacf2c620e817eda19435e9b1bc0a899acf062296530f1fc677c77472fafaa6b1e6c443aaf8def7505847ed4afdd5c972945 DIST gmt-5.4.4-src.tar.xz 105073748 BLAKE2B bd083eeb1a71c5a2e554edadb7d8b9160f9b6d8e7510358b55d31b5f147d6719dbe8ce75510ffd844e74b787b7a6a6498fe5dfdd40755c7e6a28c018c024139b SHA512 cd22f65e7efc1704b06a5e94523af6a3b949dfe9339875abf805f1d00db6533d963ea61afc69d443e21b8070608e2043d712ffad74d1228c758f549f1ac46c22 EBUILD gmt-4.5.18-r1.ebuild 1967 BLAKE2B 7a19509a881a2e0dd91170846e1cb7b30ade83cfacf73e6afc0f02dfd361eaf0bf1348fd9c04a0020f7627fb8a3faa65064450b25e80ad14b2e264c3f25f87a9 SHA512 365ecb57d47a055b2a823483399bfeb52071cf60895f08dcd960fda354a4e225557a22f9f6acae882c8326f0625f166468c6e3d55e6398a4849e9ef3547a64b9 -EBUILD gmt-5.4.4.ebuild 2940 BLAKE2B 5f778aa40c91b1317203198c25ad40f5dcbe887bb93a84a10fa3406cd9d68f69edfc282b3fe982fc926722f5be4cea102e9cd7d10dcb7cdb30673fc7caec1b0b SHA512 db057f08220c4a4ca7d4402c3f18403574ccc4e6607d6b2692d2e952dda74be36a131f813d9d470639e1c0624025dfb2563085c00dd1d57bf68d6d534150290d +EBUILD gmt-5.4.4.ebuild 3084 BLAKE2B 7657cc66b852db05b70bddb77abf6a064defc4e433236deee6ff225388b752f243ecab9ca625e886bc783540a8b29c17b7105d82039f9994b78969554db17ff0 SHA512 7dd86ba2c92fd552ed0096b0dc290f12d2df319882ffe5fd2b6a2ca57e4bca0266d9cda7dd2bd62fe9d07e0372bdd614c8f6dcb82c66c5f8a76066c00a774859 MISC metadata.xml 918 BLAKE2B d3c35d50145d54df689dba5e34f4feaf6a45a202b99f271b467b9d6faecf630e1136ceb0c46076fe4023b6b8913567c8463ff7fb1d0227d4314ab5b784c62c65 SHA512 47680e3a33b2460205a41ad12da27770803d81d42e85ade54250d75eceb9ec797334ebfd5af6b620bbd99a1ee63b3106ce75c5c101b6abf29e1dfa05c8ded048 diff --git a/sci-geosciences/gmt/files/gmt-5.4.4-sighandler.patch b/sci-geosciences/gmt/files/gmt-5.4.4-sighandler.patch new file mode 100644 index 000000000000..54aecb3c0d55 --- /dev/null +++ b/sci-geosciences/gmt/files/gmt-5.4.4-sighandler.patch @@ -0,0 +1,14 @@ +https://bugs.gentoo.org/738224 +Author: hangglider@gmx.de +--- a/src/common_sighandler.c ++++ b/src/common_sighandler.c +@@ -187,7 +187,7 @@ + return; + } + else { +- fprintf (stderr, "ERROR: Caught signal number %d (%s) at\n", sig_num, sys_siglist[sig_num]); ++ fprintf (stderr, "ERROR: Caught signal number %d (%s) at\n", sig_num, strsignal(sig_num)); + backtrace_symbols_fd (array, 2, STDERR_FILENO); /* print function with faulting instruction */ + size = backtrace (array, 50); /* get void*'s for all entries on the stack */ + fprintf (stderr, "Stack backtrace:\n"); + diff --git a/sci-geosciences/gmt/gmt-5.4.4.ebuild b/sci-geosciences/gmt/gmt-5.4.4.ebuild index 31d9c0f51243..2b891c81bc2f 100644 --- a/sci-geosciences/gmt/gmt-5.4.4.ebuild +++ b/sci-geosciences/gmt/gmt-5.4.4.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit bash-completion-r1 cmake +inherit bash-completion-r1 cmake flag-o-matic DESCRIPTION="Powerful map generator" HOMEPAGE="https://gmt.soest.hawaii.edu/" @@ -33,6 +33,8 @@ RDEPEND="${DEPEND} sci-geosciences/gshhg-gmt " +PATCHES=( "${FILESDIR}"/${P}-sighandler.patch ) + src_prepare() { cmake_src_prepare # Rename man pages to avoid a name conflict with gmt4 @@ -57,6 +59,9 @@ src_prepare() { } src_configure() { + # https://bugs.gentoo.org/710088 + # drop on version bump + append-cflags -fcommon local mycmakeargs=( -DGMT_DATADIR="share/${P}" -DGMT_DOCDIR="share/doc/${PF}" |