Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (2e82d7bbc55923f3bc42828e039188cc7fa4fbe6)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (2e82d7bbc55923f3bc42828e039188cc7fa4fbe6)
  • Date: Thu, 7 Sep 2023 18:58:06 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

editors/jq/DETAILS | 9 +++++----
editors/jq/HISTORY | 4 ++++
editors/jq/PRE_BUILD | 7 -------
editors/jq/oniguruma.patch | 27 ---------------------------
editors/jq/segfault.patch | 22 ----------------------
5 files changed, 9 insertions(+), 60 deletions(-)

New commits:
commit 2e82d7bbc55923f3bc42828e039188cc7fa4fbe6
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

editors/jq: version 1.7

diff --git a/editors/jq/DETAILS b/editors/jq/DETAILS
index 27592f9..84d1a52 100755
--- a/editors/jq/DETAILS
+++ b/editors/jq/DETAILS
@@ -1,10 +1,11 @@
SPELL=jq
- VERSION=1.6
+ VERSION=1.7
+
SOURCE_HASH=sha512:4f8a6b0401e6c881dcb97d948fe38871062599a43fff667ede21cf185ec9de33e61878f0a6ea12786d0a632eea592ea0ff860520ba02dbb32f2fa2d2b5db7a0a
SOURCE="${SPELL}-${VERSION}.tar.gz"
-
SOURCE_URL[0]=https://github.com/stedolan/$SPELL/releases/download/$SPELL-$VERSION/$SOURCE
-
SOURCE_HASH=sha512:5da71f53c325257f1f546a2520fe47828b495c953270df25ea0e37741463fdda72f0ba4d5b05b25114ec30f27a559344c2b024bacabf610759f4e3e9efadb480
+
SOURCE_URL[0]="https://github.com/jqlang/${SPELL}/releases/download/${SPELL}-${VERSION}/${SOURCE}";
+# Watch: https://github.com/jqlang/jq/tags tag/jq-([0-9.]+)
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
- WEB_SITE="http://stedolan.github.io/jq/download/";
+ WEB_SITE="https://jqlang.github.io/jq/";
LICENSE[0]=MIT
ENTERED=20141019
SHORT="jq is like sed for JSON data"
diff --git a/editors/jq/HISTORY b/editors/jq/HISTORY
index b48b0ec..da895eb 100644
--- a/editors/jq/HISTORY
+++ b/editors/jq/HISTORY
@@ -1,3 +1,7 @@
+2023-09-07 Pavel Vinogradov <public AT sorcemage.org>
+ * DETAILS: version 1.7, updated source url and website, added Watch
line
+ * PRE_BUILD, segfault.patch, oniguruma.patch: removed, not needed
anymore
+
2019-06-12 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.6
* DEPENDS: added oniguruma optional dependency
diff --git a/editors/jq/PRE_BUILD b/editors/jq/PRE_BUILD
deleted file mode 100755
index 535e3e5..0000000
--- a/editors/jq/PRE_BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-default_pre_build &&
-cd "${SOURCE_DIRECTORY}" &&
-
-patch -p1 < "${SPELL_DIRECTORY}/segfault.patch" &&
-patch -p1 < "${SPELL_DIRECTORY}/oniguruma.patch" &&
-
-autoreconf -fi
diff --git a/editors/jq/oniguruma.patch b/editors/jq/oniguruma.patch
deleted file mode 100644
index 75ab111..0000000
--- a/editors/jq/oniguruma.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 6344b4e..86d968e 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -47,7 +47,7 @@ AM_YFLAGS = --warnings=all -d
-
- lib_LTLIBRARIES = libjq.la
- libjq_la_SOURCES = ${LIBJQ_SRC}
--libjq_la_LIBADD = -lm
-+libjq_la_LIBADD = -lm $(onig_LIBS)
- libjq_la_LDFLAGS = $(onig_LDFLAGS) -export-symbols-regex '^j[qv]_'
-version-info 1:4:0
-
- if WIN32
-diff --git a/configure.ac b/configure.ac
-index 280694c..d96026e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -249,6 +249,9 @@ AS_IF([test "x$with_oniguruma" != xno], [
- onig_CFLAGS="-I${with_oniguruma}/include"
- onig_LDFLAGS="-L${with_oniguruma}/lib"
- ])
-+ ], [
-+ # with_oniguruma == yes
-+ PKG_CHECK_MODULES([onig], [oniguruma])
- ])
- AS_IF([test "x$build_oniguruma" = xno], [
- # check for ONIGURUMA library, either in /usr or where requested
diff --git a/editors/jq/segfault.patch b/editors/jq/segfault.patch
deleted file mode 100644
index 8eb7d45..0000000
--- a/editors/jq/segfault.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From a1f1231a73c221155d539a281181ef37f874869d Mon Sep 17 00:00:00 2001
-From: William Langford <wlangfor AT gmail.com>
-Date: Tue, 20 Nov 2018 09:58:25 -0500
-Subject: [PATCH] Add missing jv_copy when printing with -ar
-
----
- src/main.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/main.c b/src/main.c
-index b154689e..61ae43f9 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -168,7 +168,7 @@ static int process(jq_state *jq, jv value, int flags,
int dumpopts) {
- while (jv_is_valid(result = jq_next(jq))) {
- if ((options & RAW_OUTPUT) && jv_get_kind(result) == JV_KIND_STRING) {
- if (options & ASCII_OUTPUT) {
-- jv_dumpf(result, stdout, JV_PRINT_ASCII);
-+ jv_dumpf(jv_copy(result), stdout, JV_PRINT_ASCII);
- } else {
- fwrite(jv_string_value(result), 1,
jv_string_length_bytes(jv_copy(result)), stdout);
- }



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (2e82d7bbc55923f3bc42828e039188cc7fa4fbe6), Pavel Vinogradov, 09/07/2023

Archive powered by MHonArc 2.6.24.

Top of Page