mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 05:10:05 +02:00
rapidjson, bump to latest commit (#12214)
Last release has been from 2016 despite continuing development upstream
This commit is contained in:
Schrijvers Luc
GitHub
@@ -1,53 +0,0 @@
|
||||
From fe1928ac190c5e8ad0cd4b9b5e34e430eba9efb1 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
|
||||
Date: Sun, 16 Dec 2018 13:16:04 +0100
|
||||
Subject: Build fix for Haiku
|
||||
|
||||
|
||||
diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt
|
||||
index 4d448cc..48f16ef 100644
|
||||
--- a/example/CMakeLists.txt
|
||||
+++ b/example/CMakeLists.txt
|
||||
@@ -26,7 +26,7 @@ include_directories("../include/")
|
||||
add_definitions(-D__STDC_FORMAT_MACROS)
|
||||
|
||||
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
|
||||
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread -Werror -Wall -Wextra -Weffc++ -Wswitch-default")
|
||||
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -lpthread -Werror -Wall -Wextra -Weffc++ -Wswitch-default")
|
||||
elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall -Wextra -Weffc++ -Wswitch-default -Wfloat-equal -Wimplicit-fallthrough -Weverything")
|
||||
endif()
|
||||
--
|
||||
2.23.0
|
||||
|
||||
|
||||
From 73c5f7ae01d24ec8556add4e9b879927a90a9009 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
|
||||
Date: Fri, 23 Aug 2019 16:21:48 +0200
|
||||
Subject: PKGCONFIG fix
|
||||
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index ceda71b..99e3d51 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -93,6 +93,7 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
|
||||
endif()
|
||||
|
||||
#add extra search paths for libraries and includes
|
||||
+SET(INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" CACHE PATH "The prefix directory")
|
||||
SET(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "The directory the headers are installed in")
|
||||
SET(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE STRING "Directory where lib will install")
|
||||
SET(DOC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/doc/${PROJECT_NAME}" CACHE PATH "Path to the documentation")
|
||||
diff --git a/RapidJSON.pc.in b/RapidJSON.pc.in
|
||||
index 7467f97..28b88c4 100644
|
||||
--- a/RapidJSON.pc.in
|
||||
+++ b/RapidJSON.pc.in
|
||||
@@ -1,3 +1,4 @@
|
||||
+prefix=@INSTALL_PREFIX@
|
||||
includedir=@INCLUDE_INSTALL_DIR@
|
||||
|
||||
Name: @PROJECT_NAME@
|
||||
--
|
||||
2.23.0
|
||||
|
||||
30
dev-libs/rapidjson/patches/rapidjson-1.1.1~20250205.patchset
Normal file
30
dev-libs/rapidjson/patches/rapidjson-1.1.1~20250205.patchset
Normal file
@@ -0,0 +1,30 @@
|
||||
From 2248dadb7709c36af62f6aabb522a2c7f4e71dd4 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
|
||||
Date: Fri, 23 Aug 2019 16:21:48 +0200
|
||||
Subject: PKGCONFIG fix
|
||||
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index be860c9..f7532bb 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -144,6 +144,7 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "XL")
|
||||
endif()
|
||||
|
||||
#add extra search paths for libraries and includes
|
||||
+SET(INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" CACHE PATH "The prefix directory")
|
||||
SET(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "The directory the headers are installed in")
|
||||
SET(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE STRING "Directory where lib will install")
|
||||
SET(DOC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/doc/${PROJECT_NAME}" CACHE PATH "Path to the documentation")
|
||||
diff --git a/RapidJSON.pc.in b/RapidJSON.pc.in
|
||||
index 6afb079..31221a1 100644
|
||||
--- a/RapidJSON.pc.in
|
||||
+++ b/RapidJSON.pc.in
|
||||
@@ -1,3 +1,4 @@
|
||||
+prefix=@INSTALL_PREFIX@
|
||||
includedir=@INCLUDE_INSTALL_DIR@
|
||||
|
||||
Name: @PROJECT_NAME@
|
||||
--
|
||||
2.48.1
|
||||
|
||||
@@ -23,10 +23,12 @@ UTF-16 in the DOM. It also supports surrogates and \"\u0000\" \
|
||||
HOMEPAGE="https://github.com/Tencent/rapidjson"
|
||||
COPYRIGHT="2015 THL A29 Limited, a Tencent company, and Milo Yip"
|
||||
LICENSE="MIT"
|
||||
REVISION="3"
|
||||
SOURCE_URI="https://github.com/Tencent/rapidjson/archive/v$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e"
|
||||
REVISION="1"
|
||||
srcGitRev="24b5e7a8b27f42fa16b96fc70aade9106cf7102f"
|
||||
SOURCE_URI="https://github.com/Tencent/rapidjson/archive/$srcGitRev.tar.gz"
|
||||
CHECKSUM_SHA256="2d2601a82d2d3b7e143a3c8d43ef616671391034bc46891a9816b79cf2d3e7a8"
|
||||
SOURCE_FILENAME="rapidjson-$portVersion.tar.gz"
|
||||
SOURCE_DIR="rapidjson-$srcGitRev"
|
||||
PATCHES="rapidjson-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="all"
|
||||
@@ -56,16 +58,18 @@ BUILD_PREREQUIRES="
|
||||
|
||||
BUILD()
|
||||
{
|
||||
cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
|
||||
cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_INSTALL_PREFIX=$prefix \
|
||||
-DDOC_INSTALL_DIR=$docDir \
|
||||
-DLIB_INSTALL_DIR=$libDir \
|
||||
-DINCLUDE_INSTALL_DIR=$includeDir \
|
||||
-DBUILD_SHARED_LIBS=ON \
|
||||
-DRAPIDJSON_BUILD_DOC=ON \
|
||||
-DRAPIDJSON_BUILD_EXAMPLES=OFF \
|
||||
-DRAPIDJSON_BUILD_TESTS=ON \
|
||||
-DRAPIDJSON_BUILD_THIRDPARTY_GTEST=OFF \
|
||||
-DINCLUDE_INSTALL_DIR=$includeDir \
|
||||
-DLIB_INSTALL_DIR=$libDir \
|
||||
-DDOC_INSTALL_DIR=$docDir \
|
||||
$cmakeDirArgs
|
||||
-Wno-dev
|
||||
|
||||
make -C build $jobArgs
|
||||
}
|
||||
|
||||
@@ -78,6 +82,5 @@ INSTALL()
|
||||
|
||||
TEST()
|
||||
{
|
||||
cd haiku_build
|
||||
make test
|
||||
ctest --test-dir build --output-on-failure
|
||||
}
|
||||
Reference in New Issue
Block a user