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 245CE15808B for ; Mon, 7 Feb 2022 18:47:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 36E8BE075F; Mon, 7 Feb 2022 18:47:26 +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 86D85E075F for ; Mon, 7 Feb 2022 18:47:25 +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 2B49F342FA9 for ; Mon, 7 Feb 2022 18:47:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7977929 for ; Mon, 7 Feb 2022 18:47:22 +0000 (UTC) From: "Thomas Beierlein" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Beierlein" Message-ID: <1644259630.b60e3a9c208702a304c4578851a121b544d4a07c.tomjbe@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-radio/flrig/, media-radio/flrig/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-radio/flrig/files/flrig-1.4.4-musl.patch media-radio/flrig/flrig-1.4.4.ebuild X-VCS-Directories: media-radio/flrig/files/ media-radio/flrig/ X-VCS-Committer: tomjbe X-VCS-Committer-Name: Thomas Beierlein X-VCS-Revision: b60e3a9c208702a304c4578851a121b544d4a07c X-VCS-Branch: master Date: Mon, 7 Feb 2022 18:47:22 +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: 10123859-cda5-4a79-beab-e5442b5dbafa X-Archives-Hash: c84db63ba702ab7107be3d516253949f commit: b60e3a9c208702a304c4578851a121b544d4a07c Author: Thomas Beierlein gentoo org> AuthorDate: Mon Feb 7 18:47:10 2022 +0000 Commit: Thomas Beierlein gentoo org> CommitDate: Mon Feb 7 18:47:10 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b60e3a9c media-radio/flrig: Fixes musl build error Closes: https://bugs.gentoo.org/832232 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Thomas Beierlein gentoo.org> media-radio/flrig/files/flrig-1.4.4-musl.patch | 28 ++++++++++++++++++++++++++ media-radio/flrig/flrig-1.4.4.ebuild | 9 ++++++++- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/media-radio/flrig/files/flrig-1.4.4-musl.patch b/media-radio/flrig/files/flrig-1.4.4-musl.patch new file mode 100644 index 000000000000..44c85a711828 --- /dev/null +++ b/media-radio/flrig/files/flrig-1.4.4-musl.patch @@ -0,0 +1,28 @@ +diff --git a/src/cmedia/cmedia.cxx b/src/cmedia/cmedia.cxx +index c65400f..efe83c5 100644 +--- a/src/cmedia/cmedia.cxx ++++ b/src/cmedia/cmedia.cxx +@@ -41,9 +41,6 @@ + #ifndef __WIN32__ + #include + #include +-# ifndef __APPLE__ +-# include +-# endif + #endif + + #include "config.h" +diff --git a/src/cmedia/tmate2.cxx b/src/cmedia/tmate2.cxx +index b209469..6408179 100644 +--- a/src/cmedia/tmate2.cxx ++++ b/src/cmedia/tmate2.cxx +@@ -44,9 +44,6 @@ + #ifndef __WIN32__ + #include + #include +-# ifndef __APPLE__ +-# include +-# endif + #endif + + #include "config.h" diff --git a/media-radio/flrig/flrig-1.4.4.ebuild b/media-radio/flrig/flrig-1.4.4.ebuild index a98ec86ead1f..fa8591685185 100644 --- a/media-radio/flrig/flrig-1.4.4.ebuild +++ b/media-radio/flrig/flrig-1.4.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -20,3 +20,10 @@ RDEPEND="x11-libs/libX11 DEPEND="${RDEPEND} sys-devel/gettext" + +PATCHES=( "${FILESDIR}/${PN}-1.4.4-musl.patch" ) + +src_prepare() { + eapply ${PATCHES[@]} + eapply_user +}