Update to jsoncpp-0.10.4

This commit is contained in:
dcoppa 2015-07-15 15:41:34 +00:00
parent db183db417
commit 3b36666c1c
4 changed files with 18 additions and 16 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.3 2015/04/23 09:05:25 dcoppa Exp $
# $OpenBSD: Makefile,v 1.4 2015/07/15 15:41:34 dcoppa Exp $
# assumes it can build static and shared libs out of the same (pic) obj files
SHARED_ONLY = Yes
@ -7,7 +7,8 @@ COMMENT = JSON parsing C++ API
GH_ACCOUNT = open-source-parsers
GH_PROJECT = jsoncpp
GH_TAGNAME = 0.10.2
GH_TAGNAME = 0.10.4
SUBST_VARS += GH_TAGNAME
DISTNAME = ${GH_PROJECT}-${GH_TAGNAME}
# no upstream revision

View File

@ -1,2 +1,2 @@
SHA256 (jsoncpp-0.10.2.tar.gz) = N7tyYVAYUiu3il60JbNt/HngScHVRxtyT3zK3qwO1Hk=
SIZE (jsoncpp-0.10.2.tar.gz) = 197188
SHA256 (jsoncpp-0.10.4.tar.gz) = h8QsyT1SQvO4FXSkf1AD8keie10BMHU6rz2ER2ZtZT4=
SIZE (jsoncpp-0.10.4.tar.gz) = 198947

View File

@ -1,10 +1,11 @@
prefix=${TRUEPREFIX}
exec_prefix=${TRUEPREFIX}
libdir=${TRUEPREFIX}/lib
includedir=${TRUEPREFIX}/include/jsoncpp
Name: jsoncpp
Description: JSON implementation in C++
Version: ${VERSION}
Requires:
Libs: -L${libdir} -ljsoncpp
Description: A C++ library for interacting with JSON
Version: ${GH_TAGNAME}
URL: https://github.com/open-source-parsers/jsoncpp
Libs: -L${libdir} -ljsoncpp
Cflags: -I${includedir}

View File

@ -1,16 +1,16 @@
$OpenBSD: patch-src_test_lib_json_main_cpp,v 1.2 2015/06/05 00:27:59 jsg Exp $
--- src/test_lib_json/main.cpp.orig Sun Apr 12 05:49:59 2015
+++ src/test_lib_json/main.cpp Thu Jun 4 13:48:06 2015
@@ -282,7 +282,7 @@ JSONTEST_FIXTURE(ValueTest, null) {
JSONTEST_ASSERT_EQUAL(0.0, null_.asFloat());
JSONTEST_ASSERT_STRING_EQUAL("", null_.asString());
$OpenBSD: patch-src_test_lib_json_main_cpp,v 1.3 2015/07/15 15:41:34 dcoppa Exp $
--- src/test_lib_json/main.cpp.orig Sun Jul 12 22:02:28 2015
+++ src/test_lib_json/main.cpp Wed Jul 15 16:52:10 2015
@@ -298,7 +298,7 @@ JSONTEST_FIXTURE(ValueTest, null) {
#if !defined(__ARMEL__)
// See line #165 of include/json/value.h
- JSONTEST_ASSERT_EQUAL(Json::Value::null, null_);
+ JSONTEST_ASSERT_EQUAL(Json::Value::nullRef, null_);
#endif
}
JSONTEST_FIXTURE(ValueTest, strings) {
@@ -1240,7 +1240,7 @@ JSONTEST_FIXTURE(ValueTest, nonIntegers) {
@@ -1257,7 +1257,7 @@ JSONTEST_FIXTURE(ValueTest, nonIntegers) {
// A 16-digit floating point number.
val = Json::Value(2199023255552000.0f);