[gentoo-commits] repo/gentoo:master commit in: dev-cpp/yaml-cpp/, dev-cpp/yaml-cpp/files/
commit: 882e8fa099eb67325c4e70753ec5cbc8dcb0e441
Author: Alexey Sokolov asokolov org>
AuthorDate: Fri Feb 13 08:19:01 2026 +
Commit: Sam James gentoo org>
CommitDate: Sat Feb 14 03:59:19 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=882e8fa0
dev-cpp/yaml-cpp: use C++17
dev-cpp/gtest-1.17.0 requires that
Closes: https://bugs.gentoo.org/970002
Signed-off-by: Alexey Sokolov asokolov.org>
Part-of: https://codeberg.org/gentoo/gentoo/pulls/47
Merges: https://codeberg.org/gentoo/gentoo/pulls/47
Signed-off-by: Sam James gentoo.org>
dev-cpp/yaml-cpp/files/yaml-cpp-0.9.0-cxxstd.patch | 6 +++---
.../yaml-cpp/{yaml-cpp-0.9.0.ebuild => yaml-cpp-0.9.0-r1.ebuild}| 0
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-cpp/yaml-cpp/files/yaml-cpp-0.9.0-cxxstd.patch
b/dev-cpp/yaml-cpp/files/yaml-cpp-0.9.0-cxxstd.patch
index d017b11d0ac1..b499af84e6c9 100644
--- a/dev-cpp/yaml-cpp/files/yaml-cpp-0.9.0-cxxstd.patch
+++ b/dev-cpp/yaml-cpp/files/yaml-cpp-0.9.0-cxxstd.patch
@@ -1,4 +1,4 @@
-dev-cpp/gtest requires c++ 14+
+dev-cpp/gtest requires c++ 17+
https://github.com/jbeder/yaml-cpp/pull/1374
--- a/CMakeLists.txt
@@ -8,7 +8,7 @@ https://github.com/jbeder/yaml-cpp/pull/1374
set_target_properties(yaml-cpp
PROPERTIES
- CXX_STANDARD 11)
-+ CXX_STANDARD 14)
++ CXX_STANDARD 17)
endif()
if(YAML_CPP_MAIN_PROJECT)
@@ -19,7 +19,7 @@ https://github.com/jbeder/yaml-cpp/pull/1374
set_property(TARGET yaml-cpp-tests PROPERTY CXX_STANDARD_REQUIRED ON)
if (NOT DEFINED CMAKE_CXX_STANDARD)
- set_target_properties(yaml-cpp-tests PROPERTIES CXX_STANDARD 11)
-+ set_target_properties(yaml-cpp-tests PROPERTIES CXX_STANDARD 14)
++ set_target_properties(yaml-cpp-tests PROPERTIES CXX_STANDARD 17)
endif()
diff --git a/dev-cpp/yaml-cpp/yaml-cpp-0.9.0.ebuild
b/dev-cpp/yaml-cpp/yaml-cpp-0.9.0-r1.ebuild
similarity index 100%
rename from dev-cpp/yaml-cpp/yaml-cpp-0.9.0.ebuild
rename to dev-cpp/yaml-cpp/yaml-cpp-0.9.0-r1.ebuild
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/yaml-cpp/, dev-cpp/yaml-cpp/files/
commit: e656d574ba853360e648fa22aabe26283cf81552
Author: Alexey Sokolov asokolov org>
AuthorDate: Wed Feb 11 08:32:25 2026 +
Commit: Sam James gentoo org>
CommitDate: Fri Feb 13 00:35:28 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e656d574
dev-cpp/yaml-cpp: add 0.9.0
Signed-off-by: Alexey Sokolov asokolov.org>
Part-of: https://codeberg.org/gentoo/gentoo/pulls/41
Merges: https://codeberg.org/gentoo/gentoo/pulls/41
Signed-off-by: Sam James gentoo.org>
dev-cpp/yaml-cpp/Manifest | 1 +
.../yaml-cpp/files/yaml-cpp-0.9.0-cmakever.patch | 10 +
dev-cpp/yaml-cpp/files/yaml-cpp-0.9.0-cxxstd.patch | 25
.../yaml-cpp/files/yaml-cpp-0.9.0-precision.patch | 24
dev-cpp/yaml-cpp/yaml-cpp-0.9.0.ebuild | 45 ++
5 files changed, 105 insertions(+)
diff --git a/dev-cpp/yaml-cpp/Manifest b/dev-cpp/yaml-cpp/Manifest
index 0be9ed4f7b7a..28650589cdf8 100644
--- a/dev-cpp/yaml-cpp/Manifest
+++ b/dev-cpp/yaml-cpp/Manifest
@@ -1 +1,2 @@
DIST yaml-cpp-0.8.0.gh.tar.gz 1017151 BLAKE2B
5fd3eaec06bc04215afd2aa14ae8cd35f829f700f104931a51dbd8bb22e4e87f5cd5f2f975d3a2f464226d7165d3d106aa17bc7eab8a812c2545d2212011cf11
SHA512
aae9d618f906117d620d63173e95572c738db518f4ff1901a06de2117d8deeb8045f554102ca0ba4735ac0c4d060153a938ef78da3e0da3406d27b8298e5f38e
+DIST yaml-cpp-0.9.0.tar.gz 1056093 BLAKE2B
c686fa5d51e9f28eea191647385e2cdef1269ad5dd361fe876b18bf45f85dd1872f4a30b6abe1cdcb534793c16bd9073ee5fb14fb8940885163a1ce0643f8068
SHA512
59f730e8c5744f1ccd542c1144db8d4d949012f72aab0b84ba4a818db25a0f847569b61238ab72ed5b0b2e9482b8d5007651b7185f4ca9e99045d5160259b565
diff --git a/dev-cpp/yaml-cpp/files/yaml-cpp-0.9.0-cmakever.patch
b/dev-cpp/yaml-cpp/files/yaml-cpp-0.9.0-cmakever.patch
new file mode 100644
index ..0d6b98dc273a
--- /dev/null
+++ b/dev-cpp/yaml-cpp/files/yaml-cpp-0.9.0-cmakever.patch
@@ -0,0 +1,10 @@
+https://github.com/jbeder/yaml-cpp/pull/1400
+
+--- a/test/cmake/CMakeLists.txt
b/test/cmake/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.5)
++cmake_minimum_required(VERSION 3.5...3.30)
+ project(yaml-cpp-consumer LANGUAGES CXX)
+
+ find_package(yaml-cpp CONFIG REQUIRED)
diff --git a/dev-cpp/yaml-cpp/files/yaml-cpp-0.9.0-cxxstd.patch
b/dev-cpp/yaml-cpp/files/yaml-cpp-0.9.0-cxxstd.patch
new file mode 100644
index ..d017b11d0ac1
--- /dev/null
+++ b/dev-cpp/yaml-cpp/files/yaml-cpp-0.9.0-cxxstd.patch
@@ -0,0 +1,25 @@
+dev-cpp/gtest requires c++ 14+
+https://github.com/jbeder/yaml-cpp/pull/1374
+
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -105,7 +105,7 @@ target_include_directories(yaml-cpp
+ if (NOT DEFINED CMAKE_CXX_STANDARD)
+ set_target_properties(yaml-cpp
+ PROPERTIES
+- CXX_STANDARD 11)
++ CXX_STANDARD 14)
+ endif()
+
+ if(YAML_CPP_MAIN_PROJECT)
+--- a/test/CMakeLists.txt
b/test/CMakeLists.txt
+@@ -49,7 +49,7 @@ target_link_libraries(yaml-cpp-tests
+
+ set_property(TARGET yaml-cpp-tests PROPERTY CXX_STANDARD_REQUIRED ON)
+ if (NOT DEFINED CMAKE_CXX_STANDARD)
+- set_target_properties(yaml-cpp-tests PROPERTIES CXX_STANDARD 11)
++ set_target_properties(yaml-cpp-tests PROPERTIES CXX_STANDARD 14)
+ endif()
+
+
diff --git a/dev-cpp/yaml-cpp/files/yaml-cpp-0.9.0-precision.patch
b/dev-cpp/yaml-cpp/files/yaml-cpp-0.9.0-precision.patch
new file mode 100644
index ..8fecc8c28aa1
--- /dev/null
+++ b/dev-cpp/yaml-cpp/files/yaml-cpp-0.9.0-precision.patch
@@ -0,0 +1,24 @@
+https://github.com/jbeder/yaml-cpp/pull/1401
+
+From 8d58b447fa7cafc3b9fdb5d4ca3e80239c98 Mon Sep 17 00:00:00 2001
+From: Simon Gene Gottlieb
+Date: Wed, 11 Feb 2026 17:55:43 +0100
+Subject: [PATCH] fix: floating point conversion on x86 (32bit)
+
+---
+ src/fptostring.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/fptostring.cpp b/src/fptostring.cpp
+index e1722aeed..9176d73bd 100644
+--- a/src/fptostring.cpp
b/src/fptostring.cpp
+@@ -28,7 +28,7 @@ namespace fp_formatting {
+ * assert(buffer[1] == '2');
+ * assert(buffer[2] == '3');
+ */
+-int ConvertToChars(char* begin, char* end, size_t value, int width=1) {
++int ConvertToChars(char* begin, char* end, uint64_t value, int width=1) {
+ // precondition of this function (will trigger in debug build)
+ assert(width >= 1);
+ assert(end >= begin); // end must be after begin
diff --git a/dev-cpp/yaml-cpp/yaml-cpp-0.9.0.ebuild
b/dev-cpp/yaml-cpp/yaml-cpp-0.9.0.ebuild
new file mode 100644
index ..e9ac46d80afb
--- /dev/null
+++ b/dev-cpp/yaml-cpp/yaml-cpp-0.9.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+DESCRIPTION="YAML parser and emitter in C++"
+HOMEPAGE="https://github.com/jbeder/yaml-cpp";
+SRC_URI="https://github.com/jbeder/yaml-cpp/archive/refs/tags/${P}.tar.gz";
+S="${WORKDIR}/yaml-cpp-${P}"
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/yaml-cpp/, dev-cpp/yaml-cpp/files/
commit: dfc84bb7d79341ba76b9ae8be41883eea5b5a577
Author: Alexey Sokolov asokolov org>
AuthorDate: Wed Feb 11 00:47:16 2026 +
Commit: Sam James gentoo org>
CommitDate: Fri Feb 13 00:35:27 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfc84bb7
dev-cpp/yaml-cpp: drop 0.8.0-r1
Signed-off-by: Alexey Sokolov asokolov.org>
Part-of: https://codeberg.org/gentoo/gentoo/pulls/41
Signed-off-by: Sam James gentoo.org>
dev-cpp/yaml-cpp/files/yaml-cpp-0.8.0-cmake.patch | 32
dev-cpp/yaml-cpp/yaml-cpp-0.8.0-r1.ebuild | 37 ---
2 files changed, 69 deletions(-)
diff --git a/dev-cpp/yaml-cpp/files/yaml-cpp-0.8.0-cmake.patch
b/dev-cpp/yaml-cpp/files/yaml-cpp-0.8.0-cmake.patch
deleted file mode 100644
index 52c6321983d7..
--- a/dev-cpp/yaml-cpp/files/yaml-cpp-0.8.0-cmake.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://bugs.gentoo.org/951842
-https://github.com/jbeder/yaml-cpp/pull/1211
-
-From 8153a1add19018f65527faad3c4d3941705baf39 Mon Sep 17 00:00:00 2001
-From: Craig Scott
-Date: Wed, 16 Aug 2023 15:55:44 +1000
-Subject: [PATCH] Specify CMake policy range to avoid deprecation warning
-
-CMake 3.27 started issuing a deprecation warning for any
-cmake_minimum_required() call that specified a minimum
-version older than 3.5. Specifying a version range instead of
-a simple minimum version avoids that warning without
-raising the minimum supported CMake version. The NEW
-policy behavior will be used for all policies introduced up to
-CMake 3.14 with this change.
- CMakeLists.txt | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 46dc18059..1ae92e2b7 100644
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,5 +1,6 @@
--# 3.5 is actually available almost everywhere, but this a good minimum
--cmake_minimum_required(VERSION 3.4)
-+# 3.5 is actually available almost everywhere, but this a good minimum.
-+# 3.14 as the upper policy limit avoids CMake deprecation warnings.
-+cmake_minimum_required(VERSION 3.4...3.14)
-
- # enable MSVC_RUNTIME_LIBRARY target property
- # see https://cmake.org/cmake/help/latest/policy/CMP0091.html
diff --git a/dev-cpp/yaml-cpp/yaml-cpp-0.8.0-r1.ebuild
b/dev-cpp/yaml-cpp/yaml-cpp-0.8.0-r1.ebuild
deleted file mode 100644
index 9b71a0395c63..
--- a/dev-cpp/yaml-cpp/yaml-cpp-0.8.0-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib
-
-DESCRIPTION="YAML parser and emitter in C++"
-HOMEPAGE="https://github.com/jbeder/yaml-cpp";
-SRC_URI="https://github.com/jbeder/yaml-cpp/archive/refs/tags/${PV}.tar.gz ->
${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/0.8"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )
-"
-
-PATCHES=(
- "${FILESDIR}/yaml-cpp-0.8.0-gtest.patch"
- "${FILESDIR}/yaml-cpp-0.8.0-gcc13.patch"
- "${FILESDIR}/yaml-cpp-0.8.0-include-cstdint.patch"
- "${FILESDIR}/yaml-cpp-0.8.0-cmake.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- -DYAML_BUILD_SHARED_LIBS=ON
- -DYAML_CPP_BUILD_TOOLS=OFF # Don't have install rule
- -DYAML_CPP_BUILD_TESTS=$(usex test)
- )
-
- cmake-multilib_src_configure
-}
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/yaml-cpp/, dev-cpp/yaml-cpp/files/
commit: ec77c6c33372c246d066bc4aed7954c9d51ea466
Author: Alexey Sokolov asokolov org>
AuthorDate: Mon Feb 10 23:53:15 2025 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Feb 11 20:54:21 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec77c6c3
dev-cpp/yaml-cpp: drop 0.7.0-r2
Signed-off-by: Alexey Sokolov asokolov.org>
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-cpp/yaml-cpp/Manifest | 1 -
.../files/yaml-cpp-0.7.0-cmake-paths.patch | 101 -
dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-gtest.patch | 33 ---
.../files/yaml-cpp-0.7.0-install-paths.patch | 25 -
dev-cpp/yaml-cpp/yaml-cpp-0.7.0-r2.ebuild | 35 ---
5 files changed, 195 deletions(-)
diff --git a/dev-cpp/yaml-cpp/Manifest b/dev-cpp/yaml-cpp/Manifest
index 13de371c236a..0be9ed4f7b7a 100644
--- a/dev-cpp/yaml-cpp/Manifest
+++ b/dev-cpp/yaml-cpp/Manifest
@@ -1,2 +1 @@
-DIST yaml-cpp-0.7.0.tar.gz 1033237 BLAKE2B
69a11a8503ad607aa0d54912a5e53d305a643fe2d36dd86fa96832e3d4930b39a85318dc130e438210a9ca60357f3aa9aa6cd0f2b6bc45728b648c545a437368
SHA512
2de0f0ec8f003cd3c498d571cda7a796bf220517bad2dc02cba70c522e398f33cf1ad20da251adaacb2a07b77844111f297e99d45a7c46ebc01706bbafb5
DIST yaml-cpp-0.8.0.gh.tar.gz 1017151 BLAKE2B
5fd3eaec06bc04215afd2aa14ae8cd35f829f700f104931a51dbd8bb22e4e87f5cd5f2f975d3a2f464226d7165d3d106aa17bc7eab8a812c2545d2212011cf11
SHA512
aae9d618f906117d620d63173e95572c738db518f4ff1901a06de2117d8deeb8045f554102ca0ba4735ac0c4d060153a938ef78da3e0da3406d27b8298e5f38e
diff --git a/dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-cmake-paths.patch
b/dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-cmake-paths.patch
deleted file mode 100644
index 5ad9e46dbcb2..
--- a/dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-cmake-paths.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From d5d68286cdd983f99f88b6141a3c34d3bf633d98 Mon Sep 17 00:00:00 2001
-From: Felix Schwitzer
-Date: Fri, 1 Apr 2022 05:26:47 +0200
-Subject: [PATCH] Fix CMake export files (#1077)
-
-After configuring the file `yaml-cpp-config.cmake.in`, the result ends up with
-empty variables. (see also the discussion in #774).
-
-Rework this file and the call to `configure_package_config_file` according the
-cmake documentation
-(https://cmake.org/cmake/help/v3.22/module/CMakePackageConfigHelpers.html?highlight=configure_package_config#command:configure_package_config_file)
-to overcome this issue and allow a simple `find_package` after install.
-
-As there was some discussion about the place where to install the
-`yaml-cpp-config.cmake` file, e.g. #1055, factor out the install location into
-an extra variable to make it easier changing this location in the future.
-
-Also untabify CMakeLists.txt in some places to align with the other code parts
in this file.
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -127,10 +127,16 @@ set_target_properties(yaml-cpp PROPERTIES
- PROJECT_LABEL "yaml-cpp ${yaml-cpp-label-postfix}"
- DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}")
-
-+# FIXME(felix2012): A more common place for the cmake export would be
-+# `CMAKE_INSTALL_LIBDIR`, as e.g. done in ubuntu or in this project for GTest
-+set(CONFIG_EXPORT_DIR "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp")
-+set(EXPORT_TARGETS yaml-cpp)
- configure_package_config_file(
- "${PROJECT_SOURCE_DIR}/yaml-cpp-config.cmake.in"
- "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake"
-- INSTALL_DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp")
-+ INSTALL_DESTINATION "${CONFIG_EXPORT_DIR}"
-+ PATH_VARS CMAKE_INSTALL_INCLUDEDIR CONFIG_EXPORT_DIR)
-+unset(EXPORT_TARGETS)
-
- write_basic_package_version_file(
- "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake"
-@@ -139,30 +145,31 @@ write_basic_package_version_file(
- configure_file(yaml-cpp.pc.in yaml-cpp.pc @ONLY)
-
- if (YAML_CPP_INSTALL)
-- install(TARGETS yaml-cpp
-+ install(TARGETS yaml-cpp
- EXPORT yaml-cpp-targets
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-- install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/
-+ install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-- FILES_MATCHING PATTERN "*.h")
-+FILES_MATCHING PATTERN "*.h")
- install(EXPORT yaml-cpp-targets
--DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp")
-- install(FILES
-- "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake"
-- "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake"
--DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp")
-+DESTINATION "${CONFIG_EXPORT_DIR}")
-+ install(FILES
-+ "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake"
-+ "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake"
-+DESTINATION "${CONFIG_EXPORT_DIR}")
- install(FILES "${PROJECT_BINARY_DIR}/yaml-cpp.pc"
- DESTINATION ${CMAKE_INSTALL_D
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/yaml-cpp/, dev-cpp/yaml-cpp/files/
commit: 75c4eaca10479779ec6ef97d4f583d49e808ccfe
Author: Christopher Fore posteo net>
AuthorDate: Thu Aug 15 13:59:39 2024 +
Commit: Sam James gentoo org>
CommitDate: Thu Aug 15 14:06:25 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75c4eaca
dev-cpp/yaml-cpp: Fix compilation on GCC 15
- Include patch from upstream PR (refer to patch file)
- Tests pass
Closes: https://bugs.gentoo.org/937412
Signed-off-by: Christopher Fore posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/38163
Signed-off-by: Sam James gentoo.org>
.../files/yaml-cpp-0.8.0-include-cstdint.patch | 33 ++
dev-cpp/yaml-cpp/yaml-cpp-0.8.0.ebuild | 3 +-
2 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/dev-cpp/yaml-cpp/files/yaml-cpp-0.8.0-include-cstdint.patch
b/dev-cpp/yaml-cpp/files/yaml-cpp-0.8.0-include-cstdint.patch
new file mode 100644
index ..d017b43fa440
--- /dev/null
+++ b/dev-cpp/yaml-cpp/files/yaml-cpp-0.8.0-include-cstdint.patch
@@ -0,0 +1,33 @@
+https://github.com/jbeder/yaml-cpp/pull/1310
+
+From: Christopher Fore
+Date: Wed, 14 Aug 2024 21:02:32 -0400
+Subject: [PATCH] emitterutils: Explicitly include
+
+GCC 15 will no longer include it by default, resulting in build
+failures in projects that do not explicitly include it.
+
+Error:
+src/emitterutils.cpp:221:11: error: 'uint16_t' was not declared in this scope
+ 221 | std::pair EncodeUTF16SurrogatePair(int codePoint) {
+ | ^~~~
+src/emitterutils.cpp:13:1: note: 'uint16_t' is defined in header '';
+this is probably fixable by adding '#include '
+ 12 | #include "yaml-cpp/null.h"
+ +++ |+#include
+ 13 | #include "yaml-cpp/ostream_wrapper.h"
+
+Tests pass.
+
+Closes: #1307
+See-also: https://gcc.gnu.org/pipermail/gcc-cvs/2024-August/407124.html
+See-also: https://bugs.gentoo.org/937412
+Signed-off-by: Christopher Fore
+--- a/src/emitterutils.cpp
b/src/emitterutils.cpp
+@@ -1,4 +1,5 @@
+ #include
++#include
+ #include
+ #include
+
diff --git a/dev-cpp/yaml-cpp/yaml-cpp-0.8.0.ebuild
b/dev-cpp/yaml-cpp/yaml-cpp-0.8.0.ebuild
index dc3a8a58c33c..5691f9d3a803 100644
--- a/dev-cpp/yaml-cpp/yaml-cpp-0.8.0.ebuild
+++ b/dev-cpp/yaml-cpp/yaml-cpp-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -22,6 +22,7 @@ DEPEND="
PATCHES=(
"${FILESDIR}/yaml-cpp-0.8.0-gtest.patch"
"${FILESDIR}/yaml-cpp-0.8.0-gcc13.patch"
+ "${FILESDIR}/yaml-cpp-0.8.0-include-cstdint.patch"
)
src_configure() {
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/yaml-cpp/, dev-cpp/yaml-cpp/files/
commit: d0123068321625c68be5c1c2a1010408eae388af
Author: Alexey Sokolov asokolov org>
AuthorDate: Sun Nov 12 11:00:15 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Mon Nov 13 10:17:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0123068
dev-cpp/yaml-cpp: fix test build
Closes: https://bugs.gentoo.org/917243
Signed-off-by: Alexey Sokolov asokolov.org>
Closes: https://github.com/gentoo/gentoo/pull/33777
Signed-off-by: Arthur Zamarin gentoo.org>
dev-cpp/yaml-cpp/files/yaml-cpp-0.8.0-gcc13.patch | 32 +++
dev-cpp/yaml-cpp/yaml-cpp-0.8.0.ebuild| 1 +
2 files changed, 33 insertions(+)
diff --git a/dev-cpp/yaml-cpp/files/yaml-cpp-0.8.0-gcc13.patch
b/dev-cpp/yaml-cpp/files/yaml-cpp-0.8.0-gcc13.patch
new file mode 100644
index ..f024b797eb47
--- /dev/null
+++ b/dev-cpp/yaml-cpp/files/yaml-cpp-0.8.0-gcc13.patch
@@ -0,0 +1,32 @@
+Fix test https://bugs.gentoo.org/917243
+
+From fcbb8193b94921e058be7b563aea053531e5b2d9 Mon Sep 17 00:00:00 2001
+From: Gianfranco Costamagna
+Date: Sat, 19 Aug 2023 21:36:16 +0200
+Subject: [PATCH] Fix testsuite with gcc-13 (#1216)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+cd /<>/build-static/test && /usr/bin/c++ -DYAML_CPP_STATIC_DEFINE
-I/<>/test/integration -I/<>/test
-I/<>/src -I/<>/include -isystem
/usr/src/googletest/googlemock/include -isystem /usr/src/googletest/googlemock
-isystem /usr/src/googletest/googletest/include -isystem
/usr/src/googletest/googletest -g -O2 -ffile-prefix-map=/<>=.
-flto=auto -ffat-lto-objects -fstack-protector-strong -Wformat
-Werror=format-security
-fdebug-prefix-map=/<>=/usr/src/yaml-cpp-0.8.0+dfsg-1~build1
-Wdate-time -D_FORTIFY_SOURCE=2 -std=gnu++14 -Wno-variadic-macros
-Wno-sign-compare -DGTEST_HAS_PTHREAD=1 -MD -MT
test/CMakeFiles/yaml-cpp-tests.dir/binary_test.cpp.o -MF
CMakeFiles/yaml-cpp-tests.dir/binary_test.cpp.o.d -o
CMakeFiles/yaml-cpp-tests.dir/binary_test.cpp.o -c
/<>/test/binary_test.cpp
+/<>/test/binary_test.cpp: In member function ‘virtual void
BinaryTest_DecodingNoCrashOnNegative_Test::TestBody()’:
+/<>/test/binary_test.cpp:11:38: error: narrowing conversion of
‘-58’ from ‘int’ to ‘char’ [-Wnarrowing]
+ 11 | std::string input{-58, -1, -99, 109};
+ | ^
+---
+ test/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index 351b03f81..c9e7f041b 100644
+--- a/test/CMakeLists.txt
b/test/CMakeLists.txt
+@@ -33,7 +33,7 @@ target_include_directories(yaml-cpp-tests
+ target_compile_options(yaml-cpp-tests
+ PRIVATE
+ $<$:-Wno-c99-extensions -Wno-variadic-macros
-Wno-sign-compare>
+-$<$:-Wno-variadic-macros -Wno-sign-compare>)
++$<$:-Wno-variadic-macros -Wno-sign-compare
-Wno-narrowing>)
+ target_link_libraries(yaml-cpp-tests
+ PRIVATE
+ Threads::Threads
diff --git a/dev-cpp/yaml-cpp/yaml-cpp-0.8.0.ebuild
b/dev-cpp/yaml-cpp/yaml-cpp-0.8.0.ebuild
index ec6c6b7a8293..3c11b51f1f10 100644
--- a/dev-cpp/yaml-cpp/yaml-cpp-0.8.0.ebuild
+++ b/dev-cpp/yaml-cpp/yaml-cpp-0.8.0.ebuild
@@ -21,6 +21,7 @@ DEPEND="
PATCHES=(
"${FILESDIR}/yaml-cpp-0.8.0-gtest.patch"
+ "${FILESDIR}/yaml-cpp-0.8.0-gcc13.patch"
)
src_configure() {
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/yaml-cpp/, dev-cpp/yaml-cpp/files/
commit: 0d49a5b9a45d38855f22195dae1a776abb732a19
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Aug 14 21:03:01 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Aug 19 08:13:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d49a5b9
dev-cpp/yaml-cpp: drop 0.6.3-r3, 0.6.3-r4
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-cpp/yaml-cpp/Manifest | 1 -
.../files/yaml-cpp-0.6.3-CVE-2017-11692.patch | 44 --
.../files/yaml-cpp-0.6.3-abi-breakage.patch| 57
.../files/yaml-cpp-0.6.3-fix-overflows.patch | 149 -
dev-cpp/yaml-cpp/files/yaml-cpp-0.6.3-gtest.patch | 44 --
dev-cpp/yaml-cpp/yaml-cpp-0.6.3-r3.ebuild | 49 ---
dev-cpp/yaml-cpp/yaml-cpp-0.6.3-r4.ebuild | 46 ---
7 files changed, 390 deletions(-)
diff --git a/dev-cpp/yaml-cpp/Manifest b/dev-cpp/yaml-cpp/Manifest
index 88f602e7f4ee..d18739367bdc 100644
--- a/dev-cpp/yaml-cpp/Manifest
+++ b/dev-cpp/yaml-cpp/Manifest
@@ -1,2 +1 @@
-DIST yaml-cpp-0.6.3.tar.gz 1398768 BLAKE2B
07abe1c56740105a0af2335bb1cd48086cb614d9d04c61342e53788bfb043fd7eb2629e441a0a5be50898b288f3526f1707c5fdf1d734395b6450c3103773b14
SHA512
68b9ce987cabc1dec79382f922de20cc2c222cb9c090ecb93dc686b048da5c917facf4fce6d8f72feea44b61e5a6770ed3b0c199c4cd4e6bde5b6245c09f8e49
DIST yaml-cpp-0.7.0.tar.gz 1033237 BLAKE2B
69a11a8503ad607aa0d54912a5e53d305a643fe2d36dd86fa96832e3d4930b39a85318dc130e438210a9ca60357f3aa9aa6cd0f2b6bc45728b648c545a437368
SHA512
2de0f0ec8f003cd3c498d571cda7a796bf220517bad2dc02cba70c522e398f33cf1ad20da251adaacb2a07b77844111f297e99d45a7c46ebc01706bbafb5
diff --git a/dev-cpp/yaml-cpp/files/yaml-cpp-0.6.3-CVE-2017-11692.patch
b/dev-cpp/yaml-cpp/files/yaml-cpp-0.6.3-CVE-2017-11692.patch
deleted file mode 100644
index fd7a7198c1c6..
--- a/dev-cpp/yaml-cpp/files/yaml-cpp-0.6.3-CVE-2017-11692.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From c9460110e072df84b7dee3eb651f2ec5df75fb18 Mon Sep 17 00:00:00 2001
-From: Jesse Beder
-Date: Mon, 20 Jan 2020 18:05:15 -0600
-Subject: [PATCH] Fix reading empty token stack with a node with properties but
- no scalar.
-
-E.g. `!2`.
- src/singledocparser.cpp | 6 ++
- test/integration/load_node_test.cpp | 5 +
- 2 files changed, 11 insertions(+)
-
-diff --git a/src/singledocparser.cpp b/src/singledocparser.cpp
-index 52544dd6..47e9e047 100644
a/src/singledocparser.cpp
-+++ b/src/singledocparser.cpp
-@@ -79,6 +79,12 @@ void SingleDocParser::HandleNode(EventHandler&
eventHandler) {
- if (!anchor_name.empty())
- eventHandler.OnAnchor(mark, anchor_name);
-
-+ // after parsing properties, an empty node is again a possibility
-+ if (m_scanner.empty()) {
-+eventHandler.OnNull(mark, anchor);
-+return;
-+ }
-+
- const Token& token = m_scanner.peek();
-
- if (token.type == Token::PLAIN_SCALAR && IsNullString(token.value)) {
-diff --git a/test/integration/load_node_test.cpp
b/test/integration/load_node_test.cpp
-index 4f4f28e8..0e0dd6bc 100644
a/test/integration/load_node_test.cpp
-+++ b/test/integration/load_node_test.cpp
-@@ -257,5 +257,10 @@ TEST(NodeTest, LoadTagWithParenthesis) {
- EXPECT_EQ(node.as(), "foo");
- }
-
-+TEST(NodeTest, LoadTagWithNullScalar) {
-+ Node node = Load("!2");
-+ EXPECT_TRUE(node.IsNull());
-+}
-+
- } // namespace
- } // namespace YAML
diff --git a/dev-cpp/yaml-cpp/files/yaml-cpp-0.6.3-abi-breakage.patch
b/dev-cpp/yaml-cpp/files/yaml-cpp-0.6.3-abi-breakage.patch
deleted file mode 100644
index d9160856c47f..
--- a/dev-cpp/yaml-cpp/files/yaml-cpp-0.6.3-abi-breakage.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-commit f5f288c7622d3547c29a8355b8ccda0155483b79
-Author: Till Hofmann
-Date: Sun Nov 17 22:43:20 2019 +0100
-
-Revert "fix up static, so works as DLL (#559)"
-
-This reverts commit 774f25800e6f19f4b927023c85d1389af322da5e.
-
-diff --git a/include/yaml-cpp/node/detail/node_data.h
b/include/yaml-cpp/node/detail/node_data.h
-index 82fb79a..50bcd74 100644
a/include/yaml-cpp/node/detail/node_data.h
-+++ b/include/yaml-cpp/node/detail/node_data.h
-@@ -81,7 +81,7 @@ class YAML_CPP_API node_data {
- shared_memory_holder pMemory);
-
- public:
-- static const std::string& empty_scalar();
-+ static std::string empty_scalar;
-
- private:
- void compute_seq_size() const;
-diff --git a/include/yaml-cpp/node/impl.h b/include/yaml-cpp/node/impl.h
-index 7a3deac..b363f86 100644
a/include/yaml-cpp/node/impl.h
-+++ b/include/yaml-cpp/node/impl.h
-@@ -166,13 +166,13 @@ inline T Node::as(const S& fallback) const {
- inline const std::string& Node::Scalar() const {
- if (!m_isValid)
- throw InvalidNode(m_invalidKey);
-- return m_pNode ? m_pNode->scalar() : detail::node_data::empty_scalar();
-+ return m_pNode ? m_pNode->scalar() : detail::node_data::empty_scalar;
- }
-
- inline const std::string& Node::T
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/yaml-cpp/, dev-cpp/yaml-cpp/files/
commit: d0a4cd046ad4bd19d294c9770ccc4eec47057683
Author: Alexey Sokolov asokolov org>
AuthorDate: Sat Jul 10 18:23:13 2021 +
Commit: Joonas Niilola gentoo org>
CommitDate: Wed Jul 14 14:32:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0a4cd04
dev-cpp/yaml-cpp: version 0.7.0
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Alexey Sokolov asokolov.org>
Closes: https://github.com/gentoo/gentoo/pull/21585
Signed-off-by: Joonas Niilola gentoo.org>
dev-cpp/yaml-cpp/Manifest | 1 +
dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-gtest.patch | 28
dev-cpp/yaml-cpp/yaml-cpp-0.7.0.ebuild| 40 +++
3 files changed, 69 insertions(+)
diff --git a/dev-cpp/yaml-cpp/Manifest b/dev-cpp/yaml-cpp/Manifest
index 65c478502e0..88f602e7f4e 100644
--- a/dev-cpp/yaml-cpp/Manifest
+++ b/dev-cpp/yaml-cpp/Manifest
@@ -1 +1,2 @@
DIST yaml-cpp-0.6.3.tar.gz 1398768 BLAKE2B
07abe1c56740105a0af2335bb1cd48086cb614d9d04c61342e53788bfb043fd7eb2629e441a0a5be50898b288f3526f1707c5fdf1d734395b6450c3103773b14
SHA512
68b9ce987cabc1dec79382f922de20cc2c222cb9c090ecb93dc686b048da5c917facf4fce6d8f72feea44b61e5a6770ed3b0c199c4cd4e6bde5b6245c09f8e49
+DIST yaml-cpp-0.7.0.tar.gz 1033237 BLAKE2B
69a11a8503ad607aa0d54912a5e53d305a643fe2d36dd86fa96832e3d4930b39a85318dc130e438210a9ca60357f3aa9aa6cd0f2b6bc45728b648c545a437368
SHA512
2de0f0ec8f003cd3c498d571cda7a796bf220517bad2dc02cba70c522e398f33cf1ad20da251adaacb2a07b77844111f297e99d45a7c46ebc01706bbafb5
diff --git a/dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-gtest.patch
b/dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-gtest.patch
new file mode 100644
index 000..45eebb43ffe
--- /dev/null
+++ b/dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-gtest.patch
@@ -0,0 +1,28 @@
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index 5ebc1a6..f02c2bb 100644
+--- a/test/CMakeLists.txt
b/test/CMakeLists.txt
+@@ -1,13 +1,10 @@
+ find_package(Threads REQUIRED)
++find_package(GTest REQUIRED CONFIG)
+
+ set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+ set(BUILD_MOCK ON CACHE BOOL "" FORCE)
+ set(CMAKE_POLICY_DEFAULT_CMP0048 NEW)
+
+-add_subdirectory(
+- "${CMAKE_CURRENT_SOURCE_DIR}/gtest-1.10.0"
+- "${CMAKE_CURRENT_BINARY_DIR}/prefix")
+-
+ include_directories(SYSTEM
"${CMAKE_CURRENT_SOURCE_DIR}/gtest-1.10.0/googletest/include")
+
+ set(test-new-api-pattern "new-api/*.cpp")
+@@ -38,7 +35,7 @@ target_link_libraries(yaml-cpp-tests
+ PRIVATE
+ Threads::Threads
+ yaml-cpp
+-gmock)
++GTest::gmock)
+
+ set_property(TARGET yaml-cpp-tests PROPERTY CXX_STANDARD_REQUIRED ON)
+ if (NOT DEFINED CMAKE_CXX_STANDARD)
diff --git a/dev-cpp/yaml-cpp/yaml-cpp-0.7.0.ebuild
b/dev-cpp/yaml-cpp/yaml-cpp-0.7.0.ebuild
new file mode 100644
index 000..0140ff9a122
--- /dev/null
+++ b/dev-cpp/yaml-cpp/yaml-cpp-0.7.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS="cmake"
+inherit cmake-multilib
+
+DESCRIPTION="YAML parser and emitter in C++"
+HOMEPAGE="https://github.com/jbeder/yaml-cpp";
+SRC_URI="https://github.com/jbeder/yaml-cpp/archive/${P}.tar.gz";
+S="${WORKDIR}/yaml-cpp-${P}"
+
+LICENSE="MIT"
+SLOT="0/0.7"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+ "${FILESDIR}/${P}-gtest.patch"
+)
+
+src_prepare() {
+ rm -r test/gtest-* || die
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DYAML_BUILD_SHARED_LIBS=ON
+ -DYAML_CPP_BUILD_TOOLS=OFF # Don't have install rule
+ -DYAML_CPP_BUILD_TESTS=$(usex test)
+ )
+
+ cmake-multilib_src_configure
+}
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/yaml-cpp/, dev-cpp/yaml-cpp/files/
commit: f506b95e837aebf001b41ed1bcd19bda82d3ee47
Author: Johannes Huber gentoo org>
AuthorDate: Fri Mar 20 11:35:37 2020 +
Commit: Johannes Huber gentoo org>
CommitDate: Fri Mar 20 11:36:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f506b95e
dev-cpp/yaml-cpp: Fix CVE-2017-11692
Bug: https://bugs.gentoo.org/626662
Thanks-to: sam_c (Security Padawan) cmpct.info>
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Johannes Huber gentoo.org>
.../files/yaml-cpp-0.6.3-CVE-2017-11692.patch | 44
dev-cpp/yaml-cpp/yaml-cpp-0.6.3-r2.ebuild | 48 ++
2 files changed, 92 insertions(+)
diff --git a/dev-cpp/yaml-cpp/files/yaml-cpp-0.6.3-CVE-2017-11692.patch
b/dev-cpp/yaml-cpp/files/yaml-cpp-0.6.3-CVE-2017-11692.patch
new file mode 100644
index 000..fd7a7198c1c
--- /dev/null
+++ b/dev-cpp/yaml-cpp/files/yaml-cpp-0.6.3-CVE-2017-11692.patch
@@ -0,0 +1,44 @@
+From c9460110e072df84b7dee3eb651f2ec5df75fb18 Mon Sep 17 00:00:00 2001
+From: Jesse Beder
+Date: Mon, 20 Jan 2020 18:05:15 -0600
+Subject: [PATCH] Fix reading empty token stack with a node with properties but
+ no scalar.
+
+E.g. `!2`.
+---
+ src/singledocparser.cpp | 6 ++
+ test/integration/load_node_test.cpp | 5 +
+ 2 files changed, 11 insertions(+)
+
+diff --git a/src/singledocparser.cpp b/src/singledocparser.cpp
+index 52544dd6..47e9e047 100644
+--- a/src/singledocparser.cpp
b/src/singledocparser.cpp
+@@ -79,6 +79,12 @@ void SingleDocParser::HandleNode(EventHandler&
eventHandler) {
+ if (!anchor_name.empty())
+ eventHandler.OnAnchor(mark, anchor_name);
+
++ // after parsing properties, an empty node is again a possibility
++ if (m_scanner.empty()) {
++eventHandler.OnNull(mark, anchor);
++return;
++ }
++
+ const Token& token = m_scanner.peek();
+
+ if (token.type == Token::PLAIN_SCALAR && IsNullString(token.value)) {
+diff --git a/test/integration/load_node_test.cpp
b/test/integration/load_node_test.cpp
+index 4f4f28e8..0e0dd6bc 100644
+--- a/test/integration/load_node_test.cpp
b/test/integration/load_node_test.cpp
+@@ -257,5 +257,10 @@ TEST(NodeTest, LoadTagWithParenthesis) {
+ EXPECT_EQ(node.as(), "foo");
+ }
+
++TEST(NodeTest, LoadTagWithNullScalar) {
++ Node node = Load("!2");
++ EXPECT_TRUE(node.IsNull());
++}
++
+ } // namespace
+ } // namespace YAML
diff --git a/dev-cpp/yaml-cpp/yaml-cpp-0.6.3-r2.ebuild
b/dev-cpp/yaml-cpp/yaml-cpp-0.6.3-r2.ebuild
new file mode 100644
index 000..db3c4f6dd2d
--- /dev/null
+++ b/dev-cpp/yaml-cpp/yaml-cpp-0.6.3-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS="cmake"
+inherit cmake-multilib
+
+DESCRIPTION="YAML parser and emitter in C++"
+HOMEPAGE="https://github.com/jbeder/yaml-cpp";
+SRC_URI="https://github.com/jbeder/${PN}/archive/${P}.tar.gz";
+
+LICENSE="MIT"
+SLOT="0/0.6"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
~x86-linux"
+IUSE="test"
+
+# test breaks build
+# RESTRICT="!test? ( test )"
+RESTRICT+="test"
+
+DEPEND="test? ( dev-cpp/gtest )"
+
+S="${WORKDIR}/${PN}-${P}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-abi-breakage.patch"
+ "${FILESDIR}/${P}-CVE-2017-11692.patch"
+)
+
+src_prepare() {
+ sed -i \
+ -e 's:INCLUDE_INSTALL_ROOT_DIR:INCLUDE_INSTALL_DIR:g' \
+ yaml-cpp.pc.cmake || die
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_SHARED_LIBS=ON
+ -DYAML_BUILD_SHARED_LIBS=ON
+ -DYAML_CPP_BUILD_TOOLS=OFF # Don't have install rule
+ -DYAML_CPP_BUILD_TESTS=$(usex test)
+ )
+
+ cmake-multilib_src_configure
+}
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/yaml-cpp/, dev-cpp/yaml-cpp/files/
commit: 4f0b8303610a5eeefa5e4aa1127a27c1993372df
Author: Johannes Huber gentoo org>
AuthorDate: Tue Jan 7 21:40:11 2020 +
Commit: Johannes Huber gentoo org>
CommitDate: Tue Jan 7 21:41:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f0b8303
dev-cpp/yaml-cpp: fix ABI breakage
Adds a patch used in fedora to fix ABI breakage. Patch and issue spotted
by Attila Tóth atoth.sote.hu>.
Bug: https://bugs.gentoo.org/704948
Thanks-to: Attila Tóth atoth.sote.hu>
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Johannes Huber gentoo.org>
.../files/yaml-cpp-0.6.3-abi-breakage.patch| 57 ++
dev-cpp/yaml-cpp/yaml-cpp-0.6.3-r1.ebuild | 45 +
2 files changed, 102 insertions(+)
diff --git a/dev-cpp/yaml-cpp/files/yaml-cpp-0.6.3-abi-breakage.patch
b/dev-cpp/yaml-cpp/files/yaml-cpp-0.6.3-abi-breakage.patch
new file mode 100644
index 000..d9160856c47
--- /dev/null
+++ b/dev-cpp/yaml-cpp/files/yaml-cpp-0.6.3-abi-breakage.patch
@@ -0,0 +1,57 @@
+commit f5f288c7622d3547c29a8355b8ccda0155483b79
+Author: Till Hofmann
+Date: Sun Nov 17 22:43:20 2019 +0100
+
+Revert "fix up static, so works as DLL (#559)"
+
+This reverts commit 774f25800e6f19f4b927023c85d1389af322da5e.
+
+diff --git a/include/yaml-cpp/node/detail/node_data.h
b/include/yaml-cpp/node/detail/node_data.h
+index 82fb79a..50bcd74 100644
+--- a/include/yaml-cpp/node/detail/node_data.h
b/include/yaml-cpp/node/detail/node_data.h
+@@ -81,7 +81,7 @@ class YAML_CPP_API node_data {
+ shared_memory_holder pMemory);
+
+ public:
+- static const std::string& empty_scalar();
++ static std::string empty_scalar;
+
+ private:
+ void compute_seq_size() const;
+diff --git a/include/yaml-cpp/node/impl.h b/include/yaml-cpp/node/impl.h
+index 7a3deac..b363f86 100644
+--- a/include/yaml-cpp/node/impl.h
b/include/yaml-cpp/node/impl.h
+@@ -166,13 +166,13 @@ inline T Node::as(const S& fallback) const {
+ inline const std::string& Node::Scalar() const {
+ if (!m_isValid)
+ throw InvalidNode(m_invalidKey);
+- return m_pNode ? m_pNode->scalar() : detail::node_data::empty_scalar();
++ return m_pNode ? m_pNode->scalar() : detail::node_data::empty_scalar;
+ }
+
+ inline const std::string& Node::Tag() const {
+ if (!m_isValid)
+ throw InvalidNode(m_invalidKey);
+- return m_pNode ? m_pNode->tag() : detail::node_data::empty_scalar();
++ return m_pNode ? m_pNode->tag() : detail::node_data::empty_scalar;
+ }
+
+ inline void Node::SetTag(const std::string& tag) {
+diff --git a/src/node_data.cpp b/src/node_data.cpp
+index 6cfedfc..eba1ae4 100644
+--- a/src/node_data.cpp
b/src/node_data.cpp
+@@ -13,10 +13,7 @@
+ namespace YAML {
+ namespace detail {
+
+-const std::string& node_data::empty_scalar() {
+- static const std::string svalue;
+- return svalue;
+-}
++std::string node_data::empty_scalar;
+
+ node_data::node_data()
+ : m_isDefined(false),
diff --git a/dev-cpp/yaml-cpp/yaml-cpp-0.6.3-r1.ebuild
b/dev-cpp/yaml-cpp/yaml-cpp-0.6.3-r1.ebuild
new file mode 100644
index 000..8a579eada7c
--- /dev/null
+++ b/dev-cpp/yaml-cpp/yaml-cpp-0.6.3-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS="cmake"
+inherit cmake-multilib
+
+DESCRIPTION="YAML parser and emitter in C++"
+HOMEPAGE="https://github.com/jbeder/yaml-cpp";
+SRC_URI="https://github.com/jbeder/${PN}/archive/${P}.tar.gz";
+
+LICENSE="MIT"
+SLOT="0/0.6"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
~x86-linux"
+IUSE="test"
+
+# test breaks build
+# RESTRICT="!test? ( test )"
+RESTRICT+="test"
+
+DEPEND="test? ( dev-cpp/gtest )"
+
+S="${WORKDIR}/${PN}-${P}"
+
+PATCHES=( "${FILESDIR}/${P}-abi-breakage.patch" )
+
+src_prepare() {
+ sed -i \
+ -e 's:INCLUDE_INSTALL_ROOT_DIR:INCLUDE_INSTALL_DIR:g' \
+ yaml-cpp.pc.cmake || die
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_SHARED_LIBS=ON
+ -DYAML_BUILD_SHARED_LIBS=ON
+ -DYAML_CPP_BUILD_TOOLS=OFF # Don't have install rule
+ -DYAML_CPP_BUILD_TESTS=$(usex test)
+ )
+
+ cmake-multilib_src_configure
+}
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/yaml-cpp/, dev-cpp/yaml-cpp/files/
commit: ee604746b688a9631001dff1618b97dd4ad1aa46
Author: Johannes Huber gentoo org>
AuthorDate: Sat Jun 2 15:52:51 2018 +
Commit: Johannes Huber gentoo org>
CommitDate: Sat Jun 2 15:52:51 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee604746
dev-cpp/yaml-cpp: Remove 0.5.3-r1
Bug: https://bugs.gentoo.org/614850
Package-Manager: Portage-2.3.40, Repoman-2.3.9
dev-cpp/yaml-cpp/Manifest| 1 -
dev-cpp/yaml-cpp/files/yaml-cpp-0.5.3-gcc6.patch | 44
dev-cpp/yaml-cpp/yaml-cpp-0.5.3-r1.ebuild| 37
3 files changed, 82 deletions(-)
diff --git a/dev-cpp/yaml-cpp/Manifest b/dev-cpp/yaml-cpp/Manifest
index bac72aa90f8..4a2a21dbeb9 100644
--- a/dev-cpp/yaml-cpp/Manifest
+++ b/dev-cpp/yaml-cpp/Manifest
@@ -1,2 +1 @@
-DIST yaml-cpp-0.5.3.tar.gz 2016737 BLAKE2B
6c10d44fe04fdd81cd61c909acdb576834f5358dd44353723b04d8a42bf8a1312cfa752e445c84f93c6ce76358b2d42dee5263f6fbd47a1f928d1cd28aedef07
SHA512
5ed15fee3c6455c08e6bd8f74256b230f274ef18f8e144491e940640e41626517c7eaaf4a1f380c4179066a2a757c8a0f61878df9dc3caa15e37c4954be47fe0
DIST yaml-cpp-0.6.2.tar.gz 1396250 BLAKE2B
be342c212c980cdb03349dbafbe1db0bb581123b4dd6909393d3cdc86145b997a9d2f9b57a5e9d7c8cc60cdfd03f1c37e9db610d8784f2d29fdeada5ab322894
SHA512
fea8ce0a20a00cbc75023d1db442edfcd32d0ac57a3c41b32ec8d56f87cc1d85d7dd7a923ce662f5d3a315f91a736d6be0d649997acd190915c1d68cc93795e4
diff --git a/dev-cpp/yaml-cpp/files/yaml-cpp-0.5.3-gcc6.patch
b/dev-cpp/yaml-cpp/files/yaml-cpp-0.5.3-gcc6.patch
deleted file mode 100644
index 88ee25fa0ac..000
--- a/dev-cpp/yaml-cpp/files/yaml-cpp-0.5.3-gcc6.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Bug: https://bugs.gentoo.org/609176
-Upstream PR: https://github.com/jbeder/yaml-cpp/pull/514
-
-From a83a1b3a7bd0a5a4eb458d898b057f6a8d409b7e Mon Sep 17 00:00:00 2001
-From: Peter-Levine
-Date: Mon, 24 Jul 2017 02:00:24 -0400
-Subject: [PATCH] Fix segfault in gmock when running tests
-
-Taken from
https://github.com/google/googletest/issues/705#issuecomment-235067917
- test/gmock-1.7.0/include/gmock/gmock-spec-builders.h | 6 --
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/test/gmock-1.7.0/include/gmock/gmock-spec-builders.h
b/test/gmock-1.7.0/include/gmock/gmock-spec-builders.h
-index 312fbe87..2dd733b6 100644
a/test/gmock-1.7.0/include/gmock/gmock-spec-builders.h
-+++ b/test/gmock-1.7.0/include/gmock/gmock-spec-builders.h
-@@ -1370,6 +1370,8 @@ class ActionResultHolder : public
UntypedActionResultHolderBase {
- template <>
- class ActionResultHolder : public UntypedActionResultHolderBase {
- public:
-+ explicit ActionResultHolder() {}
-+
- void GetValueAndDelete() const { delete this; }
-
- virtual void PrintAsActionResult(::std::ostream* /* os */) const {}
-@@ -1381,7 +1383,7 @@ class ActionResultHolder : public
UntypedActionResultHolderBase {
- const typename Function::ArgumentTuple& args,
- const string& call_description) {
- func_mocker->PerformDefaultAction(args, call_description);
--return NULL;
-+return new ActionResultHolder();
- }
-
- // Performs the given action and returns NULL.
-@@ -1390,7 +1392,7 @@ class ActionResultHolder : public
UntypedActionResultHolderBase {
- const Action& action,
- const typename Function::ArgumentTuple& args) {
- action.Perform(args);
--return NULL;
-+return new ActionResultHolder();
- }
- };
-
diff --git a/dev-cpp/yaml-cpp/yaml-cpp-0.5.3-r1.ebuild
b/dev-cpp/yaml-cpp/yaml-cpp-0.5.3-r1.ebuild
deleted file mode 100644
index 6bf29f127ca..000
--- a/dev-cpp/yaml-cpp/yaml-cpp-0.5.3-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="YAML parser and emitter in C++"
-HOMEPAGE="https://github.com/jbeder/yaml-cpp";
-SRC_URI="https://github.com/jbeder/${PN}/archive/release-${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=">=dev-libs/boost-1.49.0-r2:="
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-release-${PV}"
-
-PATCHES=( "${FILESDIR}"/${P}-gcc6.patch )
-
-src_prepare() {
- sed -i \
- -e 's:INCLUDE_INSTALL_ROOT_DIR:INCLUDE_INSTALL_DIR:g' \
- yaml-cpp.pc.cmake || die
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_SHARED_LIBS=ON
- )
- cmake-utils_src_configure
-}
