Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions jq.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: jq
version: 1.7.1
epoch: 6
version: "1.8.0"
epoch: 0
description: "a lightweight and flexible JSON processor"
copyright:
- license: MIT
Expand All @@ -23,13 +23,12 @@ pipeline:
with:
repository: https://github.com/jqlang/jq.git
tag: jq-${{package.version}}
expected-commit: 71c2ab509a8628dbbad4bc7b3f98a64aa90d3297
expected-commit: d23a7b9db932be706fecf5f4c9711fd4214bb64e

- uses: patch
with:
patches: |
0001-fix-jv_number_value-should-cache-the-double-value-of.patch
0002-Reject-NaN-with-payload-while-parsing-JSON.patch
fix-version-header-generation.patch

- runs: |
autoreconf -vfi
Expand Down
68 changes: 0 additions & 68 deletions jq/0001-fix-jv_number_value-should-cache-the-double-value-of.patch

This file was deleted.

33 changes: 0 additions & 33 deletions jq/0002-Reject-NaN-with-payload-while-parsing-JSON.patch

This file was deleted.

29 changes: 29 additions & 0 deletions jq/fix-version-header-generation.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
From 8155f78d76e6b059a7390edc06ad7cf432a737e6 Mon Sep 17 00:00:00 2001
From: ajayk <ajaykemparaj@gmail.com>
Date: Mon, 2 Jun 2025 04:06:24 -0700
Subject: [PATCH] Fix version header generation by replacing non-portable hex
escape

Replace \x23 hexadecimal escape with \# in Makefile.am to fix
version.h generation on systems where sed doesn't support \x23.
This resolves build failures where JQ_VERSION is undefined.
---
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index b6ac671..78f3271 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -99,7 +99,7 @@ endif
# 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)' ; } | sed 's/.*/\#define JQ_VERSION \"&\"/'`"
.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
--
2.39.5 (Apple Git-154)

Loading