# HG changeset patch
# User John Donoghue <john.donoghue@ieee.org>
# Date 1642513059 18000
# Node ID aeed56e485d53bf075e5327f3bd9e3d3878cf960
# Parent  0c8cbdd37239dfaec3043e15f8d764bec1520841
json-c: update to v0.13.1

* src/json-c.mk: update version, checksum, update rules

* src/json-c-1-patch-missingfile.patch: deleted file

* src/json-c-2-patch-remove-rpl.patch: deleted file

* dist-files.mk: removed ref to deleted files

diff -r 0c8cbdd37239 -r aeed56e485d5 dist-files.mk
--- a/dist-files.mk	Tue Jan 18 08:14:13 2022 -0500
+++ b/dist-files.mk	Tue Jan 18 08:37:39 2022 -0500
@@ -207,8 +207,6 @@
   jasper.mk \
   jpeg-test.c \
   jpeg.mk \
-  json-c-1-patch-missingfile.patch \
-  json-c-2-patch-remove-rpl.patch \
   json-c-test.c \
   json-c.mk \
   kbproto.mk \
diff -r 0c8cbdd37239 -r aeed56e485d5 src/json-c-1-patch-missingfile.patch
--- a/src/json-c-1-patch-missingfile.patch	Tue Jan 18 08:14:13 2022 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-Contains a fix for issue 35 on json-c (https://github.com/json-c/json-c/issues/35)
-
---- a/Makefile.am	2012-07-17 22:52:19.000000000 +0200
-+++ b/Makefile.am	2012-07-17 22:54:09.000000000 +0200
-@@ -17,6 +17,7 @@
- 	json_config.h \
- 	json_inttypes.h \
- 	json_object.h \
-+	json_object_iterator.h \
- 	json_object_private.h \
- 	json_tokener.h \
- 	json_util.h \
diff -r 0c8cbdd37239 -r aeed56e485d5 src/json-c-2-patch-remove-rpl.patch
--- a/src/json-c-2-patch-remove-rpl.patch	Tue Jan 18 08:14:13 2022 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-see http://lists.fedoraproject.org/pipermail/mingw/2009-May/001567.html
-
---- a/configure.in	2012-07-12 01:57:09.000000000 +0200
-+++ b/configure.in	2012-07-12 01:59:06.000000000 +0200
-@@ -25,8 +25,6 @@
- # Checks for library functions.
- AC_FUNC_VPRINTF
- AC_FUNC_MEMCMP
--AC_FUNC_MALLOC
--AC_FUNC_REALLOC
- AC_CHECK_FUNCS(strndup strerror vsnprintf vasprintf open vsyslog strncasecmp)
- 
- AM_PROG_LIBTOOL
diff -r 0c8cbdd37239 -r aeed56e485d5 src/json-c.mk
--- a/src/json-c.mk	Tue Jan 18 08:14:13 2022 -0500
+++ b/src/json-c.mk	Tue Jan 18 08:37:39 2022 -0500
@@ -3,17 +3,19 @@
 
 PKG             := json-c
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 0.10
-$(PKG)_CHECKSUM := f90f643c8455da21d57b3e8866868a944a93c596
+$(PKG)_VERSION  := 0.13.1
+$(PKG)_CHECKSUM := a339bae346e58d1737a7909794f432b097dd31cf
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := https://github.com/downloads/$(PKG)/$(PKG)/$($(PKG)_FILE)
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION)-nodoc.tar.gz
+$(PKG)_URL      := https://$(PKG)_releases.s3.amazonaws.com/releases/$($(PKG)_FILE)
 $(PKG)_DEPS     :=
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'https://github.com/json-c/json-c/downloads' | \
-    $(SED) -n 's,.*href="/downloads/json-c/json-c/json-c-\([0-9.]*\).tar.gz.*,\1,p' | \
-    head -1
+    $(WGET) -q -O- 'https://json-c_releases.s3.amazonaws.com' | \
+    $(SED) -r 's,<Key>,\n<Key>,g' | \
+    $(SED) -n 's,.*releases/json-c-\([0-9.]*\).tar.gz.*,\1,p' | \
+    $(SORT) -V | \
+    tail -1
 endef
 
 define $(PKG)_BUILD
@@ -23,10 +25,5 @@
         --prefix='$(HOST_PREFIX)' \
         $(ENABLE_SHARED_OR_STATIC)
         CFLAGS=-Wno-error
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install
-
-    '$(MXE_CC)' \
-        -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(HOST_BINDIR)/test-json-c.exe' \
-        `'$(MXE_PKG_CONFIG)' json --cflags --libs`
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install DEST='$(3)'
 endef