commit: 656f75dd8ebd952db3a9e8dca9684bd59443f3ad Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Aug 5 19:06:51 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Aug 5 19:08:21 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=656f75dd
media-sound/cantata: Fix build with musl libc Upstream commit 835e48074834fb5b888d53b00f84967701d6d78a Reported-by: ernsteiswuerfel <erhard_f <AT> mailbox.org> Closes: https://bugs.gentoo.org/792555 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-sound/cantata/cantata-2.4.2.ebuild | 5 +++- .../cantata/files/cantata-2.4.2-solid-musl.patch | 29 ++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/media-sound/cantata/cantata-2.4.2.ebuild b/media-sound/cantata/cantata-2.4.2.ebuild index 3c42d80b49d..19e2a7c4abd 100644 --- a/media-sound/cantata/cantata-2.4.2.ebuild +++ b/media-sound/cantata/cantata-2.4.2.ebuild @@ -66,7 +66,10 @@ DEPEND="${COMMON_DEPEND} # cantata has no tests RESTRICT="test" -PATCHES=( "${FILESDIR}/${PN}-2.2.0-headers.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-2.2.0-headers.patch" + "${FILESDIR}/${P}-solid-musl.patch" # bug 792555 +) src_prepare() { remove_locale() { diff --git a/media-sound/cantata/files/cantata-2.4.2-solid-musl.patch b/media-sound/cantata/files/cantata-2.4.2-solid-musl.patch new file mode 100644 index 00000000000..6b541536c62 --- /dev/null +++ b/media-sound/cantata/files/cantata-2.4.2-solid-musl.patch @@ -0,0 +1,29 @@ +From 835e48074834fb5b888d53b00f84967701d6d78a Mon Sep 17 00:00:00 2001 +From: Michael Pyne <mp...@kde.org> +Date: Sun, 23 Jul 2017 11:37:10 -0400 +Subject: [PATCH] Require sys/types.h for dev_t unconditionally. + +Fixes a build error with musl libc. Turns out this is the required +header for dev_t, and not just for FreeBSD. That it works without on +glibc is just an accident. + +Differential Revision: https://phabricator.kde.org/D6596 + +(cherry picked from commit 2382c3f8d3669c473130f4baefb68d244dcb5cbc) +--- + 3rdparty/solid-lite/backends/udisks2/udisksblock.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/3rdparty/solid-lite/backends/udisks2/udisksblock.h b/3rdparty/solid-lite/backends/udisks2/udisksblock.h +index 87c358099a..7b7305d73e 100644 +--- a/3rdparty/solid-lite/backends/udisks2/udisksblock.h ++++ b/3rdparty/solid-lite/backends/udisks2/udisksblock.h +@@ -24,6 +24,8 @@ + #include <solid-lite/ifaces/block.h> + #include "udisksdeviceinterface.h" + ++#include <sys/types.h> // dev_t ++ + namespace Solid + { + namespace Backends
