diff options
Diffstat (limited to 'media-sound/cantata')
| -rw-r--r-- | media-sound/cantata/Manifest | 3 | ||||
| -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 |
3 files changed, 35 insertions, 2 deletions
diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest index c4bb0c438f3f..e6b423de7316 100644 --- a/media-sound/cantata/Manifest +++ b/media-sound/cantata/Manifest @@ -1,4 +1,5 @@ AUX cantata-2.2.0-headers.patch 1345 BLAKE2B b11ef0fa85f0e851a812ba2b106a854f7c429ac9f757bb0b33edeab9db8f05779815ca22918811852ba895529eb7e38466057215c124c3889b97a55752ad6428 SHA512 e9c1a3fc756bd3ed37bd8729433d48d4bb652d3fd7d95b3a6024b4b1d6cda72205d1326214b283377a1ee0b376fe1199c351006e8e640ed6ca9ed98f74c1b7df +AUX cantata-2.4.2-solid-musl.patch 1035 BLAKE2B 43b0f3312e93f8fe92b56dd488a70c815f448b6907ae1db3418f65aaef394f06ffb82279c483185cc4cde74081b28a0bba3b92c8c5a29f2fff2d3ff5ab510d67 SHA512 eb34e0939500b9176829347329ed508f0ba08e92cf450b949661a103782385cfd9175551cd8f0832799ebcf116c89cca98fad4eaa236729c38c1724b5b981221 DIST cantata-2.4.2.tar.bz2 2498460 BLAKE2B 82486a644fa90567f2c1c997645817d9adee841b79fb782c4984143a0ef25758e8b6605de86eed1c09b2b63b9d570adc0c647245c5e0e900652c0444671c67a7 SHA512 c2459a53d86e12df7e6a8f7c19880f1c353c13893401a0906ec730c34ccbf1ef070c226b55c4e772e9a54a94e7cf3a2f96b0e9223ff20057045c888c4f91d87b -EBUILD cantata-2.4.2.ebuild 3023 BLAKE2B d67a40780e02d9b501c946e3b0a1658b717da096cd8d258c5d4d31d9829429c715d1c94a797ec1305067c60d5c81327e93f21f6b6a737211690b7d161d011d9a SHA512 eaf95a88f371d2fb7085555bf2273605b4c68d8e6a14419005d6975c777a6ecd77c0c32608f61cc967f3f1cb26838b2348e5b3a07f02e27aecfffa04c8ac32c3 +EBUILD cantata-2.4.2.ebuild 3074 BLAKE2B 9b296e832b7436de60c1a7966cdf8e81190eef8558b611e5ca0ef26c16445ab3143cb88d93e25a5f2974aed623911b6ef5f094bff610d8f029fd484db38e7364 SHA512 8f70c086d37c4d708d8013819df44a468efe62e35c017dc5ee381ac7724161528d4d0764ec6d8416553838056012e317448cb8acf1d91ba18166e5d98de3219c MISC metadata.xml 739 BLAKE2B 48f6246515dd08a87d867e69f1d03042ef1018654bcd726e8d91366c15e7b1275ec60f5a6df8bc38c8310d1b24b1b0f355b5339ab30be7c11f57ebe84d8c71f6 SHA512 1e212d1621607ea9a0523146e5eba5e16c9b5ddc7021d409c16ccc93840cffe39a9c601c222e97f37ab38e7c69fa5eac285872fa7a2f52b0f4e8a0cc1e520d97 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 |