commit: 077bef35366a595a4159ed9d5ecce663d2cbfd40 Author: sin-ack <sin-ack <AT> protonmail <DOT> com> AuthorDate: Mon Apr 21 16:03:27 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Apr 22 01:15:24 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=077bef35
dev-cpp/fb303: add 2025.04.14.00 RDEPEND fixed via qa-vdb. One non-upstream patch added because upstream forgot to add system-installed Thrift annotations to the include path for Python codegen. Ref: https://github.com/facebook/fb303/issues/66 Bug: https://bugs.gentoo.org/946922 Signed-off-by: sin-ack <sin-ack <AT> protonmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> dev-cpp/fb303/Manifest | 1 + dev-cpp/fb303/fb303-2025.04.14.00.ebuild | 53 ++++++++++++++++++++++ ...he-Thrift-annotation-library-for-the-Pyth.patch | 28 ++++++++++++ 3 files changed, 82 insertions(+) diff --git a/dev-cpp/fb303/Manifest b/dev-cpp/fb303/Manifest index 78209c541e02..e14857c8b999 100644 --- a/dev-cpp/fb303/Manifest +++ b/dev-cpp/fb303/Manifest @@ -1 +1,2 @@ DIST fb303-2024.11.04.00.gh.tar.gz 256825 BLAKE2B a7cb9b56f38f0a8f20a860b4b288f37cb59315242b50ac757bcd472e0310491a575149b2580a67a837a52badaf7ca4b72a769293d248830f90a0cf48f351835a SHA512 4ec54931f23267197e74cc0c3a0dd500f443221d5c4a6bb6a4d707feb6fbc377ef6c16f8fa94f2162e2c0a192fce01016f249890f7384a6c042b5f94b657dc11 +DIST fb303-2025.04.14.00.gh.tar.gz 265271 BLAKE2B f1075ecd4af340a3f801c67b72dfb04ed8e40fbfb818967fd059565a554569dd9caac195abfa1ff8dab3d0beb8f7ccfbd4b52005dc1bb334a944577188ea6366 SHA512 00f0859d22c907665cd7d4381797b0436bb36c8acd64f69cb001eec86a6e4a51ac17cb0e1cd6e3d329e0a4c850d46d8b54c042676d13549da6e2cdcb8515307c diff --git a/dev-cpp/fb303/fb303-2025.04.14.00.ebuild b/dev-cpp/fb303/fb303-2025.04.14.00.ebuild new file mode 100644 index 000000000000..a3f81fb910ff --- /dev/null +++ b/dev-cpp/fb303/fb303-2025.04.14.00.ebuild @@ -0,0 +1,53 @@ +# Copyright 2022-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# These must be bumped together: +# dev-cpp/edencommon +# dev-cpp/fb303 +# dev-cpp/fbthrift +# dev-cpp/fizz +# dev-cpp/folly +# dev-cpp/mvfst +# dev-cpp/wangle +# dev-util/watchman + +inherit cmake + +DESCRIPTION="Core set of Thrift functions querying stats and other information from a service" +HOMEPAGE="https://github.com/facebook/fb303"; +SRC_URI="https://github.com/facebook/fb303/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm64" +IUSE="test" + +# See https://github.com/facebook/fb303/issues/61 +RESTRICT="test" + +RDEPEND=" + ~dev-cpp/fbthrift-${PV}:= + ~dev-cpp/folly-${PV}:= + dev-cpp/gflags:= + dev-cpp/glog:=[gflags] + dev-libs/libfmt:= +" +DEPEND=" + ${RDEPEND} + test? ( dev-cpp/gtest ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-2025.04.14.00-Fix-using-the-Thrift-annotation-library-for-the-Pyth.patch +) + +src_configure() { + local mycmakeargs=( + -DCMAKE_INSTALL_DIR="$(get_libdir)/cmake/${PN}" + -DLIB_INSTALL_DIR="$(get_libdir)" + ) + + cmake_src_configure +} diff --git a/dev-cpp/fb303/files/fb303-2025.04.14.00-Fix-using-the-Thrift-annotation-library-for-the-Pyth.patch b/dev-cpp/fb303/files/fb303-2025.04.14.00-Fix-using-the-Thrift-annotation-library-for-the-Pyth.patch new file mode 100644 index 000000000000..0983529dd3ce --- /dev/null +++ b/dev-cpp/fb303/files/fb303-2025.04.14.00-Fix-using-the-Thrift-annotation-library-for-the-Pyth.patch @@ -0,0 +1,28 @@ +From bedbdc263694291f04f8df51f1f44671920ead65 Mon Sep 17 00:00:00 2001 +From: sin-ack <[email protected]> +Date: Mon, 21 Apr 2025 17:12:13 +0200 +Subject: [PATCH] Fix using the Thrift annotation library for the Python + generator + +Same as commit 536ff1c00, but this time for the Python code generator. + +Ref: https://github.com/facebook/fb303/commit/536ff1c002cfc2e20a044b474bb73a21350c5d69 +--- + build/fbcode_builder/CMake/FBThriftPyLibrary.cmake | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/build/fbcode_builder/CMake/FBThriftPyLibrary.cmake b/build/fbcode_builder/CMake/FBThriftPyLibrary.cmake +index fa77cde71..1aed8fbf4 100644 +--- a/build/fbcode_builder/CMake/FBThriftPyLibrary.cmake ++++ b/build/fbcode_builder/CMake/FBThriftPyLibrary.cmake +@@ -87,6 +87,7 @@ function(add_fbthrift_py_library LIB_NAME THRIFT_FILE) + --legacy-strict + --gen "py:${GEN_ARG_STR}" + "${thrift_include_options}" ++ -I "${FBTHRIFT_INCLUDE_DIR}" + -o "${output_dir}" + "${CMAKE_CURRENT_SOURCE_DIR}/${THRIFT_FILE}" + WORKING_DIRECTORY +-- +2.49.0 +
