From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7E36115808B for ; Sun, 29 Sep 2024 10:50:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 64BF6E2A1E; Sun, 29 Sep 2024 10:50:04 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4575FE2A1E for ; Sun, 29 Sep 2024 10:50:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 32E12343215 for ; Sun, 29 Sep 2024 10:50:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 695A01A09 for ; Sun, 29 Sep 2024 10:50:01 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1727606915.09cbba1a603ba17efa14e163c3443ef6231eec1f.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/jsoncpp/, dev-libs/jsoncpp/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/jsoncpp/files/jsoncpp-1.9.6-cmake.patch dev-libs/jsoncpp/jsoncpp-1.9.6-r1.ebuild X-VCS-Directories: dev-libs/jsoncpp/files/ dev-libs/jsoncpp/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 09cbba1a603ba17efa14e163c3443ef6231eec1f X-VCS-Branch: master Date: Sun, 29 Sep 2024 10:50:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c9f7bdb5-2f32-4776-b0f6-b347ae04f865 X-Archives-Hash: 727fe76eb915159c6d9da5a8a732593d commit: 09cbba1a603ba17efa14e163c3443ef6231eec1f Author: Michał Górny gentoo org> AuthorDate: Sun Sep 29 10:48:35 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Sep 29 10:48:35 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09cbba1a dev-libs/jsoncpp: Fix installed CMake files Closes: https://bugs.gentoo.org/940272 Signed-off-by: Michał Górny gentoo.org> dev-libs/jsoncpp/files/jsoncpp-1.9.6-cmake.patch | 21 +++++++++ dev-libs/jsoncpp/jsoncpp-1.9.6-r1.ebuild | 56 ++++++++++++++++++++++++ 2 files changed, 77 insertions(+) diff --git a/dev-libs/jsoncpp/files/jsoncpp-1.9.6-cmake.patch b/dev-libs/jsoncpp/files/jsoncpp-1.9.6-cmake.patch new file mode 100644 index 000000000000..9e24533ae9f9 --- /dev/null +++ b/dev-libs/jsoncpp/files/jsoncpp-1.9.6-cmake.patch @@ -0,0 +1,21 @@ +From 8d9109992e34cdacd3f2750ada5c2460d346898f Mon Sep 17 00:00:00 2001 +From: Rui Chen +Date: Thu, 19 Sep 2024 15:10:21 -0400 +Subject: [PATCH] fix(build): remove `check_required_components` for meson + build + +Signed-off-by: Rui Chen +--- + jsoncppConfig.cmake.meson.in | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/jsoncppConfig.cmake.meson.in b/jsoncppConfig.cmake.meson.in +index 0f4866d6d..be8852d0c 100644 +--- a/jsoncppConfig.cmake.meson.in ++++ b/jsoncppConfig.cmake.meson.in +@@ -4,5 +4,3 @@ + @MESON_STATIC_TARGET@ + + include ( "${CMAKE_CURRENT_LIST_DIR}/jsoncpp-namespaced-targets.cmake" ) +- +-check_required_components(JsonCpp) diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.6-r1.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.6-r1.ebuild new file mode 100644 index 000000000000..6f29211cc90b --- /dev/null +++ b/dev-libs/jsoncpp/jsoncpp-1.9.6-r1.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) + +inherit meson-multilib python-any-r1 + +DESCRIPTION="C++ JSON reader and writer" +HOMEPAGE="https://github.com/open-source-parsers/jsoncpp/" +SRC_URI=" + https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz + -> ${P}.tar.gz +" + +LICENSE="|| ( public-domain MIT )" +SLOT="0/26" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="doc test" +RESTRICT="!test? ( test )" + +BDEPEND=" + ${PYTHON_DEPS} + doc? ( app-text/doxygen ) +" + +PATCHES=( + # https://github.com/open-source-parsers/jsoncpp/pull/1570 + "${FILESDIR}/${P}-cmake.patch" +) + +multilib_src_configure() { + local emesonargs=( + # Follow Debian, Ubuntu, Arch convention for headers location + # bug #452234 + --includedir include/jsoncpp + -Dtests=$(usex test true false) + ) + meson_src_configure +} + +src_compile() { + meson-multilib_src_compile + + if use doc; then + echo "${PV}" > version || die + "${EPYTHON}" doxybuild.py --doxygen="${EPREFIX}"/usr/bin/doxygen || die + HTML_DOCS=( dist/doxygen/jsoncpp*/. ) + fi +} + +multilib_src_test() { + # increase test timeout due to failures on slower hardware + meson_src_test -t 2 +}