summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Newgard2017-09-21 11:28:29 -0500
committerDoug Newgard2017-09-21 11:28:29 -0500
commita866c707bef76479d4e134eeaf8fb700cfc6d9d4 (patch)
treeb1cf2b71bbb95daf9d684f00e5fac02f79480eb0
parenta06b3065ffd96d6bf73d24706e9d898dee5ca61d (diff)
downloadaur-a866c707bef76479d4e134eeaf8fb700cfc6d9d4.tar.gz
Upstream update to 7.2.2
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD11
2 files changed, 6 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0b8bff344ed9..134916b66d74 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = grass
pkgdesc = Geospatial data management and analysis, image processing, graphics/maps production, spatial modeling and visualization
- pkgver = 7.2.1
+ pkgver = 7.2.2
pkgrel = 1
url = http://grass.osgeo.org/
arch = i686
@@ -29,10 +29,8 @@ pkgbase = grass
depends = zlib
optdepends = postgresql: PostgreSQL database interface
optdepends = sqlite: SQLite database interface
- source = http://grass.osgeo.org/grass72/source/grass-7.2.1.tar.gz
- source = changeset_71219.diff::https://trac.osgeo.org/grass/changeset/71219?format=diff&new=71219
- md5sums = 5c858c718d40a4f3e82741e60c9f7b97
- md5sums = 107f39c90d40f566edff5095cc1264a1
+ source = http://grass.osgeo.org/grass72/source/grass-7.2.2.tar.gz
+ md5sums = 4a908a63bb9b7af34fee9569316c0fb6
pkgname = grass
diff --git a/PKGBUILD b/PKGBUILD
index 5bc36a00e9ea..174b6cc9e418 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: Maciej Sieczka <msieczka at sieczka dot org>
pkgname=grass
-pkgver=7.2.1
+pkgver=7.2.2
pkgrel=1
_shortver=${pkgver%.*}; _shortver=${_shortver/./}
pkgdesc='Geospatial data management and analysis, image processing, graphics/maps production, spatial modeling and visualization'
@@ -15,17 +15,12 @@ depends=('cairo' 'fftw' 'fontconfig' 'freetype2' 'gcc-libs' 'gdal' 'geos' 'glibc
makedepends=('libxt')
optdepends=('postgresql: PostgreSQL database interface'
'sqlite: SQLite database interface')
-source=("http://grass.osgeo.org/grass$_shortver/source/$pkgname-$pkgver.tar.gz"
- "changeset_71219.diff::https://trac.osgeo.org/grass/changeset/71219?format=diff&new=71219")
-md5sums=('5c858c718d40a4f3e82741e60c9f7b97'
- '107f39c90d40f566edff5095cc1264a1')
+source=("http://grass.osgeo.org/grass$_shortver/source/$pkgname-$pkgver.tar.gz")
+md5sums=('4a908a63bb9b7af34fee9569316c0fb6')
prepare() {
cd $pkgname-$pkgver
- # GCC7 patch
- patch -Np4 -i ../changeset_71219.diff
-
# Change everything to use python2
sed -i 's/\(env \|\/usr\/bin\/\)python$/&2/' $(find . -iname "*.py")
sed -i '/os\.environ.*GRASS_PYTHON/ s/"python"/"python2"/' lib/init/grass.py