diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2021-08-05 21:06:51 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2021-08-05 21:08:21 +0200 |
| commit | 656f75dd8ebd952db3a9e8dca9684bd59443f3ad (patch) | |
| tree | 7b4574e687d51897e18ab9a87ffe5f2932301094 /media-sound/cantata | |
| parent | media-video/gaupol: drop 1.8-r1 (diff) | |
| download | gentoo-656f75dd8ebd952db3a9e8dca9684bd59443f3ad.tar.gz gentoo-656f75dd8ebd952db3a9e8dca9684bd59443f3ad.tar.bz2 gentoo-656f75dd8ebd952db3a9e8dca9684bd59443f3ad.zip | |
media-sound/cantata: Fix build with musl libc
Upstream commit 835e48074834fb5b888d53b00f84967701d6d78a
Reported-by: ernsteiswuerfel <erhard_f@mailbox.org>
Closes: https://bugs.gentoo.org/792555
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'media-sound/cantata')
| -rw-r--r-- | media-sound/cantata/cantata-2.4.2.ebuild | 5 | ||||
| -rw-r--r-- | media-sound/cantata/files/cantata-2.4.2-solid-musl.patch | 29 |
2 files changed, 33 insertions, 1 deletions
diff --git a/media-sound/cantata/cantata-2.4.2.ebuild b/media-sound/cantata/cantata-2.4.2.ebuild index 3c42d80b49d1..19e2a7c4abd3 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 000000000000..6b541536c62e --- /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 <mpyne@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 |