Re: UPDATE: devel/jsoncpp

On Sat, Nov 07 2020, Rafael Sadowski <rafael@sizeofvoid.org> wrote:
> Please find below a diff to update jsoncpp to the latest stable version
> on github. This version includes all patches and fixes some security
> related bugs. I removed the include path patches.

While I've cared about jsoncpp in the past I don't understand how its
headers could clash with something else (the patch mentions libc++
headers). That's the whole point of using an include/json/ subdirectory
and telling people to use <json/foo> in their code. Maybe some people
missed the point and started including just <foo> and
add -I/usr/local/include/json to their build system.

> I see no conflicts in
> the tree and all consumers are happy:
>
> devel/cmake
> games/minetest
> graphics/orthanc/*
> mail/kopano
> multimedia/upplay (outdated port, tweak diff in another mail).
>
> OK?

Looks correct, ok jca@

> Rafael
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/jsoncpp/Makefile,v
> retrieving revision 1.29
> diff -u -p -u -p -r1.29 Makefile
> --- Makefile 12 Jul 2019 20:44:36 -0000 1.29
> +++ Makefile 1 Nov 2020 20:02:54 -0000
> @@ -4,11 +4,10 @@ COMMENT = JSON parsing C++ API
>
> GH_ACCOUNT = open-source-parsers
> GH_PROJECT = jsoncpp
> -GH_TAGNAME = 1.8.4
> -REVISION = 2
> +GH_TAGNAME = 1.9.4
>
> # no upstream revision
> -SHARED_LIBS = jsoncpp 4.0
> +SHARED_LIBS = jsoncpp 5.0
>
> CATEGORIES = devel
>
> @@ -21,7 +20,13 @@ WANTLIB = m ${COMPILER_LIBCXX}
>
> COMPILER = base-clang ports-gcc base-gcc
>
> -MODULES = devel/meson
> +MODULES = devel/meson \
> + lang/python
> +
> +CONFIGURE_STYLE = meson
> +
> +MODPY_RUNDEP = No
> +MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
>
> TEST_ENV += LD_PRELOAD=${WRKBUILD}/libjsoncpp.so.${LIBjsoncpp_VERSION}
>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/jsoncpp/distinfo,v
> retrieving revision 1.14
> diff -u -p -u -p -r1.14 distinfo
> --- distinfo 11 Feb 2018 09:05:59 -0000 1.14
> +++ distinfo 1 Nov 2020 20:02:54 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (jsoncpp-1.8.4.tar.gz) = xJ3qyeCTO8twRPCFFoYaLVYJiFQLI94qwa1EOyGa/bY=
> -SIZE (jsoncpp-1.8.4.tar.gz) = 200226
> +SHA256 (jsoncpp-1.9.4.tar.gz) = 40piioFCZDuXbHIz7zgUV++teUaMZ8sa4Lg6M9dJOZk=
> +SIZE (jsoncpp-1.9.4.tar.gz) = 214057
> Index: patches/patch-include_json_config_h
> ===================================================================
> RCS file: patches/patch-include_json_config_h
> diff -N patches/patch-include_json_config_h
> --- patches/patch-include_json_config_h 18 Feb 2018 20:50:25 -0000 1.4
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,32 +0,0 @@
> -$OpenBSD: patch-include_json_config_h,v 1.4 2018/02/18 20:50:25 jca Exp $
> -
> -"explicit" on non-constructors are a C++11 feature
> -https://github.com/open-source-parsers/jsoncpp/commit/04abe38148d99b2a5270521935115d769a714adc
> -
> -Index: include/json/config.h
> ---- include/json/config.h.orig
> -+++ include/json/config.h
> -@@ -84,15 +84,23 @@
> - #if __cplusplus >= 201103L
> - # define JSONCPP_OVERRIDE override
> - # define JSONCPP_NOEXCEPT noexcept
> -+# define JSONCPP_OP_EXPLICIT explicit
> - #elif defined(_MSC_VER) && _MSC_VER > 1600 && _MSC_VER < 1900
> - # define JSONCPP_OVERRIDE override
> - # define JSONCPP_NOEXCEPT throw()
> -+# if _MSC_VER >= 1800 // MSVC 2013
> -+# define JSONCPP_OP_EXPLICIT explicit
> -+# else
> -+# define JSONCPP_OP_EXPLICIT
> -+# endif
> - #elif defined(_MSC_VER) && _MSC_VER >= 1900
> - # define JSONCPP_OVERRIDE override
> - # define JSONCPP_NOEXCEPT noexcept
> -+# define JSONCPP_OP_EXPLICIT explicit
> - #else
> - # define JSONCPP_OVERRIDE
> - # define JSONCPP_NOEXCEPT throw()
> -+# define JSONCPP_OP_EXPLICIT
> -