Attachment 214171 Details for Bug 246145 – Patch for json-c v2

[patch] Patch for json-c v2

json-c-014-v2.patch (text/plain), 4.66 KB, created by Daniel Engberg on 2020-05-05 19:40:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2020-05-05 19:40:07 UTC

Size: 4.66 KB

patch

obsolete

>diff --git a/devel/json-c/Makefile b/devel/json-c/Makefile
>index 896989ad4330..70c715308341 100644
>--- a/devel/json-c/Makefile
>+++ b/devel/json-c/Makefile
>@@ -1,32 +1,37 @@
> # Created by: gno@yahoo-inc.com
> # $FreeBSD$
> 
> PORTNAME=	json-c
>-PORTVERSION=	0.13.1
>-PORTREVISION=	1
>+PORTVERSION=	0.14
> CATEGORIES=	devel
> MASTER_SITES=	https://s3.amazonaws.com/json-c_releases/releases/ \
>-		LOCAL/sunpoet
>+		https://ftp.osuosl.org/pub/blfs/conglomeration/jsonc/
> 
> MAINTAINER=	sunpoet@FreeBSD.org
> COMMENT=	JSON (JavaScript Object Notation) implementation in C
> 
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-USES=		autoreconf compiler:c11 cpe libtool pathfix pkgconfig
>+USES=		cmake compiler:c11 cpe pkgconfig
> 
>-GNU_CONFIGURE=	yes
>-INSTALL_TARGET=	install-strip
>-TEST_TARGET=	check
>-USE_LDCONFIG=	yes
>+TEST_TARGET=	test
> 
> CPE_VENDOR=	json-c_project
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e 's| -Werror||g' ${WRKSRC}/Makefile.in
>+OPTIONS_DEFINE=	STATIC TEST
>+OPTIONS_SUB=	yes
>+STATIC_CMAKE_BOOL_OFF=	BUILD_SHARED_LIBS
>+TEST_CMAKE_BOOL=	BUILD_TESTING
>+
>+.include <bsd.port.options.mk>
>+.if ! ${PORT_OPTIONS:MSTATIC}
>+USE_LDCONFIG=	yes
>+.endif
> 
> post-install:
> 	${INSTALL_DATA} ${WRKSRC}/json_object_private.h ${STAGEDIR}${PREFIX}/include/json-c/
>+	# Reference: https://github.com/json-c/json-c/pull/585
>+	${RM} ${STAGEDIR}${PREFIX}/include/json-c/config.h
> 
> .include <bsd.port.mk>
>diff --git a/devel/json-c/distinfo b/devel/json-c/distinfo
>index 12ac290180a9..352b87b6e3d6 100644
>--- a/devel/json-c/distinfo
>+++ b/devel/json-c/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1520527097
>-SHA256 (json-c-0.13.1.tar.gz) = b87e608d4d3f7bfdd36ef78d56d53c74e66ab278d318b71e6002a369d36f4873
>-SIZE (json-c-0.13.1.tar.gz) = 639425
>+TIMESTAMP = 1588452653
>+SHA256 (json-c-0.14.tar.gz) = b377de08c9b23ca3b37d9a9828107dff1de5ce208ff4ebb35005a794f30c6870
>+SIZE (json-c-0.14.tar.gz) = 321677
>diff --git a/devel/json-c/files/patch-json_object.c b/devel/json-c/files/patch-json_object.c
>deleted file mode 100644
>index 4df3946861bb..000000000000
>--- a/devel/json-c/files/patch-json_object.c
>+++ /dev/null
>@@ -1,14 +0,0 @@
>---- json_object.c.orig	2020-02-18 20:12:20 UTC
>-+++ json_object.c
>-@@ -698,9 +698,9 @@ int64_t json_object_get_int64(const struct json_object
>- 	case json_type_int:
>- 		return jso->o.c_int64;
>- 	case json_type_double:
>--		if (jso->o.c_double >= INT64_MAX)
>-+		if (jso->o.c_double >= (double)INT64_MAX)
>- 			return INT64_MAX;
>--		if (jso->o.c_double <= INT64_MIN)
>-+		if (jso->o.c_double <= (double)INT64_MIN)
>- 			return INT64_MIN;
>- 		return (int64_t)jso->o.c_double;
>- 	case json_type_boolean:
>diff --git a/devel/json-c/files/patch-tests-test_parse.c b/devel/json-c/files/patch-tests-test_parse.c
>deleted file mode 100644
>index 59dec7aa3fab..000000000000
>--- a/devel/json-c/files/patch-tests-test_parse.c
>+++ /dev/null
>@@ -1,17 +0,0 @@
>---- tests/test_parse.c.orig	2018-01-16 04:33:49 UTC
>-+++ tests/test_parse.c
>-@@ -253,11 +253,11 @@ struct incremental_step {
>- 	   the next few tests check that parsing multiple sequential
>-        json objects in the input works as expected */
>- 	{ "null123",           9, 4, json_tokener_success, 0 },
>--	{ "null123" + 4,       4, 3, json_tokener_success, 1 },
>-+	{ &"null123"[4],       4, 3, json_tokener_success, 1 },
>- 	{ "nullx",             5, 4, json_tokener_success, 0 },
>--	{ "nullx" + 4,         2, 0, json_tokener_error_parse_unexpected, 1 },
>-+	{ &"nullx"[4],         2, 0, json_tokener_error_parse_unexpected, 1 },
>- 	{ "{\"a\":1}{\"b\":2}",15, 7, json_tokener_success, 0 },
>--	{ "{\"a\":1}{\"b\":2}" + 7,
>-+	{ &"{\"a\":1}{\"b\":2}"[7],
>- 	                       8, 7, json_tokener_success, 1 },
>- 
>- 	/* Some bad formatting. Check we get the correct error status */
>diff --git a/devel/json-c/pkg-plist b/devel/json-c/pkg-plist
>index 173db18ea30d..135b427fce74 100644
>--- a/devel/json-c/pkg-plist
>+++ b/devel/json-c/pkg-plist
>@@ -1,21 +1,24 @@
> include/json-c/arraylist.h
>-include/json-c/bits.h
> include/json-c/debug.h
> include/json-c/json.h
> include/json-c/json_c_version.h
> include/json-c/json_config.h
> include/json-c/json_inttypes.h
> include/json-c/json_object.h
> include/json-c/json_object_iterator.h
> include/json-c/json_object_private.h
> include/json-c/json_pointer.h
> include/json-c/json_tokener.h
>+include/json-c/json_types.h
> include/json-c/json_util.h
> include/json-c/json_visit.h
> include/json-c/linkhash.h
> include/json-c/printbuf.h
>-lib/libjson-c.a
>-lib/libjson-c.so
>-lib/libjson-c.so.4
>-lib/libjson-c.so.4.0.0
>+lib/cmake/json-c/json-c-config.cmake
>+lib/cmake/json-c/json-c-targets-%%CMAKE_BUILD_TYPE%%.cmake
>+lib/cmake/json-c/json-c-targets.cmake
>+%%STATIC%%lib/libjson-c.a
>+%%NO_STATIC%%lib/libjson-c.so
>+%%NO_STATIC%%lib/libjson-c.so.5
>+%%NO_STATIC%%lib/libjson-c.so.5.0.0
> libdata/pkgconfig/json-c.pc

Actions: View | Diff

Attachments on bug 246145: 214066 | 214171 | 214403 | 214481 | 214483 | 214486 | 214488