From ebc0d5f55c5b43901be369dc7cfc43f469e8fa21 Mon Sep 17 00:00:00 2001 From: Christoph Mende Date: Fri, 28 Nov 2014 19:45:13 +0000 Subject: [PATCH] Remove strndup definition from libmpd-internal.h to fix compilation on glibc-2.20 (bug #528692) Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0x84F20B43 --- media-libs/libmpd/ChangeLog | 11 ++++- media-libs/libmpd/Manifest | 12 +++--- .../files/libmpd-11.8.17-remove-strndup.patch | 15 +++++++ media-libs/libmpd/libmpd-11.8.17-r1.ebuild | 43 +++++++++++++++++++ 4 files changed, 74 insertions(+), 7 deletions(-) create mode 100644 media-libs/libmpd/files/libmpd-11.8.17-remove-strndup.patch create mode 100644 media-libs/libmpd/libmpd-11.8.17-r1.ebuild diff --git a/media-libs/libmpd/ChangeLog b/media-libs/libmpd/ChangeLog index f4c498ae9fb2..b5870bce99e0 100644 --- a/media-libs/libmpd/ChangeLog +++ b/media-libs/libmpd/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-libs/libmpd -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpd/ChangeLog,v 1.68 2012/07/12 14:58:04 angelos Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpd/ChangeLog,v 1.69 2014/11/28 19:45:12 angelos Exp $ + +*libmpd-11.8.17-r1 (28 Nov 2014) + + 28 Nov 2014; Christoph Mende + +files/libmpd-11.8.17-remove-strndup.patch, +libmpd-11.8.17-r1.ebuild: + Remove strndup definition from libmpd-internal.h to fix compilation on + glibc-2.20 (bug #528692) 12 Jul 2012; Christoph Mende -files/libmpd-0.20.0-overflow.patch, -libmpd-9999.ebuild: diff --git a/media-libs/libmpd/Manifest b/media-libs/libmpd/Manifest index ae3d8eaf936b..bddadc365f73 100644 --- a/media-libs/libmpd/Manifest +++ b/media-libs/libmpd/Manifest @@ -1,14 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX libmpd-11.8.17-remove-strndup.patch 439 SHA256 3ecbc0cf560fc66cdd9c5da72d02089ba684965c9ed17a8fc55a0ce6231e58a7 SHA512 0b0c3b28abd7aaf540d6133ad5a72f5e0fc2cca593bc870106c17d9b1828a2bb35880436a489261ef1c56bbb176e0809d6f09165108bf867f776902cd5757fff WHIRLPOOL 8b7f7b2cfc609a98c00ecbcdd827ff4ebee8b72c78ed045308e7975f28b0a8c50f886c1fec0920a1052ecd2cfbd2a10972707e616f18619aa14d8be588e2f2b4 DIST libmpd-11.8.17.tar.gz 365015 SHA256 fe20326b0d10641f71c4673fae637bf9222a96e1712f71f170fca2fc34bf7a83 SHA512 ffe2880834a4a39745a5327d628781e16eeb8cd1ec17402dda46ad96ff402bc0d8b4312ba058a39242ad9bb8c3a0bb6feb2c5ea2a30ef9be97652fdb5c02572d WHIRLPOOL b5fe844e7a21229c2c4a50080964e13ee1bc7b69257b604d0a62e476ae24df24b6923bd8cdd9970d2335aa27a84c68f8c33983527304f16e32ccc35d5bcacca2 +EBUILD libmpd-11.8.17-r1.ebuild 1047 SHA256 86407346a00949d1cefccab89cc3ba83f5e049953752f1745013acaebaec3b28 SHA512 e7eb2e496456cacdbc1d142867ccca6f0f44b6afe9f6964f83ef1f88d8a0aa70c88f08d9c13db6139bf4b0c95cc709455d07ac24d80dabf0d2fe97731ebd6025 WHIRLPOOL 8075bf671d1a3a2f5dc07632eac3c305c979723e66f3609e6eefc9a90d784104ab195e2be9dc55d6b857bbf93ad5da1487c23bb3cec683a9846652850c84899c EBUILD libmpd-11.8.17.ebuild 957 SHA256 7d5cc4fc9464934ee428e580a0ef77516ae878ca650371a1f170657094a1ac69 SHA512 438ad8883c39222bfc0dca648fb1b2d1b51ffa1163ba793ff2cc62ff8ccf8a931dddac8056d8daf2c1f58bfb57b604863d3e197d1fe92d0117cd31d9ed32097d WHIRLPOOL 87667e8831da24cffa5d36d5ac4af44b439f86089433b4f71e0261461ce5bf618a9850c6663bdb1314af481bc5485de0a0512dfb8e641b73f13ac3959630a9ac -MISC ChangeLog 8115 SHA256 5671da07e95ff93d70c7732d95010657da3171e542ae71dfdf24be218b91b05e SHA512 02dbb1b5f06ff5480089c9a24d2226a7a5c3dc44f5463b8fcd39ebedcfc76934d7bd3953baaaebc67ea3e1a16a8d80539347b37b85b0523b7cf5bdc2326e4ee3 WHIRLPOOL b43b65e16434511c45bfbd56ddf3e9a770be9b17396a5c2a6f9b69e496949ca7eec7989b21ff1f498157e78ab738221c80c69a0f225a1d846832afdea38763f8 +MISC ChangeLog 8375 SHA256 e7f334cebb0c2af07cc32cdd9d971f6d287ce581e078949e32345a59b9a7ef8b SHA512 3e0dc19d73ca8c0bc4b5244f74861e0b484fd2f120888689853631b2c28faa8369703a40ea26151f8aa39975a396266650ec2827bf9318fe353e4579791cdc9c WHIRLPOOL bfd3a855a68e4b17b3187fc2a4c78a8bff1440b2b5c69aff4534b0cfb14e7784495648615ddec5577ea0539d5407c86ce164f8a909fa527a7046ede1116823d2 MISC metadata.xml 334 SHA256 8ad42f0dc42a9c3e339573a8e5b259bc35f44284818b98479b8f8fbd1b60253c SHA512 d94304fbf8f72b05299611772f4e5d2d9743ff1299437637d14ca4d252c3cd0f467a08826a4a875580c83d7dc269bfd717aeb865f34ebe5227d1fb23ec125d6b WHIRLPOOL 56889c6eb3cd03c5e791f41da52909bf4a3e8a645fe243270ab456189a9dd710ebe447653e351da23bd4085ad7cfa694ad14753934b1a1ed35465b212b9a50fc -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2 -iF4EAREIAAYFAk/+5fMACgkQmWq1bYTyC0OxGwEAwI4h7lmPpS6WGSe5xSMyOF0N -nDp/UPHmrjcpr+PJCHsA/2K9bw8BHzSFVLL21/CqfSNjjHjJwa3d6LG++zweZoW/ -=Pkxs +iF4EAREIAAYFAlR40MkACgkQmWq1bYTyC0OXJgD/eaZ4Zq5zIgNu38So0iDhdkRI +HODTrJcjE8L5xv+tQz0A/1QLg5xh26UtfX90GtstSPYSXx72leGDmXZ78BlmIJmH +=wMpB -----END PGP SIGNATURE----- diff --git a/media-libs/libmpd/files/libmpd-11.8.17-remove-strndup.patch b/media-libs/libmpd/files/libmpd-11.8.17-remove-strndup.patch new file mode 100644 index 000000000000..ad4fdc02ef3e --- /dev/null +++ b/media-libs/libmpd/files/libmpd-11.8.17-remove-strndup.patch @@ -0,0 +1,15 @@ +diff --git a/src/libmpd-internal.h b/src/libmpd-internal.h +index c84c3a4..51be441 100644 +--- a/src/libmpd-internal.h ++++ b/src/libmpd-internal.h +@@ -206,10 +206,6 @@ int mpd_unlock_conn(MpdObj *mi); + MpdData * mpd_misc_sort_tag_list(MpdData *data); + + +-#ifndef HAVE_STRNDUP +-char * strndup (const char *s, size_t n); +-#endif +- + int mpd_server_get_allowed_commands(MpdObj *mi); + typedef enum _MpdSearchType { + MPD_SEARCH_TYPE_NONE, diff --git a/media-libs/libmpd/libmpd-11.8.17-r1.ebuild b/media-libs/libmpd/libmpd-11.8.17-r1.ebuild new file mode 100644 index 000000000000..5b0c011d653e --- /dev/null +++ b/media-libs/libmpd/libmpd-11.8.17-r1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpd/libmpd-11.8.17-r1.ebuild,v 1.1 2014/11/28 19:45:12 angelos Exp $ + +EAPI=4 + +inherit eutils + +DESCRIPTION="A library handling connections to a MPD server" +HOMEPAGE="http://gmpc.wikia.com/wiki/Libmpd" +SRC_URI="http://download.sarine.nl/Programs/gmpc/11.8/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-interix ~amd64-linux ~x86-linux" +IUSE="doc static-libs" + +RDEPEND=">=dev-libs/glib-2.16:2" +DEPEND="${RDEPEND} + virtual/pkgconfig + doc? ( app-doc/doxygen )" + +src_prepare() { + epatch "${FILESDIR}"/${P}-remove-strndup.patch +} + +src_configure() { + econf \ + $(use_enable static-libs static) \ + --docdir="${EPREFIX}"/usr/share/doc/${PF} +} + +src_compile() { + emake + use doc && emake -C doc doc +} + +src_install() { + default + use doc && dohtml -r doc/html/* + find "${ED}" -name "*.la" -exec rm -rf {} + || die + rm "${ED}"/usr/share/doc/${PF}/{README,ChangeLog} || die +} -- 2.26.2