diff options
author | Tony Theodore <tonyt@logyst.com> | 2013-04-26 13:14:44 (GMT) |
---|---|---|
committer | Tony Theodore <tonyt@logyst.com> | 2013-04-26 13:14:44 (GMT) |
commit | 89dfbe577dd6bded08008a67953c2bedd49623c9 (patch) | |
tree | abb00013a14869e68ecc540bd9ecf57e391a9d0a | |
parent | 7c525045d49bb62e605975b5f26fdae9ddbbff14 (diff) | |
parent | 8b5ef44806dd60dd0877b7856b06e4df709fb93f (diff) | |
download | mxe-89dfbe577dd6bded08008a67953c2bedd49623c9.zip mxe-89dfbe577dd6bded08008a67953c2bedd49623c9.tar.gz mxe-89dfbe577dd6bded08008a67953c2bedd49623c9.tar.bz2 |
Merge pull request #182 from residuum/json-c-0.11
json-c update to 0.11
-rw-r--r-- | index.html | 4 | ||||
-rw-r--r-- | src/json-c-1-patch-missingfile.patch | 15 | ||||
-rw-r--r-- | src/json-c-1-patch-remove-rpl.patch (renamed from src/json-c-2-patch-remove-rpl.patch) | 6 | ||||
-rw-r--r-- | src/json-c-3-fix-am-header.patch | 18 | ||||
-rw-r--r-- | src/json-c-test.c | 2 | ||||
-rw-r--r-- | src/json-c.mk | 5 |
6 files changed, 9 insertions, 41 deletions
@@ -1361,8 +1361,8 @@ aptitude -t squeeze-backports install cmake yasm</pre> </tr> <tr> <td id="json-c-package">json-c</td> - <td id="json-c-version">0.10</td> - <td id="json-c-website"><a href="http://oss.metaparadigm.com/json-c/">json-c</a></td> + <td id="json-c-version">0.11</td> + <td id="json-c-website"><a href="https://github.com/json-c/json-c/wiki">json-c</a></td> </tr> <tr> <td id="lame-package">lame</td> diff --git a/src/json-c-1-patch-missingfile.patch b/src/json-c-1-patch-missingfile.patch deleted file mode 100644 index f1cfb0a..0000000 --- a/src/json-c-1-patch-missingfile.patch +++ /dev/null @@ -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 --git a/src/json-c-2-patch-remove-rpl.patch b/src/json-c-1-patch-remove-rpl.patch index 6a5df01..2217b2a 100644 --- a/src/json-c-2-patch-remove-rpl.patch +++ b/src/json-c-1-patch-remove-rpl.patch @@ -11,6 +11,6 @@ see http://lists.fedoraproject.org/pipermail/mingw/2009-May/001567.html AC_FUNC_MEMCMP -AC_FUNC_MALLOC -AC_FUNC_REALLOC - AC_CHECK_FUNCS(strndup strerror vsnprintf vasprintf open vsyslog strncasecmp) - - AM_PROG_LIBTOOL + AC_CHECK_FUNCS(strcasecmp strdup strndup strerror snprintf vsnprintf vasprintf open vsyslog strncasecmp setlocale) + + #check if .section.gnu.warning accepts long strings (for __warn_references) diff --git a/src/json-c-3-fix-am-header.patch b/src/json-c-3-fix-am-header.patch deleted file mode 100644 index 88686ea..0000000 --- a/src/json-c-3-fix-am-header.patch +++ /dev/null @@ -1,18 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -diff -ur json-c-0.10.orig/configure.in json-c-0.10/configure.in ---- json-c-0.10.orig/configure.in 2013-03-23 18:58:41.000000000 +1100 -+++ json-c-0.10/configure.in 2013-03-23 18:59:33.000000000 +1100 -@@ -12,8 +12,8 @@ - # Checks for libraries. - - # Checks for header files. --AM_CONFIG_HEADER(config.h) --AM_CONFIG_HEADER(json_config.h) -+AC_CONFIG_HEADERS(config.h) -+AC_CONFIG_HEADERS(json_config.h) - AC_HEADER_STDC - AC_CHECK_HEADERS(fcntl.h limits.h strings.h syslog.h unistd.h [sys/param.h] stdarg.h) - AC_CHECK_HEADER(inttypes.h,[AC_DEFINE([JSON_C_HAVE_INTTYPES_H],[1],[Public define for json_inttypes.h])]) - diff --git a/src/json-c-test.c b/src/json-c-test.c index cb5a3c9..967beca 100644 --- a/src/json-c-test.c +++ b/src/json-c-test.c @@ -3,7 +3,7 @@ * See index.html for further information. */ -#include <json/json.h> +#include <json-c/json.h> #include <stdio.h> int main(int argc, char *argv[]) diff --git a/src/json-c.mk b/src/json-c.mk index dec4f7c..33d635a 100644 --- a/src/json-c.mk +++ b/src/json-c.mk @@ -3,7 +3,7 @@ PKG := json-c $(PKG)_IGNORE := -$(PKG)_CHECKSUM := f495481641a3a014decc58f935b112d07347fb05 +$(PKG)_CHECKSUM := 4bae2468bfd73a2b2eec7419c75c262b5833f567 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION)-nodoc.tar.gz $(PKG)_URL := https://s3.amazonaws.com/$(PKG)_releases/releases/$($(PKG)_FILE) @@ -13,7 +13,8 @@ define $(PKG)_UPDATE $(WGET) -q -O- 'https://s3.amazonaws.com/json-c_releases' | \ $(SED) -r 's,<Key>,\n<Key>,g' | \ $(SED) -n 's,.*releases/json-c-\([0-9.]*\).tar.gz.*,\1,p' | \ - head -1 + $(SORT) -V | \ + tail -1 endef define $(PKG)_BUILD |