diff --git a/dev-libs/json_c/json_c-0.12.recipe b/dev-libs/json_c/json_c-0.12.1.recipe similarity index 81% rename from dev-libs/json_c/json_c-0.12.recipe rename to dev-libs/json_c/json_c-0.12.1.recipe index 2474431d1..3de2e1652 100644 --- a/dev-libs/json_c/json_c-0.12.recipe +++ b/dev-libs/json_c/json_c-0.12.1.recipe @@ -7,9 +7,9 @@ HOMEPAGE="https://github.com/json-c/json-c/wiki" COPYRIGHT="2009-2012 Eric Haszlakiewicz 2004, 2005 Metaparadigm Pte Ltd" LICENSE="MIT" -REVISION="3" -SOURCE_URI="https://s3.amazonaws.com/json-c_releases/releases/json-c-0.12-nodoc.tar.gz" -CHECKSUM_SHA256="6fd6d2311d610b279e1bcdd5c6d4f699700159d3e0786de8306af7b4bc94fb35" +REVISION="1" +SOURCE_URI="https://s3.amazonaws.com/json-c_releases/releases/json-c-$portVersion-nodoc.tar.gz" +CHECKSUM_SHA256="5a617da9aade997938197ef0f8aabd7f97b670c216dc173977e1d56eef9e1291" SOURCE_DIR="json-c-$portVersion" PATCHES="json_c-$portVersion.patchset" @@ -18,7 +18,7 @@ SECONDARY_ARCHITECTURES="x86" PROVIDES=" json_c$secondaryArchSuffix = $portVersion - lib:libjson_c$secondaryArchSuffix = 2.0.1 compat >= 2 + lib:libjson_c$secondaryArchSuffix = 2.0.2 compat >= 2 " REQUIRES=" haiku$secondaryArchSuffix @@ -26,7 +26,7 @@ REQUIRES=" PROVIDES_devel=" json_c${secondaryArchSuffix}_devel = $portVersion - devel:libjson_c$secondaryArchSuffix = 2.0.1 compat >= 2 + devel:libjson_c$secondaryArchSuffix = 2.0.2 compat >= 2 " REQUIRES_devel=" json_c$secondaryArchSuffix == $portVersion base @@ -51,6 +51,8 @@ INSTALL() { make install + rm $libDir/libjson-c.la + prepareInstalledDevelLib libjson-c fixPkgconfig packageEntries devel $developDir diff --git a/dev-libs/json_c/patches/json_c-0.12.patchset b/dev-libs/json_c/patches/json_c-0.12.1.patchset similarity index 74% rename from dev-libs/json_c/patches/json_c-0.12.patchset rename to dev-libs/json_c/patches/json_c-0.12.1.patchset index a1ebb4eda..137d1cb50 100644 --- a/dev-libs/json_c/patches/json_c-0.12.patchset +++ b/dev-libs/json_c/patches/json_c-0.12.1.patchset @@ -1,4 +1,4 @@ -From 42928f5769cc98b8cd791dfa2c58f7dc0634dba5 Mon Sep 17 00:00:00 2001 +From 260bd7c8cfe9c40e49cc04b5eea87786b1ea0e57 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 8 Jun 2014 19:35:53 +0200 Subject: Remove compiler options unknown to gcc2. @@ -11,35 +11,34 @@ index fec591b..21aec1f 100644 @@ -1,2 +1,2 @@ -AM_CFLAGS = -Wall -Werror -Wno-error=deprecated-declarations -Wextra -Wwrite-strings -Wno-unused-parameter -std=gnu99 -D_GNU_SOURCE -D_REENTRANT +AM_CFLAGS = -Wall -Wwrite-strings -std=gnu9x -D_GNU_SOURCE -D_REENTRANT - --- -1.8.3.4 + +-- +2.13.1 -From d75281fd4c7e7b91913d25f3a2052221af50116e Mon Sep 17 00:00:00 2001 +From e2f2dca5eb135051cbf4e3533b314509185e698b Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 8 Jun 2014 21:08:43 +0200 Subject: Avoid c99ism to make gcc2 happy. diff --git a/json_tokener.c b/json_tokener.c -index 19de8ef..80841f1 100644 +index 9a76293..4734fed 100644 --- a/json_tokener.c +++ b/json_tokener.c -@@ -355,11 +355,12 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok, - int size; +@@ -354,10 +354,11 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok, + { int size_inf; int is_negative = 0; -+ char* infbuf; - ++ char *infbuf; + printbuf_memappend_fast(tok->pb, &c, 1); - size = json_min(tok->st_pos+1, json_null_str_len); size_inf = json_min(tok->st_pos+1, json_inf_str_len); - char *infbuf = tok->pb->buf; + infbuf = tok->pb->buf; if (*infbuf == '-') { infbuf++; --- -1.8.3.4 +-- +2.13.1