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 (4096 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7346215813A for ; Wed, 08 Jan 2025 09:24:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B2FAEE0824; Wed, 08 Jan 2025 09:24:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 9D627E0824 for ; Wed, 08 Jan 2025 09:24:53 +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 D5646341939 for ; Wed, 08 Jan 2025 09:24:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 43AE1AED for ; Wed, 08 Jan 2025 09:24:51 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1736328267.f61d916a311ab33f4baac7053d0ad3d28b87d6ee.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/gnuradio/files/, net-wireless/gnuradio/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-wireless/gnuradio/files/gnuradio-3.10.9.2-libfmt-11.patch net-wireless/gnuradio/gnuradio-3.10.9.2-r6.ebuild X-VCS-Directories: net-wireless/gnuradio/files/ net-wireless/gnuradio/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: f61d916a311ab33f4baac7053d0ad3d28b87d6ee X-VCS-Branch: master Date: Wed, 08 Jan 2025 09:24:51 +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: 17571d3b-ed79-4b11-8265-91da7f7b700c X-Archives-Hash: fb146f8c5da83465bd7cb1973be05990 commit: f61d916a311ab33f4baac7053d0ad3d28b87d6ee Author: Z. Liu gmail com> AuthorDate: Mon Jan 6 04:28:29 2025 +0000 Commit: Sam James gentoo org> CommitDate: Wed Jan 8 09:24:27 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f61d916a net-wireless/gnuradio: fix build w/ libfmt-11.0 patch from upstream Closes: https://bugs.gentoo.org/947618 Signed-off-by: Z. Liu gmail.com> Closes: https://github.com/gentoo/gentoo/pull/40002 Signed-off-by: Sam James gentoo.org> .../files/gnuradio-3.10.9.2-libfmt-11.patch | 50 ++++++++++++++++++++++ net-wireless/gnuradio/gnuradio-3.10.9.2-r6.ebuild | 7 ++- 2 files changed, 55 insertions(+), 2 deletions(-) diff --git a/net-wireless/gnuradio/files/gnuradio-3.10.9.2-libfmt-11.patch b/net-wireless/gnuradio/files/gnuradio-3.10.9.2-libfmt-11.patch new file mode 100644 index 000000000000..60304a36ea16 --- /dev/null +++ b/net-wireless/gnuradio/files/gnuradio-3.10.9.2-libfmt-11.patch @@ -0,0 +1,50 @@ +From 19b070051c1c2b5fb6f2da8fb6422b27418c3dfa Mon Sep 17 00:00:00 2001 +From: Kefu Chai +Date: Mon, 15 Jul 2024 09:27:16 +0800 +Subject: [PATCH] blocks,runtime: io_signature: include spdlog/*/ranges.h for + using fmt::join() + +fmt::join() was moved into fmt/ranges.h since fmt 11, so let's +include the corresponding header in spdlog for using it. + +Signed-off-by: Kefu Chai +--- + gnuradio-runtime/lib/io_signature.cc | 5 +++++ + gr-blocks/lib/message_debug_impl.cc | 5 +++++ + 2 files changed, 10 insertions(+) + +diff --git a/gnuradio-runtime/lib/io_signature.cc b/gnuradio-runtime/lib/io_signature.cc +index 812f444f8..76bb2aba6 100644 +--- a/gnuradio-runtime/lib/io_signature.cc ++++ b/gnuradio-runtime/lib/io_signature.cc +@@ -16,6 +16,11 @@ + #include + + #include ++#if __has_include() ++#include ++#elif __has_include() ++#include ++#endif + #include + #include + #include +diff --git a/gr-blocks/lib/message_debug_impl.cc b/gr-blocks/lib/message_debug_impl.cc +index 41d312e43..373287b02 100644 +--- a/gr-blocks/lib/message_debug_impl.cc ++++ b/gr-blocks/lib/message_debug_impl.cc +@@ -19,6 +19,11 @@ + #include + #include + #include ++#if __has_include() ++#include ++#elif __has_include() ++#include ++#endif + #include + #include + #include +-- +2.45.2 + diff --git a/net-wireless/gnuradio/gnuradio-3.10.9.2-r6.ebuild b/net-wireless/gnuradio/gnuradio-3.10.9.2-r6.ebuild index f4eaff739bf2..e2b0ef2bca50 100644 --- a/net-wireless/gnuradio/gnuradio-3.10.9.2-r6.ebuild +++ b/net-wireless/gnuradio/gnuradio-3.10.9.2-r6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -131,7 +131,10 @@ DEPEND="${RDEPEND} zeromq? ( net-libs/cppzmq ) " -PATCHES=( "${FILESDIR}/PR7093.patch" ) +PATCHES=( + "${FILESDIR}/PR7093.patch" + "${FILESDIR}"/${PN}-3.10.9.2-libfmt-11.patch +) src_prepare() { xdg_environment_reset #534582