summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD14
-rw-r--r--inputencoding.patch24
3 files changed, 7 insertions, 36 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d5137ea86830..c156c9fb2138 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = gri-git
pkgdesc = A script-based language for scientific graphics programming
- pkgver = 2.12.26
+ pkgver = 2.12.23.r20.gd9969d1
pkgrel = 1
url = http://gri.sourceforge.net/
arch = i686
@@ -14,11 +14,8 @@ pkgbase = gri-git
depends = perl
provides = gri
conflicts = gri
- options = !makeflags
source = git+https://github.com/dankelley/gri.git
- source = inputencoding.patch
sha256sums = SKIP
- sha256sums = b16d82db8958336fe0839c2aef30fd6fb8c75ea217c30e9ce64e06697b867abd
pkgname = gri-git
diff --git a/PKGBUILD b/PKGBUILD
index 4c4ef20e7740..542b5a2baa6c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: big_gie nbigaouette . at . gmail.com
pkgname=gri-git
-pkgver=2.12.26
+pkgver=2.12.23.r20.gd9969d1
pkgrel=1
pkgdesc="A script-based language for scientific graphics programming"
arch=('i686' 'x86_64')
@@ -13,16 +13,14 @@ depends=('perl')
conflicts=('gri')
provides=('gri')
makedepends=('git' 'ghostscript' 'imagemagick' 'texlive-core' 'perl-perl4-corelibs')
-source=("git+https://github.com/dankelley/gri.git" inputencoding.patch)
-sha256sums=('SKIP'
- 'b16d82db8958336fe0839c2aef30fd6fb8c75ea217c30e9ce64e06697b867abd')
-options=('!makeflags')
+source=("git+https://github.com/dankelley/gri.git")
+sha256sums=('SKIP')
-prepare() {
+pkgver() {
cd ${pkgname%-git}
- git apply "$srcdir"/inputencoding.patch
+ git describe --tags | sed 's+-+.r+' | tr - . | cut -c2-
}
-
+
build() {
cd ${pkgname%-git}
aclocal
diff --git a/inputencoding.patch b/inputencoding.patch
deleted file mode 100644
index 946e9a9432a9..000000000000
--- a/inputencoding.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/doc/gri.texi b/doc/gri.texi
-index 657b02c..3d8df74 100644
---- a/doc/gri.texi
-+++ b/doc/gri.texi
-@@ -19277,7 +19277,7 @@ Cody Kirkpatrick,
- Thomas Larsen,
- @cindex Thomas Larsen (contributor)
- @cindex contributor, Thomas Larsen
--Alejandro López-Valencia,
-+Alejandro Lopez-Valencia,
- @cindex Alejandro Lopez-Valencia (contributor)
- @cindex contributor, Alejandro Lopez-Valencia
- Kawamura Masao,
-diff --git a/doc/version.texi b/doc/version.texi
-index d33a646..7bd77d5 100644
---- a/doc/version.texi
-+++ b/doc/version.texi
-@@ -1,4 +1,4 @@
--@set UPDATED 31 January 2017
--@set UPDATED-MONTH January 2017
-+@set UPDATED 17 November 2019
-+@set UPDATED-MONTH November 2019
- @set EDITION 2.12.26
- @set VERSION 2.12.26