[gentoo-commits] repo/gentoo:master commit in: dev-cpp/cpptoml/files/, dev-cpp/cpptoml/

[gentoo-commits] repo/gentoo:master commit in: dev-cpp/cpptoml/files/, dev-cpp/cpptoml/

[Sam James]

commit:     983f4b90caa40b4b0cb9875925ebc3d721fc7f6a
Author:     sin-ack <sin-ack <AT> protonmail <DOT> com>
AuthorDate: Sun Nov 10 20:16:20 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Nov 11 22:24:19 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=983f4b90

dev-cpp/cpptoml: new package, add 0.1.1

Signed-off-by: sin-ack <sin-ack <AT> protonmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-cpp/cpptoml/Manifest                         |  1 +
 dev-cpp/cpptoml/cpptoml-0.1.1.ebuild             | 31 ++++++++++++++++++++++++
 dev-cpp/cpptoml/files/cpptoml-0.1.1-limits.patch | 15 ++++++++++++
 dev-cpp/cpptoml/metadata.xml                     | 22 +++++++++++++++++
 4 files changed, 69 insertions(+)

diff --git a/dev-cpp/cpptoml/Manifest b/dev-cpp/cpptoml/Manifest
new file mode 100644
index 000000000000..138b26feca8e
--- /dev/null
+++ b/dev-cpp/cpptoml/Manifest
@@ -0,0 +1 @@
+DIST cpptoml-0.1.1.tar.gz 47398 BLAKE2B c0ce036bec4731c4dfe96d01076b9ca18a1c4108180d5dbc839dfc44b37eb0c7af85f685a6356ef92fa684219e2883dd341e64a2012505dacc3df73dfb9e28ca SHA512 14edce576514d53a7e13562d7f8d2b66ea2b95f44038396c0e26232ec81783042ebecec31ee272a99afef96d5c8582a8e81ea5167a787844b98de6ee6f545cc5

diff --git a/dev-cpp/cpptoml/cpptoml-0.1.1.ebuild b/dev-cpp/cpptoml/cpptoml-0.1.1.ebuild
new file mode 100644
index 000000000000..27c81a63572b
--- /dev/null
+++ b/dev-cpp/cpptoml/cpptoml-0.1.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake toolchain-funcs
+
+DESCRIPTION="Header-only library for parsing TOML"
+HOMEPAGE="https://github.com/skystrife/cpptoml"
+SRC_URI="https://github.com/skystrife/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples"
+
+PATCHES=(
+	"${FILESDIR}/${P}-limits.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCPPTOML_BUILD_EXAMPLES=$(usex examples)
+	)
+
+	if [[ $(tc-get-cxx-stdlib) == libc++ ]]; then
+		mycmakeargs+=(-DENABLE_LIBCXX=ON)
+	fi
+
+	cmake_src_configure
+}

diff --git a/dev-cpp/cpptoml/files/cpptoml-0.1.1-limits.patch b/dev-cpp/cpptoml/files/cpptoml-0.1.1-limits.patch
new file mode 100644
index 000000000000..484f98044be4
--- /dev/null
+++ b/dev-cpp/cpptoml/files/cpptoml-0.1.1-limits.patch
@@ -0,0 +1,15 @@
+From c55a516e90133d89d67285429c6474241346d27a Mon Sep 17 00:00:00 2001
+From: Dirk Eddelbuettel <edd@debian.org>
+Date: Mon, 30 Nov 2020 09:41:49 -0600
+Subject: [PATCH] g++-11 requires limits header
+
+--- a/include/cpptoml.h
++++ b/include/cpptoml.h
+@@ -14,6 +14,7 @@
+ #include <cstring>
+ #include <fstream>
+ #include <iomanip>
++#include <limits>
+ #include <map>
+ #include <memory>
+ #include <sstream>

diff --git a/dev-cpp/cpptoml/metadata.xml b/dev-cpp/cpptoml/metadata.xml
new file mode 100644
index 000000000000..88ca6c8a4ea6
--- /dev/null
+++ b/dev-cpp/cpptoml/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<longdescription lang="en">
+A header-only library for parsing TOML configuration files.
+
+Targets: TOML v0.5.0 as of August 2018.
+
+This includes support for the new DateTime format, inline tables, multi-line basic and raw strings, digit separators, hexadecimal integers, octal integers, binary integers, and float special values.
+	</longdescription>
+	<maintainer type="person" proxied="yes">
+		<email>sin-ack@protonmail.com</email>
+		<name>sin-ack</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ddemidov/vexcl</remote-id>
+	</upstream>
+</pkgmetadata>

