jsoncpp: updated to 1.9.3

v1.9.3: Bug fixes, optimizations, cleanup

This release includes several important bug fixes for unblocking some consumer's use cases.

Fixes to JSON_USE_EXCEPTION--some bugs creeped in breaking this flag in pre-release.
Fixes to build system--improvements have been make for code correctness.
Compile errors for various platforms have been resolved.
Fuzzing has been fixed.
Various bugs in the Reader and Writer code have been corrected.
CPPTL support has been dropped.
Various code improvements and optimizations.

4 files changed, 20 insertions, 30 deletions

diff --git a/textproc/jsoncpp/Makefile b/textproc/jsoncpp/Makefile
index c8543733efa..9b16c9feead 100644
--- a/textproc/jsoncpp/Makefile
+++ b/textproc/jsoncpp/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2019/11/27 22:25:21 adam Exp $
+# $NetBSD: Makefile,v 1.14 2020/05/30 06:09:47 adam Exp $
 
-DISTNAME=	jsoncpp-1.9.2
+DISTNAME=	jsoncpp-1.9.3
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GITHUB:=open-source-parsers/}
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://github.com/open-source-parsers/jsoncpp
diff --git a/textproc/jsoncpp/PLIST b/textproc/jsoncpp/PLIST
index c953d7ce3b4..0ca4ec06f4d 100644
--- a/textproc/jsoncpp/PLIST
+++ b/textproc/jsoncpp/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.7 2019/11/27 22:25:21 adam Exp $
+@comment $NetBSD: PLIST,v 1.8 2020/05/30 06:09:47 adam Exp $
 include/json/allocator.h
 include/json/assertions.h
-include/json/autolink.h
 include/json/config.h
 include/json/forwards.h
 include/json/json.h
diff --git a/textproc/jsoncpp/distinfo b/textproc/jsoncpp/distinfo
index 25ef5672c66..4b88790adc4 100644
--- a/textproc/jsoncpp/distinfo
+++ b/textproc/jsoncpp/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.12 2019/11/27 22:25:21 adam Exp $
+$NetBSD: distinfo,v 1.13 2020/05/30 06:09:47 adam Exp $
 
-SHA1 (jsoncpp-1.9.2.tar.gz) = 6a546eeeea6e31fe8ab746491a3189c0844a0f79
-RMD160 (jsoncpp-1.9.2.tar.gz) = 16f332ae761b94b86ba7748c1be25e33dc58e428
-SHA512 (jsoncpp-1.9.2.tar.gz) = 7c7188199d62ae040d458d507ba62f0370c53f39c580760ee5485cae5c08e5ced0c9aea7c14f54dfd041999a7291e4d0f67f8ccd8b1030622c85590774688640
-Size (jsoncpp-1.9.2.tar.gz) = 211341 bytes
-SHA1 (patch-CMakeLists.txt) = d0a83a9c681f9048fc0569e888380adc945705c2
+SHA1 (jsoncpp-1.9.3.tar.gz) = df04d765d24d98e18f70bf8588d3df48697c4ba7
+RMD160 (jsoncpp-1.9.3.tar.gz) = 50fb22e9c86db230e558ffa7476d3c3f0cc94e76
+SHA512 (jsoncpp-1.9.3.tar.gz) = f1c035d54ed952d8d4e41acab5c3ecf6aa445f348f98aeac2e7c89555ec2f6421d727b3bc4c2f54176afce137c545b20d886562901953ec091f91890e91e8559
+Size (jsoncpp-1.9.3.tar.gz) = 212922 bytes
+SHA1 (patch-CMakeLists.txt) = 9a1847d15b168d8025c8a7040e8f89ffe1435569
diff --git a/textproc/jsoncpp/patches/patch-CMakeLists.txt b/textproc/jsoncpp/patches/patch-CMakeLists.txt
index 8079b6ea1a5..f18ec4a8640 100644
--- a/textproc/jsoncpp/patches/patch-CMakeLists.txt
+++ b/textproc/jsoncpp/patches/patch-CMakeLists.txt
@@ -1,35 +1,25 @@
-$NetBSD: patch-CMakeLists.txt,v 1.3 2019/11/27 22:25:21 adam Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.4 2020/05/30 06:09:47 adam Exp $
 
 Make so version match symlink versions.
 Remove -Werror=conversion.
-Do not build examples.
 
---- CMakeLists.txt.orig	2019-11-12 07:16:54.000000000 +0000
+--- CMakeLists.txt.orig	2020-05-29 13:50:26.000000000 +0000
 +++ CMakeLists.txt
-@@ -74,7 +74,7 @@ project(JSONCPP
+@@ -71,7 +71,7 @@ project(JSONCPP
          LANGUAGES CXX)
  
  message(STATUS "JsonCpp Version: ${JSONCPP_VERSION_MAJOR}.${JSONCPP_VERSION_MINOR}.${JSONCPP_VERSION_PATCH}")
--set( JSONCPP_SOVERSION 22 )
-+set( JSONCPP_SOVERSION ${JSONCPP_VERSION_MAJOR} )
+-set(JSONCPP_SOVERSION 24)
++set(JSONCPP_SOVERSION ${JSONCPP_VERSION_MAJOR})
  
  option(JSONCPP_WITH_TESTS "Compile and (for jsoncpp_check) run JsonCpp test executables" ON)
  option(JSONCPP_WITH_POST_BUILD_UNITTEST "Automatically run unit-tests as a post build step" ON)
-@@ -141,9 +141,9 @@ endif()
+@@ -120,7 +120,7 @@ endif()
+ 
  if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
      # using regular Clang or AppleClang
-     if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.12.0)
--      add_compile_options(-Wall -Wconversion -Wshadow -Werror=conversion -Werror=sign-compare)
-+      add_compile_options(-Wall -Wconversion -Wshadow -Werror=sign-compare)
-     else()
--      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wconversion -Wshadow -Werror=conversion -Werror=sign-compare")
-+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wconversion -Wshadow -Werror=sign-compare")
-     endif()
+-    add_compile_options(-Wall -Wconversion -Wshadow -Werror=conversion -Werror=sign-compare)
++    add_compile_options(-Wall -Wconversion -Wshadow -Werror=sign-compare)
  elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
      # using GCC
-@@ -227,5 +227,3 @@ add_subdirectory( src )
- #install the includes
- add_subdirectory( include )
- 
--#install the example
--add_subdirectory( example )
+     add_compile_options(-Wall -Wconversion -Wshadow -Wextra)