commit: 1d9d862a0d6c3432fb976c665077a36ce453a789 Author: Esteve Varela Colominas <esteve.varela <AT> gmail <DOT> com> AuthorDate: Thu Jun 29 13:00:37 2023 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Fri Jul 21 06:31:31 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d9d862a
dev-cpp/cppgir: Bump to 0_p20230625 Upstreamed most patches, fixed libcxx 16 Closes: https://bugs.gentoo.org/909316 Thanks-to: James McGeehan IV <jfmfour22 <AT> gmail.com> Thanks-to: Carlos <carana2099 <AT> gmail.com> Signed-off-by: Esteve Varela Colominas <esteve.varela <AT> gmail.com> Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> dev-cpp/cppgir/Manifest | 1 + dev-cpp/cppgir/cppgir-0_p20230625.ebuild | 48 +++++++++++++++++++ .../files/cppgir-0_p20230625-fix-libcxx-16.patch | 54 ++++++++++++++++++++++ 3 files changed, 103 insertions(+) diff --git a/dev-cpp/cppgir/Manifest b/dev-cpp/cppgir/Manifest index 74cef3ae99ab..f9e084153296 100644 --- a/dev-cpp/cppgir/Manifest +++ b/dev-cpp/cppgir/Manifest @@ -1 +1,2 @@ DIST cppgir-0_p20230606.tar.bz2 92576 BLAKE2B 47d43405eee8cebb782a3021e8398ce61ced23094424ced9f1bfaf390bfd83b7fa6e6fe5e0689886857cef3c992f9318de99d9e38362c2777a409cf597b55f7a SHA512 832c99379b0203db9b2cfefa530fc8f68411da5b0f121a37ab1b60dfa39e929a0d95971c4161a744dc5b3ddbb92848f1bbce9b265f9d4d5724084c08ab8fd4f4 +DIST cppgir-0_p20230625.tar.bz2 93259 BLAKE2B 7593ed17391d40ba69c2915a6f3750ac5a0596977a1ddf61aad2db40e61b967ec8b4a9f6f11b22a2f15660344358b2f4cfd2f46aa50d565163b0508ac411d974 SHA512 9167650ff6d22b2da7c824c91b864a104950ed44156c4fdd222abef3261b7ae9639dbafaca4ad3c175da7707bbf221ef166778c4227bb395149b804e74d91693 diff --git a/dev-cpp/cppgir/cppgir-0_p20230625.ebuild b/dev-cpp/cppgir/cppgir-0_p20230625.ebuild new file mode 100644 index 000000000000..b0d3d462afe7 --- /dev/null +++ b/dev-cpp/cppgir/cppgir-0_p20230625.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic + +DESCRIPTION="GObject-Introspection C++ binding wrapper generator" +HOMEPAGE="https://gitlab.com/mnauw/cppgir"; + +MY_PV="70b0e3d522cec60316d116dcbd919b797e85685a" +SRC_URI="https://gitlab.com/mnauw/cppgir/-/archive/${MY_PV}/cppgir-${MY_PV}.tar.bz2 -> ${P}.tar.bz2" +S="${WORKDIR}/${PN}-${MY_PV}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~riscv" +IUSE="doc test" +RESTRICT="!test? ( test )" + +DEPEND=" + dev-cpp/expected-lite + dev-libs/boost:= + dev-libs/libfmt:= +" +BDEPEND=" + doc? ( app-text/ronn-ng ) + test? ( dev-libs/glib ) +" + +PATCHES=( + "${FILESDIR}/cppgir-0_p20230625-fix-libcxx-16.patch" +) + +src_configure() { + local mycmakeargs=( + -DBUILD_DOC=$(usex doc) + -DBUILD_TESTING=$(usex test) + -DBUILD_EXAMPLES=no + -DINTERNAL_EXPECTED=no + ) + + append-cppflags \ + -UDEFAULT_GIRPATH \ + -DDEFAULT_GIRPATH="${EPREFIX}/usr/share:${EPREFIX}/usr/local/share" + + cmake_src_configure +} diff --git a/dev-cpp/cppgir/files/cppgir-0_p20230625-fix-libcxx-16.patch b/dev-cpp/cppgir/files/cppgir-0_p20230625-fix-libcxx-16.patch new file mode 100644 index 000000000000..6ca80e05594b --- /dev/null +++ b/dev-cpp/cppgir/files/cppgir-0_p20230625-fix-libcxx-16.patch @@ -0,0 +1,54 @@ +Fix building with libcxx-16 + +https://bugs.gentoo.org/909316 +https://gitlab.com/mnauw/cppgir/-/issues/41 + +--- cppgir-70b0e3d522cec60316d116dcbd919b797e85685a.orig/CMakeLists.txt ++++ cppgir-70b0e3d522cec60316d116dcbd919b797e85685a/CMakeLists.txt +@@ -65,8 +65,8 @@ + -DDEFAULT_GIRPATH=${GI_DEFAULT_GIRPATH}) + target_compile_definitions(cppgir PRIVATE + -DDEFAULT_IGNORE_FILE=${GI_IGNORE_FILE_INSTALL_DIR}/${GI_IGNORE_FILE}:${GI_IGNORE_FILE_INSTALL_DIR}/${GI_IGNORE_FILE_PLATFORM}) +-target_link_libraries(cppgir Boost::program_options stdc++fs ${FORMAT_LIBRARIES}) +-set_property(TARGET cppgir PROPERTY CXX_STANDARD 14) ++target_link_libraries(cppgir Boost::program_options ${FORMAT_LIBRARIES}) ++set_property(TARGET cppgir PROPERTY CXX_STANDARD 17) + + add_library(gi INTERFACE) + target_include_directories(gi INTERFACE +--- cppgir-70b0e3d522cec60316d116dcbd919b797e85685a.orig/tools/cppgir.cpp ++++ cppgir-70b0e3d522cec60316d116dcbd919b797e85685a/tools/cppgir.cpp +@@ -3,8 +3,8 @@ + #include "genns.hpp" + #include "repository.hpp" + +-#include <experimental/filesystem> +-namespace fs = std::experimental::filesystem; ++#include <filesystem> ++namespace fs = std::filesystem; + + #include <boost/algorithm/string/classification.hpp> + #include <boost/algorithm/string/split.hpp> +--- cppgir-70b0e3d522cec60316d116dcbd919b797e85685a.orig/tools/genbase.hpp ++++ cppgir-70b0e3d522cec60316d116dcbd919b797e85685a/tools/genbase.hpp +@@ -6,6 +6,7 @@ + #include "repository.hpp" + + #include <set> ++#include <map> + + struct GeneratorOptions + { +--- cppgir-70b0e3d522cec60316d116dcbd919b797e85685a.orig/tools/genns.cpp ++++ cppgir-70b0e3d522cec60316d116dcbd919b797e85685a/tools/genns.cpp +@@ -5,8 +5,8 @@ + #include <boost/algorithm/string/join.hpp> + #include <boost/format.hpp> + +-#include <experimental/filesystem> +-namespace fs = std::experimental::filesystem; ++#include <filesystem> ++namespace fs = std::filesystem; + + #include <boost/property_tree/xml_parser.hpp> +
