Index | Thread | Search

From:
Stuart Henderson <stu@spacehopper.org>
Subject:
rapidjson update, plus patch for audacity
To:
Antoine Jacoutot <ajacoutot@bsdfrog.org>, ports <ports@openbsd.org>
Date:
Fri, 8 Aug 2025 11:02:00 +0100

Download raw body.

Thread
  • Stuart Henderson:

    rapidjson update, plus patch for audacity

this updates to a newer checkout of rapidjson (couple of fixes
including an out of bounds read, and bad parsing of NaN with
exponents), they also cleaned up some CMake bits with library
names that requires a tweak to audacity to cope.

any concerns? (everything depending on it built ok, I'll bump
the other ports too because it's a header-only "library").

Index: textproc/rapidjson/Makefile
===================================================================
RCS file: /cvs/ports/textproc/rapidjson/Makefile,v
diff -u -p -r1.6 Makefile
--- textproc/rapidjson/Makefile	5 Aug 2025 16:08:41 -0000	1.6
+++ textproc/rapidjson/Makefile	8 Aug 2025 09:58:40 -0000
@@ -2,9 +2,8 @@ COMMENT=	fast JSON parser/generator for 
 
 GH_ACCOUNT=	Tencent
 GH_PROJECT=	rapidjson
-GH_COMMIT=	f9d53419e912910fd8fa57d5705fa41425428c35
-DISTNAME=	rapidjson-1.1.0.20230928
-REVISION=	2
+GH_COMMIT=	24b5e7a8b27f42fa16b96fc70aade9106cf7102f
+DISTNAME=	rapidjson-1.1.0.20250205
 
 CATEGORIES=	textproc devel
 
Index: textproc/rapidjson/distinfo
===================================================================
RCS file: /cvs/ports/textproc/rapidjson/distinfo,v
diff -u -p -r1.1.1.1 distinfo
--- textproc/rapidjson/distinfo	12 Nov 2023 10:39:15 -0000	1.1.1.1
+++ textproc/rapidjson/distinfo	8 Aug 2025 09:58:40 -0000
@@ -1,2 +1,2 @@
-SHA256 (rapidjson-1.1.0.20230928-f9d53419.tar.gz) = K1Idulwi6q5ubn1NMEyzF+LPjGh8cARrAnksAveMEn4=
-SIZE (rapidjson-1.1.0.20230928-f9d53419.tar.gz) = 1116255
+SHA256 (rapidjson-1.1.0.20250205-24b5e7a8.tar.gz) = LSYBqC0tO34UOjyNQ+9hZnE5EDS8RokamBa3nPLT56g=
+SIZE (rapidjson-1.1.0.20250205-24b5e7a8.tar.gz) = 1116703
Index: textproc/rapidjson/patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/textproc/rapidjson/patches/patch-CMakeLists_txt,v
diff -u -p -r1.2 patch-CMakeLists_txt
--- textproc/rapidjson/patches/patch-CMakeLists_txt	5 Aug 2025 16:08:41 -0000	1.2
+++ textproc/rapidjson/patches/patch-CMakeLists_txt	8 Aug 2025 09:58:40 -0000
@@ -1,9 +1,12 @@
-Don't blindly set -march/-mcpu=native when using clang.
+hunk #1, disable ccache
+hunk #2, fix RAPIDJSON_ENABLE_INSTRUMENTATION_OPT for clang to work the
+same as it does with gcc
+
 
 Index: CMakeLists.txt
 --- CMakeLists.txt.orig
 +++ CMakeLists.txt
-@@ -57,15 +57,6 @@ if(RAPIDJSON_USE_MEMBERSMAP)
+@@ -46,15 +46,6 @@ if(RAPIDJSON_USE_MEMBERSMAP)
      add_definitions(-DRAPIDJSON_USE_MEMBERSMAP=1)
  endif()
  
@@ -16,10 +19,10 @@ Index: CMakeLists.txt
 -    endif()
 -endif(CCACHE_FOUND)
 -
+ find_program(VALGRIND_FOUND valgrind)
+ 
  if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-     if(RAPIDJSON_ENABLE_INSTRUMENTATION_OPT AND NOT CMAKE_CROSSCOMPILING)
-         if(CMAKE_SYSTEM_PROCESSOR STREQUAL "powerpc" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64le")
-@@ -101,7 +92,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+@@ -94,7 +85,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
          endif()
      endif()
  elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
Index: audio/audacity/Makefile
===================================================================
RCS file: /cvs/ports/audio/audacity/Makefile,v
diff -u -p -r1.113 Makefile
--- audio/audacity/Makefile	5 Aug 2025 13:57:48 -0000	1.113
+++ audio/audacity/Makefile	8 Aug 2025 09:58:40 -0000
@@ -11,6 +11,8 @@ GH_TAGNAME=	Audacity-3.7.5
 DISTNAME=	${GH_TAGNAME:L}
 CATEGORIES=	audio
 
+REVISION=	0
+
 HOMEPAGE=	https://www.audacityteam.org/
 
 MAINTAINER=	Antoine Jacoutot <ajacoutot@openbsd.org>
Index: audio/audacity/patches/patch-cmake-proxies_cmake-modules_dependencies_rapidjson_cmake
===================================================================
RCS file: audio/audacity/patches/patch-cmake-proxies_cmake-modules_dependencies_rapidjson_cmake
diff -N audio/audacity/patches/patch-cmake-proxies_cmake-modules_dependencies_rapidjson_cmake
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ audio/audacity/patches/patch-cmake-proxies_cmake-modules_dependencies_rapidjson_cmake	8 Aug 2025 09:58:40 -0000
@@ -0,0 +1,14 @@
+Index: cmake-proxies/cmake-modules/dependencies/rapidjson.cmake
+--- cmake-proxies/cmake-modules/dependencies/rapidjson.cmake.orig
++++ cmake-proxies/cmake-modules/dependencies/rapidjson.cmake
+@@ -2,7 +2,9 @@
+ 
+ if(NOT ${_OPT}use_rapidjson STREQUAL "off")
+    if(NOT TARGET rapidjson::rapidjson)
+-      if(TARGET rapidjson)
++      if(TARGET RapidJSON)
++         add_library( rapidjson::rapidjson ALIAS RapidJSON )
++      elseif(TARGET rapidjson)
+          add_library( rapidjson::rapidjson ALIAS rapidjson )
+       else()
+          # At least on Arch RapidJSONConfig.cmake does not define a target at all