mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-07-30 22:48:07 -07:00
dev-cpp/jsoncons: add 1.4.0, drop 1.3.2
Signed-off-by: Alexey Sokolov <alexey+gentoo@asokolov.org> Part-of: https://github.com/gentoo/gentoo/pull/43821 Closes: https://github.com/gentoo/gentoo/pull/43821 Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Alexey Sokolov
committed by
Sam James
Sam James
parent
6427fe8873
commit
c984f6ceba
@@ -1 +1 @@
|
||||
DIST jsoncons-1.3.2.tar.gz 1504068 BLAKE2B acc4b41edc0a6de5c6f3c43786aa5574d27c4693288bc8f561b45bca9be4338ba63eaa6cfa2c0fc6771e8c98e9a33ffc6e81983cc3edc5973f93521e2dcb5902 SHA512 763e56ed7469d81e44e04ec029806fa08026cb3c33caf1264a24068007226e26ea38922840d7e4b2e7529f99564c1fb6bca48f84a4a3f383733d37af8d13cc99
|
||||
DIST jsoncons-1.4.0.tar.gz 1537117 BLAKE2B 633042b091fb1bcd5571420682de6f6c39a18299c1d1be025928226b22d1a9aa52ec2239b19ae38d3d75d19f4b0eaf67ee936096d9bdd7ec019484231a985207 SHA512 500a14ba6cb49d9c1ef04f39779f20b6718e3f4ad4418738b97ea8ffd49ebd7b87db046d1592cc0340d4d016a931ae3eb6888097af1216a30fc4c9e0be0d1337
|
||||
|
||||
@@ -1,62 +0,0 @@
|
||||
https://github.com/danielaparker/jsoncons/commit/d396ec86ea20b9805ba483d6c3dc20994824e823
|
||||
From: "Markus Kitsinger (SwooshyCueb)" <root@swooshalicio.us>
|
||||
Date: Tue, 22 Apr 2025 10:58:00 -0500
|
||||
Subject: [PATCH] Update CMake policy usage to 3.14
|
||||
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 3.5)
|
||||
+cmake_minimum_required(VERSION 3.5...3.14)
|
||||
|
||||
project(jsoncons CXX)
|
||||
|
||||
@@ -60,7 +60,7 @@ configure_package_config_file(cmake/Config.cmake
|
||||
|
||||
# jsoncons is header-only and does not depend on the architecture.
|
||||
|
||||
-if (${CMAKE_VERSION} VERSION_LESS "3.14.0")
|
||||
+if (CMAKE_VERSION VERSION_LESS "3.14.0")
|
||||
write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
|
||||
VERSION ${${PROJECT_NAME}_VERSION}
|
||||
COMPATIBILITY AnyNewerVersion)
|
||||
--- a/examples/build/cmake/CMakeLists.txt
|
||||
+++ b/examples/build/cmake/CMakeLists.txt
|
||||
@@ -3,7 +3,7 @@
|
||||
# jsoncons examples CMake file
|
||||
#
|
||||
|
||||
-cmake_minimum_required (VERSION 2.8)
|
||||
+cmake_minimum_required(VERSION 3.5...3.14)
|
||||
|
||||
# load global config
|
||||
include (../../build/cmake/Config.cmake)
|
||||
@@ -27,7 +27,7 @@ foreach(example_file ${Example_sources})
|
||||
# Create an executable with the example name and file
|
||||
add_executable(${example_name} ${example_file})
|
||||
|
||||
- if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
|
||||
+ if ((CMAKE_SYSTEM_NAME STREQUAL "Linux") AND (CMAKE_CXX_COMPILER_ID STREQUAL "Clang"))
|
||||
# special link option on Linux because llvm stl rely on GNU stl
|
||||
target_link_libraries(${example_name} -Wl,-lstdc++)
|
||||
endif()
|
||||
--- a/test/CMakeLists.txt
|
||||
+++ b/test/CMakeLists.txt
|
||||
@@ -50,7 +50,7 @@ set(JSONCONS_THIRD_PARTY_INCLUDE_DIR ${JSONCONS_TESTS_DIR}/thirdparty)
|
||||
set(CATCH_INCLUDE_DIR ${JSONCONS_THIRD_PARTY_INCLUDE_DIR}/catch)
|
||||
add_library(catch INTERFACE)
|
||||
|
||||
-if (${CMAKE_VERSION} VERSION_LESS "3.8.0")
|
||||
+if (CMAKE_VERSION VERSION_LESS "3.8.0")
|
||||
target_compile_features(catch INTERFACE cxx_range_for) # for C++11 - flags
|
||||
else()
|
||||
target_compile_features(catch INTERFACE cxx_std_11)
|
||||
@@ -198,7 +198,7 @@ add_executable(unit_tests
|
||||
corelib/src/testmain.cpp
|
||||
)
|
||||
|
||||
-if (${CMAKE_VERSION} VERSION_LESS "3.8.0")
|
||||
+if (CMAKE_VERSION VERSION_LESS "3.8.0")
|
||||
target_compile_features(unit_tests INTERFACE cxx_range_for) # for C++11 - flags
|
||||
else()
|
||||
target_compile_features(unit_tests INTERFACE cxx_std_11)
|
||||
@@ -1,45 +0,0 @@
|
||||
https://github.com/danielaparker/jsoncons/pull/629
|
||||
|
||||
Export cmake as jsoncons::jsoncons
|
||||
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -45,6 +45,7 @@ install(TARGETS jsoncons
|
||||
|
||||
# Makes the project importable from the build directory
|
||||
export(EXPORT ${PROJECT_NAME}-targets
|
||||
+ NAMESPACE jsoncons::
|
||||
FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Targets.cmake")
|
||||
|
||||
install(DIRECTORY ${JSONCONS_INCLUDE_DIR}/jsoncons
|
||||
@@ -75,5 +76,6 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
|
||||
DESTINATION ${JSONCONS_CMAKECONFIG_INSTALL_DIR})
|
||||
install(EXPORT ${PROJECT_NAME}-targets
|
||||
FILE ${PROJECT_NAME}Targets.cmake
|
||||
+ NAMESPACE jsoncons::
|
||||
DESTINATION ${JSONCONS_CMAKECONFIG_INSTALL_DIR})
|
||||
|
||||
--- a/cmake/Config.cmake
|
||||
+++ b/cmake/Config.cmake
|
||||
@@ -1,5 +1,8 @@
|
||||
# jsoncons cmake module
|
||||
-# This module sets the following variables in your project::
|
||||
+#
|
||||
+# This module adds target jsoncons::jsoncons
|
||||
+#
|
||||
+# It also sets the following variables in your project:
|
||||
#
|
||||
# jsoncons_FOUND - true if jsoncons found on the system
|
||||
# jsoncons_INCLUDE_DIRS - the directory containing jsoncons headers
|
||||
@@ -7,7 +10,9 @@
|
||||
|
||||
@PACKAGE_INIT@
|
||||
|
||||
-if(NOT TARGET @PROJECT_NAME@)
|
||||
+if(NOT TARGET @PROJECT_NAME@::@PROJECT_NAME@)
|
||||
include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
|
||||
- get_target_property(@PROJECT_NAME@_INCLUDE_DIRS jsoncons INTERFACE_INCLUDE_DIRECTORIES)
|
||||
+ get_target_property(@PROJECT_NAME@_INCLUDE_DIRS jsoncons::jsoncons INTERFACE_INCLUDE_DIRECTORIES)
|
||||
+ # For compatibility with older versions
|
||||
+ add_library(@PROJECT_NAME@ ALIAS @PROJECT_NAME@::@PROJECT_NAME@)
|
||||
endif()
|
||||
@@ -1,14 +0,0 @@
|
||||
Fix error: ‘c’ may be used uninitialized [-Werror=maybe-uninitialized]
|
||||
https://github.com/danielaparker/jsoncons/pull/628
|
||||
|
||||
--- a/include/jsoncons/source.hpp
|
||||
+++ b/include/jsoncons/source.hpp
|
||||
@@ -767,7 +767,7 @@ namespace jsoncons {
|
||||
std::size_t actual = 0;
|
||||
while (actual < n)
|
||||
{
|
||||
- typename Source::value_type c;
|
||||
+ typename Source::value_type c{};
|
||||
if (source.read(&c,1) != 1)
|
||||
{
|
||||
break;
|
||||
@@ -1,14 +0,0 @@
|
||||
https://github.com/danielaparker/jsoncons/pull/629
|
||||
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -51,8 +51,7 @@ install(DIRECTORY ${JSONCONS_INCLUDE_DIR}/jsoncons
|
||||
${JSONCONS_INCLUDE_DIR}/jsoncons_ext
|
||||
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
|
||||
|
||||
-# GNUInstallDirs "DATADIR" wrong here; CMake search path wants "share".
|
||||
-set(JSONCONS_CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}" CACHE STRING "install path for jsonconsConfig.cmake")
|
||||
+set(JSONCONS_CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/cmake/${PROJECT_NAME}" CACHE STRING "install path for jsonconsConfig.cmake")
|
||||
|
||||
configure_package_config_file(cmake/Config.cmake
|
||||
"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
|
||||
22
dev-cpp/jsoncons/files/jsoncons-1.4.0-uninit.patch
Normal file
22
dev-cpp/jsoncons/files/jsoncons-1.4.0-uninit.patch
Normal file
@@ -0,0 +1,22 @@
|
||||
https://github.com/danielaparker/jsoncons/pull/636
|
||||
|
||||
--- a/test/corelib/src/json_as_tests.cpp
|
||||
+++ b/test/corelib/src/json_as_tests.cpp
|
||||
@@ -108,7 +108,7 @@ TEST_CASE("json::as<__int128>()")
|
||||
{
|
||||
std::string s1 = "-18446744073709551617";
|
||||
|
||||
- __int128 n;
|
||||
+ __int128 n{};
|
||||
auto result = jsoncons::utility::dec_to_integer(s1.data(),s1.size(), n);
|
||||
REQUIRE(result.ec == std::errc());
|
||||
|
||||
@@ -129,7 +129,7 @@ TEST_CASE("json::as<unsigned __int128>()")
|
||||
{
|
||||
std::string s1 = "18446744073709551616";
|
||||
|
||||
- unsigned __int128 n;
|
||||
+ unsigned __int128 n{};
|
||||
|
||||
auto result = jsoncons::utility::dec_to_integer(s1.data(),s1.size(), n);
|
||||
REQUIRE(result.ec == std::errc());
|
||||
@@ -16,10 +16,7 @@ IUSE="test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${P}"-uninitialized.patch
|
||||
"${FILESDIR}/${P}"-cmake4.patch
|
||||
"${FILESDIR}/${P}"-usrshare.patch
|
||||
"${FILESDIR}/${P}"-namespace.patch
|
||||
"${FILESDIR}"/${P}-uninit.patch
|
||||
)
|
||||
|
||||
DOCS=( doc )
|
||||
Reference in New Issue
Block a user