summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKohei Suzuki2019-06-19 01:32:24 +0900
committerKohei Suzuki2019-06-19 01:32:24 +0900
commit76798fd7b0affc45b0a257b64a529ab7cde27ef6 (patch)
tree3c808543209a0a1295156570b895269cc70f7c0d
parentd58fb621cf65a9a3934e83de3898bd90503b3338 (diff)
downloadaur-76798fd7b0affc45b0a257b64a529ab7cde27ef6.tar.gz
Update jsonnet to v0.13.0
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD18
-rw-r--r--fix-test-failure.patch8
3 files changed, 27 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1bdbda07f25..5e767f93f9d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,16 @@
pkgbase = jsonnet
pkgdesc = The data templating language
- pkgver = 0.12.1
+ pkgver = 0.13.0
pkgrel = 1
- url = http://jsonnet.org/
+ url = https://jsonnet.org/
arch = x86_64
license = Apache
checkdepends = python2
depends = gcc-libs
- source = https://github.com/google/jsonnet/archive/v0.12.1.tar.gz
- sha512sums = 25523dd19b4209a5ca39275ab3d3726b934442dd83a965ab0b79f0c67bd8ae85c438b2a63990b8eec921b137f908f946696be331b08cef92f15b6b8fa548cb0d
+ source = https://github.com/google/jsonnet/archive/v0.13.0.tar.gz
+ source = fix-test-failure.patch
+ sha512sums = d19e5398763e37b79b0ef02368f6bd6215d2df234b5ff7a6d98e2306a0d47290600061c9f868c0c262570b4f0ee9eee6c309bcc93937b12f6c14f8d12339a7d5
+ sha512sums = 905e95ae51c66e65ddc8761cf4c029c0912e61f4c19297e4b3d5da4df4c7c9d2fd365ea6b24bd6335a0fbe92e8252d8b1cf13155f19ee7b62faa502d92fb9771
pkgname = jsonnet
diff --git a/PKGBUILD b/PKGBUILD
index e8906145541..2f803c54ecd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,24 @@
# Maintainer: Kohei Suzuki <eagletmt@gmail.com>
pkgname=jsonnet
-pkgver=0.12.1
+pkgver=0.13.0
pkgrel=1
pkgdesc='The data templating language'
arch=('x86_64')
-url='http://jsonnet.org/'
+url='https://jsonnet.org/'
license=('Apache')
depends=('gcc-libs')
checkdepends=('python2')
-source=("https://github.com/google/${pkgname}/archive/v${pkgver}.tar.gz")
+source=("https://github.com/google/${pkgname}/archive/v${pkgver}.tar.gz"
+ "fix-test-failure.patch")
+
+prepare() {
+ cd "$pkgname-$pkgver"
+ patch -Np1 -i "$srcdir/fix-test-failure.patch"
+}
build() {
cd "$pkgname-$pkgver"
- CFLAGS="$CFLAGS -fPIC -Iinclude" CXXFLAGS="$CXXFLAGS -fPIC -Iinclude -Ithird_party/md5 -Ithird_party/json" make jsonnet libjsonnet.so libjsonnet++.so
+ CFLAGS="$CFLAGS -fPIC -Iinclude" CXXFLAGS="$CXXFLAGS -fPIC -Iinclude -Ithird_party/md5 -Ithird_party/json" make jsonnet jsonnetfmt libjsonnet.so libjsonnet++.so
}
check() {
@@ -29,9 +35,11 @@ package() {
install -m755 libjsonnet.so "$pkgdir/usr/lib/libjsonnet.so"
install -m755 libjsonnet++.so "$pkgdir/usr/lib/libjsonnet++.so"
install -m644 include/libjsonnet.h "$pkgdir/usr/include/libjsonnet.h"
+ install -m644 include/libjsonnet_fmt.h "$pkgdir/usr/include/libjsonnet_fmt.h"
install -m644 include/libjsonnet++.h "$pkgdir/usr/include/libjsonnet++.h"
}
# vim: set ft=sh:
-sha512sums=('25523dd19b4209a5ca39275ab3d3726b934442dd83a965ab0b79f0c67bd8ae85c438b2a63990b8eec921b137f908f946696be331b08cef92f15b6b8fa548cb0d')
+sha512sums=('d19e5398763e37b79b0ef02368f6bd6215d2df234b5ff7a6d98e2306a0d47290600061c9f868c0c262570b4f0ee9eee6c309bcc93937b12f6c14f8d12339a7d5'
+ '905e95ae51c66e65ddc8761cf4c029c0912e61f4c19297e4b3d5da4df4c7c9d2fd365ea6b24bd6335a0fbe92e8252d8b1cf13155f19ee7b62faa502d92fb9771')
diff --git a/fix-test-failure.patch b/fix-test-failure.patch
new file mode 100644
index 00000000000..f63a246fd88
--- /dev/null
+++ b/fix-test-failure.patch
@@ -0,0 +1,8 @@
+diff --git a/test_suite/error.import_folder.jsonnet.golden_regex b/test_suite/error.import_folder.jsonnet.golden_regex
+index bc468fb..c472b23 100644
+--- a/test_suite/error.import_folder.jsonnet.golden_regex
++++ b/test_suite/error.import_folder.jsonnet.golden_regex
+@@ -1,2 +1,2 @@
+-(STATIC ERROR: lib:1:1: unexpected end of file.|RUNTIME ERROR: couldn't open import "lib": basic_filebuf::underflow error reading the file(: iostream error)?
++(STATIC ERROR: lib:1:1: unexpected end of file.|RUNTIME ERROR: couldn't open import "lib": basic_filebuf::underflow error reading the file(: iostream error|: Is a directory)?
+ error.import_folder.jsonnet:17:1-13 )