summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2025-07-11 21:38:02 +0100
committerMichael Williamson <mike@zwobble.org>2025-07-11 21:41:42 +0100
commitc8e0bf9df6556837c542ff7d773ca9ae8b2401e7 (patch)
tree1cd7a73c4a5baf8dd15183c5b477f0d746b44cb0
parentb9930d429bc0efc01f3c85db5b1f8a1d4b24662a (diff)
Update to jq 1.8.1
-rw-r--r--CHANGELOG.rst5
-rw-r--r--deps/jq-1.8.0-Makefile.patch24
-rw-r--r--deps/jq-1.8.0.tar.gzbin1908285 -> 0 bytes
-rw-r--r--deps/jq-1.8.1.tar.gzbin0 -> 2026798 bytes
-rw-r--r--setup.py5
5 files changed, 7 insertions, 27 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index e08367d..5394761 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,11 @@
Changelog
=========
+1.10.0
+------
+
+* Update to jq 1.8.1.
+
1.9.1
-----
diff --git a/deps/jq-1.8.0-Makefile.patch b/deps/jq-1.8.0-Makefile.patch
deleted file mode 100644
index 5bb87ad..0000000
--- a/deps/jq-1.8.0-Makefile.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -rBu a/Makefile.am b/Makefile.am
---- a/Makefile.am 2025-06-01 06:58:31.000000000 +0100
-+++ b/Makefile.am 2025-06-14 15:01:47.294842066 +0100
-@@ -99,7 +99,7 @@
- # Remake the version.h header file if, and only if, the git ID has changed
- .PHONY: .FORCE
- .FORCE:
--generate_ver = ver="`{ $(srcdir)/scripts/version || echo '$(VERSION)' ; } | sed 's/.*/\x23define JQ_VERSION \"&\"/'`"
-+generate_ver = ver="`{ $(srcdir)/scripts/version || echo '$(VERSION)' ; } | xargs printf '\043define JQ_VERSION \"%s\"\n'`"
- .remake-version-h: .FORCE
- @ $(generate_ver); test "x`cat src/version.h 2>/dev/null`" = "x$$ver" || touch .remake-version-h
- src/version.h: .remake-version-h
-diff -rBu a/Makefile.in b/Makefile.in
---- a/Makefile.in 2025-06-01 06:58:46.000000000 +0100
-+++ b/Makefile.in 2025-06-14 15:05:52.913771036 +0100
-@@ -754,7 +754,7 @@
- @ENABLE_ERROR_INJECTION_TRUE@libinject_errors_la_SOURCES = src/inject_errors.c
- @ENABLE_ERROR_INJECTION_TRUE@libinject_errors_la_LIBADD = -ldl
- @ENABLE_ERROR_INJECTION_TRUE@libinject_errors_la_LDFLAGS = -module
--generate_ver = ver="`{ $(srcdir)/scripts/version || echo '$(VERSION)' ; } | sed 's/.*/\x23define JQ_VERSION \"&\"/'`"
-+generate_ver = ver="`{ $(srcdir)/scripts/version || echo '$(VERSION)' ; } | xargs printf '\043define JQ_VERSION \"%s\"\n'`"
- CLEANFILES = src/version.h .remake-version-h src/builtin.inc \
- src/config_opts.inc jq.1
- jq_SOURCES = src/main.c
diff --git a/deps/jq-1.8.0.tar.gz b/deps/jq-1.8.0.tar.gz
deleted file mode 100644
index 1e270e4..0000000
--- a/deps/jq-1.8.0.tar.gz
+++ /dev/null
Binary files differ
diff --git a/deps/jq-1.8.1.tar.gz b/deps/jq-1.8.1.tar.gz
new file mode 100644
index 0000000..7c1bcf0
--- /dev/null
+++ b/deps/jq-1.8.1.tar.gz
Binary files differ
diff --git a/setup.py b/setup.py
index c00b8d4..4febd53 100644
--- a/setup.py
+++ b/setup.py
@@ -27,8 +27,8 @@ def _read(fname):
return open(os.path.join(os.path.dirname(__file__), fname)).read()
-jq_lib_tarball_path = _dep_source_path("jq-1.8.0.tar.gz")
-jq_lib_dir = _dep_build_path("jq-1.8.0")
+jq_lib_tarball_path = _dep_source_path("jq-1.8.1.tar.gz")
+jq_lib_dir = _dep_build_path("jq-1.8.1")
class jq_with_deps_build_ext(build_ext):
def finalize_options(self):
@@ -47,7 +47,6 @@ class jq_with_deps_build_ext(build_ext):
tarball_path=jq_lib_tarball_path,
lib_dir=jq_lib_dir,
commands=[
- ["patch", "-i", _dep_source_path("jq-1.8.0-Makefile.patch")],
["./configure", "CFLAGS=-fPIC -pthread", "--disable-maintainer-mode", "--with-oniguruma=builtin"],
["make"],
])