Skip to content

Instantly share code, notes, and snippets.

Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save holishing/3b0d92007ed9c8f490545563cbc397b4 to your computer and use it in GitHub Desktop.
Save holishing/3b0d92007ed9c8f490545563cbc397b4 to your computer and use it in GitHub Desktop.
Recommend patches for gmt AUR packages
From bd70876f70133b5c9dad50299009c65ab9d9213c Mon Sep 17 00:00:00 2001
From: holishing <holishingtest@gmail.com>
Date: Mon, 4 Nov 2019 07:20:29 +0800
Subject: [PATCH 1/3] add 'python-sphinx' and 'ghostscript' to makedepends
makedepends for documents of gmt
---
.SRCINFO | 7 +++----
PKGBUILD | 7 ++-----
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/.SRCINFO b/.SRCINFO
index f07d06d..33d6e04 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,18 @@
pkgbase = gmt
pkgdesc = Generic Mapping Tools: Collection of tools for manipulating geographic and Cartesian data sets, and generating EPS maps.
pkgver = 6.0.0
- pkgrel = 1
+ pkgrel = 2
url = http://gmt.soest.hawaii.edu/
install = gmt.install
arch = i686
arch = x86_64
license = LGPL
makedepends = cmake
+ makedepends = ghostscript
+ makedepends = python-sphinx
depends = gdal
depends = fftw
depends = lapack
- optdepends = ghostscript
- optdepends = python-sphinx
- optdepends = python2-sphinx
optdepends = gmt-coast: coastlines
optdepends = gmt-dcw: digital chart of the world polygon map
conflicts = gmt4
diff --git a/PKGBUILD b/PKGBUILD
index 94072f4..e3bc277 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,17 +3,14 @@
pkgname=gmt
pkgver=6.0.0
-pkgrel=1
+pkgrel=2
pkgdesc="Generic Mapping Tools: Collection of tools for manipulating geographic and Cartesian data sets, and generating EPS maps."
arch=(i686 x86_64)
url="http://gmt.soest.hawaii.edu/"
license=('LGPL')
-makedepends=('cmake')
+makedepends=('cmake' 'ghostscript' 'python-sphinx')
depends=('gdal' 'fftw' 'lapack')
optdepends=(
- 'ghostscript'
- 'python-sphinx'
- 'python2-sphinx'
'gmt-coast: coastlines'
'gmt-dcw: digital chart of the world polygon map')
conflicts=('gmt4')
--
2.24.0
From cd764dd5fc23b9300236f6bdaa46956f62817219 Mon Sep 17 00:00:00 2001
From: holishing <holishingtest@gmail.com>
Date: Mon, 4 Nov 2019 07:28:00 +0800
Subject: [PATCH 2/3] change checksums to sha256 for more security
---
.SRCINFO | 2 +-
PKGBUILD | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.SRCINFO b/.SRCINFO
index 33d6e04..7cdd7c0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -17,7 +17,7 @@ pkgbase = gmt
optdepends = gmt-dcw: digital chart of the world polygon map
conflicts = gmt4
source = https://mirrors.ustc.edu.cn/gmt/gmt-6.0.0-src.tar.xz
- md5sums = 2721f3bd7f39eb7c8ea261f644c5c36e
+ sha256sums = 8b91af18775a90968cdf369b659c289ded5b6cb2719c8c58294499ba2799b650
pkgname = gmt
diff --git a/PKGBUILD b/PKGBUILD
index e3bc277..ea7c201 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,7 +20,7 @@ install='gmt.install'
#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://mirrors.ustc.edu.cn/gmt/${pkgname}-${pkgver}-src.tar.xz")
-md5sums=('2721f3bd7f39eb7c8ea261f644c5c36e')
+sha256sums=('8b91af18775a90968cdf369b659c289ded5b6cb2719c8c58294499ba2799b650')
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
--
2.24.0
From 1ac82b2ca90172b42361bb7a14105cc0e9eb390d Mon Sep 17 00:00:00 2001
From: holishing <holishingtest@gmail.com>
Date: Fri, 15 Nov 2019 23:13:41 +0800
Subject: [PATCH 3/3] update desciption of package
follow suggestions of one of maintainers in GMT project:
https://github.com/GenericMappingTools/gmt/issues/2056
---
PKGBUILD | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/PKGBUILD b/PKGBUILD
index ea7c201..88ae67c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,9 +4,9 @@
pkgname=gmt
pkgver=6.0.0
pkgrel=2
-pkgdesc="Generic Mapping Tools: Collection of tools for manipulating geographic and Cartesian data sets, and generating EPS maps."
+pkgdesc="Generic Mapping Tools: Tools for manipulating and plotting geographic and Cartesian data"
arch=(i686 x86_64)
-url="http://gmt.soest.hawaii.edu/"
+url="https://www.generic-mapping-tools.org"
license=('LGPL')
makedepends=('cmake' 'ghostscript' 'python-sphinx')
depends=('gdal' 'fftw' 'lapack')
--
2.24.0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment