diff options
| -rw-r--r-- | system/jq/jq.SlackBuild | 8 | ||||
| -rw-r--r-- | system/jq/jq.info | 6 | ||||
| -rw-r--r-- | system/jq/run_tests_in_C_locale.patch | 15 |
3 files changed, 6 insertions, 23 deletions
diff --git a/system/jq/jq.SlackBuild b/system/jq/jq.SlackBuild index 174989f237..20254e1c71 100644 --- a/system/jq/jq.SlackBuild +++ b/system/jq/jq.SlackBuild @@ -4,6 +4,7 @@ # Copyright 2015, 2018 Gary Herreman <gary@garyrh.com> # Copyright 2024 Isaac Yu <isaacyu@protonmail.com> +# Copyright 2025 Eugene Wissner, Mannheim, Germany # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,8 +27,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=jq -VERSION=${VERSION:-1.7.1} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.8.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -77,9 +78,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# Fix build test failures if LANG is not C or en_US.UTF-8 -patch -p1 < $CWD/run_tests_in_C_locale.patch - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/system/jq/jq.info b/system/jq/jq.info index 9c79b37850..48dae98e34 100644 --- a/system/jq/jq.info +++ b/system/jq/jq.info @@ -1,8 +1,8 @@ PRGNAM="jq" -VERSION="1.7.1" +VERSION="1.8.0" HOMEPAGE="https://jqlang.github.io/jq/" -DOWNLOAD="https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-1.7.1.tar.gz" -MD5SUM="974a340105ecb43add8c55601525f9fc" +DOWNLOAD="https://github.com/jqlang/jq/releases/download/jq-1.8.0/jq-1.8.0.tar.gz" +MD5SUM="46856841b9fd765b852023b881cd2e8b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/jq/run_tests_in_C_locale.patch b/system/jq/run_tests_in_C_locale.patch deleted file mode 100644 index 5d1d36b0b1..0000000000 --- a/system/jq/run_tests_in_C_locale.patch +++ /dev/null @@ -1,15 +0,0 @@ -The following patch is taken from this pull request: -https://github.com/jqlang/jq/pull/3039 ---- a/tests/setup -+++ b/tests/setup -@@ -12,6 +12,10 @@ - JQBASEDIR=$JQTESTDIR/.. - JQ=${JQ:-$JQBASEDIR/jq} - -+# Some tests have locale-dependent output; use C locale. Fixes #3038 -+LC_ALL=C -+export LC_ALL -+ - if [ -z "${NO_VALGRIND-}" ] && which valgrind > /dev/null; then - VALGRIND="valgrind --error-exitcode=1 --leak-check=full \ - --suppressions=$JQTESTDIR/onig.supp \ |