[gentoo-commits] repo/gentoo:master commit in: dev-cpp/cpptoml/files/, dev-cpp/cpptoml/

[Sam James]

commit:     97f9eb588373dee70da14e61648dfd3f7866184e
Author:     sin-ack <sin-ack <AT> protonmail <DOT> com>
AuthorDate: Sat Nov 23 19:46:57 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 23 20:16:55 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97f9eb58

dev-cpp/cpptoml: fix build on system-libcxx systems

I tried to find information about find_package(LIBCXX) but I couldn't
find anything, and testing in a system-libcxx system shows it to work
without this, so just remove any configuration related to it. Tested
with USE=examples and by building dev-util/watchman which has this
as a dependency.

Closes: https://bugs.gentoo.org/944516
Signed-off-by: sin-ack <sin-ack <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/39434
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...pptoml-0.1.1.ebuild => cpptoml-0.1.1-r1.ebuild} |  7 ++--
 .../files/cpptoml-0.1.1-remove-libcxx-config.patch | 37 ++++++++++++++++++++++
 2 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/dev-cpp/cpptoml/cpptoml-0.1.1.ebuild b/dev-cpp/cpptoml/cpptoml-0.1.1-r1.ebuild
similarity index 81%
rename from dev-cpp/cpptoml/cpptoml-0.1.1.ebuild
rename to dev-cpp/cpptoml/cpptoml-0.1.1-r1.ebuild
index e90c6978b955..d353eccd491f 100644
--- a/dev-cpp/cpptoml/cpptoml-0.1.1.ebuild
+++ b/dev-cpp/cpptoml/cpptoml-0.1.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake toolchain-funcs
+inherit cmake
 
 DESCRIPTION="Header-only library for parsing TOML"
 HOMEPAGE="https://github.com/skystrife/cpptoml"
@@ -16,6 +16,7 @@ IUSE="examples"
 
 PATCHES=(
 	"${FILESDIR}/${P}-limits.patch"
+	"${FILESDIR}/${P}-remove-libcxx-config.patch"
 )
 
 src_configure() {
@@ -23,9 +24,5 @@ src_configure() {
 		-DCPPTOML_BUILD_EXAMPLES=$(usex examples)
 	)
 
-	if [[ $(tc-get-cxx-stdlib) == libc++ ]]; then
-		mycmakeargs+=(-DENABLE_LIBCXX=ON)
-	fi
-
 	cmake_src_configure
 }

diff --git a/dev-cpp/cpptoml/files/cpptoml-0.1.1-remove-libcxx-config.patch b/dev-cpp/cpptoml/files/cpptoml-0.1.1-remove-libcxx-config.patch
new file mode 100644
index 000000000000..a25f004d83e5
--- /dev/null
+++ b/dev-cpp/cpptoml/files/cpptoml-0.1.1-remove-libcxx-config.patch
@@ -0,0 +1,37 @@
+From bfb98b0f1e0ffdc187e87c79e1c3114eadc3fa0e Mon Sep 17 00:00:00 2001
+From: sin-ack <sin-ack@protonmail.com>
+Date: Sat, 23 Nov 2024 20:28:52 +0100
+Subject: [PATCH] Remove custom configuration for libc++
+
+This doesn't seem to be necessary anymore for libc++ support, and
+actually breaks builds on system-libcxx systems.
+---
+ CMakeLists.txt | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4ec25cc..6f4753b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,7 +11,6 @@ include(CMakePushCheckState)
+ 
+ cmake_push_check_state()
+ 
+-option(ENABLE_LIBCXX "Use libc++ for the C++ standard library" ON)
+ option(CPPTOML_BUILD_EXAMPLES "Build examples" ON)
+ 
+ set(CMAKE_EXPORT_COMPILE_COMMANDS 1)
+@@ -25,11 +24,6 @@ if(UNIX OR MINGW)
+     if(CMAKE_GENERATOR STREQUAL "Ninja")
+       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fcolor-diagnostics")
+     endif()
+-
+-    if(ENABLE_LIBCXX)
+-      find_package(LIBCXX REQUIRED)
+-      set_libcxx_required_flags()
+-    endif()
+   endif()
+ endif()
+ 
+-- 
+2.45.2