Update jsoncpp to 1.8.4. Tested with upcoming cmake.
ninja: Entering directory `/usr/ports/pobj/jsoncpp-1.8.4/build-amd64'
[0/1] Running all tests.
1/2 unittest_jsoncpp_test OK 0.08 s
2/2 unittest_jsontestrunner OK 6.47 s
OK: 2
FAIL: 0
SKIP: 0
TIMEOUT: 0
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/jsoncpp/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- Makefile 28 Oct 2017 13:28:06 -0000 1.23
+++ Makefile 10 Feb 2018 14:00:56 -0000
@@ -4,11 +4,10 @@ COMMENT = JSON parsing C++ API
GH_ACCOUNT = open-source-parsers
GH_PROJECT = jsoncpp
-GH_TAGNAME = 1.8.3
-REVISION = 0
+GH_TAGNAME = 1.8.4
# no upstream revision
-SHARED_LIBS = jsoncpp 3.0
+SHARED_LIBS = jsoncpp 4.0
CATEGORIES = devel
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/jsoncpp/distinfo,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 distinfo
--- distinfo 31 Aug 2017 06:30:18 -0000 1.13
+++ distinfo 10 Feb 2018 14:00:56 -0000
@@ -1,2 +1,2 @@
-SHA256 (jsoncpp-1.8.3.tar.gz) = NnG6YFHg8whJlCzGbReY/fA2LQiTQ6g/cEwJ7nFWYE8=
-SIZE (jsoncpp-1.8.3.tar.gz) = 199061
+SHA256 (jsoncpp-1.8.4.tar.gz) = xJ3qyeCTO8twRPCFFoYaLVYJiFQLI94qwa1EOyGa/bY=
+SIZE (jsoncpp-1.8.4.tar.gz) = 200226
Index: patches/patch-include_json_value_h
===================================================================
RCS file: /cvs/ports/devel/jsoncpp/patches/patch-include_json_value_h,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-include_json_value_h
--- patches/patch-include_json_value_h 29 Aug 2017 09:14:16 -0000 1.1
+++ patches/patch-include_json_value_h 10 Feb 2018 14:00:56 -0000
@@ -12,14 +12,25 @@ overload append function for R value ref
Index: include/json/value.h
--- include/json/value.h.orig
+++ include/json/value.h
-@@ -449,10 +449,6 @@ Json::Value obj_value(Json::objectValue); // {}
+@@ -322,10 +322,6 @@ Json::Value obj_value(Json::objectValue); // {}
+ Value(bool value);
+ /// Deep copy.
+ Value(const Value& other);
+-#if JSON_HAS_RVALUE_REFERENCES
+- /// Move constructor
+- Value(Value&& other);
+-#endif
+ ~Value();
+
+ /// Deep copy, then swap(other).
+@@ -451,10 +447,6 @@ Json::Value obj_value(Json::objectValue); // {}
+ ///
/// Equivalent to jsonvalue[jsonvalue.size()] = value;
Value& append(const Value& value);
-
+-
-#if JSON_HAS_RVALUE_REFERENCES
- Value& append(Value&& value);
-#endif
--
+
/// Access an object value by name, create a null member if it does not
exist.
/// \note Because of our implementation, keys are limited to 2^30 -1 chars.
- /// Exceeding that will cause an exception.
Index: patches/patch-meson_build
===================================================================
RCS file: /cvs/ports/devel/jsoncpp/patches/patch-meson_build,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-meson_build
--- patches/patch-meson_build 28 Oct 2017 13:28:06 -0000 1.4
+++ patches/patch-meson_build 10 Feb 2018 14:00:56 -0000
@@ -9,14 +9,7 @@ Fixed compile bug
Index: meson.build
--- meson.build.orig
+++ meson.build
-@@ -18,13 +18,14 @@ jsoncpp_cdata.set('JSONCPP_VERSION', meson.project_ver
- jsoncpp_cdata.set('JSONCPP_VERSION_MAJOR', jsoncpp_major_version)
- jsoncpp_cdata.set('JSONCPP_VERSION_MINOR', jsoncpp_minor_version)
- jsoncpp_cdata.set('JSONCPP_VERSION_PATCH', jsoncpp_patch_version)
-+jsoncpp_cdata.set('JSONCPP_USE_SECURE_MEMORY',0)
-
- jsoncpp_gen_sources = configure_file(
- input : 'src/lib_json/version.h.in',
+@@ -25,7 +25,7 @@ jsoncpp_gen_sources = configure_file(
output : 'version.h',
configuration : jsoncpp_cdata,
install : true,
@@ -25,7 +18,7 @@ Index: meson.build
)
jsoncpp_headers = [
-@@ -42,8 +43,11 @@ jsoncpp_include_directories = include_directories('inc
+@@ -43,8 +43,11 @@ jsoncpp_include_directories = include_directories('inc
install_headers(
jsoncpp_headers,
@@ -38,16 +31,15 @@ Index: meson.build
jsoncpp_lib = library(
'jsoncpp',
[ jsoncpp_gen_sources,
-@@ -53,6 +57,8 @@ jsoncpp_lib = library(
- 'src/lib_json/json_value.cpp',
+@@ -55,12 +58,15 @@ jsoncpp_lib = library(
'src/lib_json/json_writer.cpp'],
- soversion : 19,
+ soversion : 20,
+ install : true,
+ dependencies : thread_dep,
+ link_args : no_asneeded,
- install : true,
include_directories : jsoncpp_include_directories)
-@@ -60,6 +66,7 @@ import('pkgconfig').generate(
+ import('pkgconfig').generate(
libraries : jsoncpp_lib,
version : meson.project_version(),
name : 'jsoncpp',
@@ -55,7 +47,16 @@ Index: meson.build
filebase : 'jsoncpp',
description : 'A C++ library for interacting with JSON')
-@@ -80,6 +87,8 @@ jsoncpp_test = executable(
+@@ -68,6 +74,8 @@ import('pkgconfig').generate(
+ jsoncpp_dep = declare_dependency(
+ include_directories : jsoncpp_include_directories,
+ link_with : jsoncpp_lib,
++ dependencies : thread_dep,
++ link_args : no_asneeded,
+ version : meson.project_version(),
+ sources : jsoncpp_gen_sources)
+
+@@ -81,6 +89,8 @@ jsoncpp_test = executable(
'src/test_lib_json/main.cpp'],
include_directories : jsoncpp_include_directories,
link_with : jsoncpp_lib,
@@ -64,12 +65,12 @@ Index: meson.build
install : false)
test(
'unittest_jsoncpp_test',
-@@ -90,6 +99,8 @@ jsontestrunner = executable(
+@@ -90,6 +100,8 @@ jsontestrunner = executable(
+ 'jsontestrunner',
'src/jsontestrunner/main.cpp',
include_directories : jsoncpp_include_directories,
- link_with : jsoncpp_lib,
+ dependencies : thread_dep,
+ link_args : no_asneeded,
+ link_with : jsoncpp_lib,
install : false)
test(
- 'unittest_jsontestrunner',
Index: patches/patch-src_lib_json_json_reader_cpp
===================================================================
RCS file: patches/patch-src_lib_json_json_reader_cpp
diff -N patches/patch-src_lib_json_json_reader_cpp
--- patches/patch-src_lib_json_json_reader_cpp 31 Aug 2017 06:30:18 -0000
1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_lib_json_json_reader_cpp,v 1.5 2017/08/31 06:30:18 dcoppa
Exp $
-
-Index: src/lib_json/json_reader.cpp
---- src/lib_json/json_reader.cpp.orig
-+++ src/lib_json/json_reader.cpp
-@@ -1728,6 +1728,7 @@ bool OurReader::decodeUnicodeCodePoint(Token& token,
- Location end,
- unsigned int& unicode) {
-
-+ unicode = 0;
- if (!decodeUnicodeEscapeSequence(token, current, end, unicode))
- return false;
- if (unicode >= 0xD800 && unicode <= 0xDBFF) {
Index: patches/patch-src_lib_json_json_value_cpp
===================================================================
RCS file: /cvs/ports/devel/jsoncpp/patches/patch-src_lib_json_json_value_cpp,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_lib_json_json_value_cpp
--- patches/patch-src_lib_json_json_value_cpp 29 Aug 2017 09:14:16 -0000
1.1
+++ patches/patch-src_lib_json_json_value_cpp 10 Feb 2018 14:00:56 -0000
@@ -12,14 +12,29 @@ overload append function for R value ref
Index: src/lib_json/json_value.cpp
--- src/lib_json/json_value.cpp.orig
+++ src/lib_json/json_value.cpp
-@@ -1147,10 +1147,6 @@ Value const& Value::operator[](CppTL::ConstString cons
-
- Value& Value::append(const Value& value) { return (*this)[size()] = value; }
+@@ -485,14 +485,6 @@ Value::Value(Value const& other)
+ }
+ }
-#if JSON_HAS_RVALUE_REFERENCES
-- Value& Value::append(Value&& value) { return (*this)[size()] = value; }
+-// Move constructor
+-Value::Value(Value&& other) {
+- initBasic(nullValue);
+- swap(other);
+-}
-#endif
-
+ Value::~Value() {
+ switch (type_) {
+ case nullValue:
+@@ -1146,10 +1138,6 @@ Value const& Value::operator[](CppTL::ConstString cons
+ #endif
+
+ Value& Value::append(const Value& value) { return (*this)[size()] = value; }
+-
+-#if JSON_HAS_RVALUE_REFERENCES
+- Value& Value::append(Value&& value) { return (*this)[size()] =
std::move(value); }
+-#endif
+
Value Value::get(char const* key, char const* cend, Value const&
defaultValue) const
{
- Value const* found = find(key, cend);
