Skip to contentSkip to conversation

bump json-c to 0.10

PATCH New Andreas Wetzel 2 participants 2 messages Feb 19, 2013 – Feb 25, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 bump json-c to 0.10

this patch bumps json-c to version 0.10 and adapts the no-reentrant patch to the new version.

---
 package/json-c/json-c-no-reentrant.patch |   16 +++++++---------
 package/json-c/json-c.mk                 |    4 ++--
 2 files changed, 9 insertions(+), 11 deletions(-)
package/json-c/json-c-no-reentrant.patch +7 -9
index a01181c..31343c0 100644
@@ -8,26 +8,24 @@ patch to avoid having to autoreconfigure the package.
 
 Signed-off-by: Thomas Petazzoni <[email protected]>
 
-Index: b/Makefile.am
+Index: b/Makefile.am.inc
 ===================================================================
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,4 +1,4 @@
+--- a/Makefile.am.inc
++++ b/Makefile.am.inc
+@@ -1,2 +1,2 @@
 -AM_CFLAGS = -Wall -Wwrite-strings -Werror -std=gnu99 -D_GNU_SOURCE -D_REENTRANT
 +AM_CFLAGS = -Wall -Wwrite-strings -Werror -std=gnu99 -D_GNU_SOURCE
  
- EXTRA_DIST = README.html README-WIN32.html config.h.win32 doc
- 
 Index: b/Makefile.in
 ===================================================================
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -219,7 +219,7 @@
+@@ -263,7 +263,7 @@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
 -AM_CFLAGS = -Wall -Wwrite-strings -Werror -std=gnu99 -D_GNU_SOURCE -D_REENTRANT
 +AM_CFLAGS = -Wall -Wwrite-strings -Werror -std=gnu99 -D_GNU_SOURCE
- EXTRA_DIST = README.html README-WIN32.html config.h.win32 doc
+ EXTRA_DIST = README.html README-WIN32.html config.h.win32 doc json-c.vcproj
+ SUBDIRS = . tests
  lib_LTLIBRARIES = libjson.la
- pkgconfigdir = $(libdir)/pkgconfig
package/json-c/json-c.mk +2 -2
index ed4a6d0..a0b5cae 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-JSON_C_VERSION = 0.9
-JSON_C_SITE = http://oss.metaparadigm.com/json-c/
+JSON_C_VERSION = 0.10
+JSON_C_SITE = https://github.com/downloads/json-c/json-c
 JSON_C_INSTALL_STAGING = YES
 
 $(eval $(autotools-package))
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 1/1 bump json-c to 0.10

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Andreas" == Andreas Wetzel <[email protected]> writes:

Andreas> this patch bumps json-c to version 0.10 and adapts the Andreas> no-reentrant patch to the new version.

Committed to next, thanks.

Signature · 1 line
Bye, Peter Korsgaard