|
[-]
[+]
|
Changed |
_service:tar_git:jq.spec
|
|
|
|
[-]
[+]
|
Added |
_service:tar_git:jq-1.6-r3-never-bundle-oniguruma.patch
^
|
| @@ -0,0 +1,27 @@
+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
|
|
[-]
[+]
|
Added |
_service:tar_git:jq-1.6-runpath.patch
^
|
| @@ -0,0 +1,17 @@
+diff --git a/configure.ac b/configure.ac
+index 280694c..7227c9d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -280,4 +280,11 @@ AC_SUBST([BUNDLER], ["$bundle_cmd"])
+ AC_CONFIG_MACRO_DIR([config/m4])
+ AC_CONFIG_FILES([Makefile])
+ AC_OUTPUT
+-
++AC_ARG_ENABLE([rpathhack],
++ [AC_HELP_STRING([--enable-rpathhack], [patch libtool to remove RPATH])],
++ [
++AC_MSG_RESULT([patching libtool to fix rpath])
++sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
++sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
++ ],
++ [])
|
|
[-]
[+]
|
Added |
_service:tar_git:jq-1.6-segfault-fix.patch
^
|
| @@ -0,0 +1,22 @@
+From a1f1231a73c221155d539a281181ef37f874869d Mon Sep 17 00:00:00 2001
+From: William Langford <wlangfor@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);
+ }
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -1,8 +1,8 @@
<services>
<service name="tar_git">
<param name="url">https://github.com/sailfishos-chum/jq</param>
- <param name="revision">1.5</param>
+ <param name="revision">1.6</param>
<param name="debian">N</param>
<param name="dumb">N</param>
</service>
-</services>
\ No newline at end of file
+</services>
|
|
|
Changed |
_service:tar_git:jq-1.6.tar.gz
^
|
