diff --git a/app-misc/jq/jq-1.5.recipe b/app-misc/jq/jq-1.6.recipe similarity index 87% rename from app-misc/jq/jq-1.5.recipe rename to app-misc/jq/jq-1.6.recipe index fdd5f5efc..6d07c001b 100644 --- a/app-misc/jq/jq-1.5.recipe +++ b/app-misc/jq/jq-1.6.recipe @@ -10,11 +10,10 @@ is often shorter and simpler than you’d expect." HOMEPAGE="http://stedolan.github.io/jq/" COPYRIGHT="2012,2015 Stephen Dolan" LICENSE="MIT" -REVISION="2" +REVISION="1" SOURCE_URI="http://github.com/stedolan/jq/archive/jq-$portVersion.tar.gz" -CHECKSUM_SHA256="d5667641d28c27d0c1e70de83e7f9bd8b2fed7fbf6a1d68731177d400a533c65" +CHECKSUM_SHA256="158182b85f3be9e23ab1dc50cfcc24e415aade2a0b8a5d9f709e0b587666d61b" SOURCE_DIR="jq-jq-$portVersion" -PATCHES="jq-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" @@ -31,10 +30,12 @@ PROVIDES=" " REQUIRES=" haiku${secondaryArchSuffix} + lib:libonig$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel + devel:libonig$secondaryArchSuffix >= 5 " BUILD_PREREQUIRES=" cmd:aclocal @@ -48,7 +49,7 @@ BUILD_PREREQUIRES=" BUILD() { - touch lexer.c parser.c + touch src/lexer.c src/parser.c autoreconf -fi runConfigure ./configure make $jobArgs diff --git a/app-misc/jq/patches/jq-1.5.patchset b/app-misc/jq/patches/jq-1.5.patchset deleted file mode 100644 index 946cf7447..000000000 --- a/app-misc/jq/patches/jq-1.5.patchset +++ /dev/null @@ -1,30 +0,0 @@ -From 8a875469af492f48a99988cb0740570ce0d616cf Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Thu, 10 Nov 2016 19:00:47 +0000 -Subject: Haiku patch - - -diff --git a/builtin.c b/builtin.c -index 52f469d..3d08bff 100644 ---- a/builtin.c -+++ b/builtin.c -@@ -907,14 +907,14 @@ static jv f_error(jq_state *jq, jv input, jv msg) { - - // FIXME Should autoconf check for this! - #ifndef WIN32 --extern const char **environ; -+extern char **environ; - #endif - - static jv f_env(jq_state *jq, jv input) { - jv_free(input); - jv env = jv_object(); - const char *var, *val; -- for (const char **e = environ; *e != NULL; e++) { -+ for (char **e = environ; *e != NULL; e++) { - var = e[0]; - val = strchr(e[0], '='); - if (val == NULL) --- -2.2.2 -