diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2009-08-15 18:18:15 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-08-15 18:18:15 +0000 |
| commit | 05d08f3e745c3c23139b9a369f4909e3fcb2edc8 (patch) | |
| tree | 553debd788ad396254a6e17c96839b2f41d21e65 /media-sound | |
| parent | Bug #281311 - Escape ~ inside strip-flags(). (diff) | |
| download | gentoo-2-05d08f3e745c3c23139b9a369f4909e3fcb2edc8.tar.gz gentoo-2-05d08f3e745c3c23139b9a369f4909e3fcb2edc8.tar.bz2 gentoo-2-05d08f3e745c3c23139b9a369f4909e3fcb2edc8.zip | |
Include string.h for strcmp wrt #281217.
(Portage version: 2.2_rc38/cvs/Linux x86_64)
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/amarok/ChangeLog | 6 | ||||
| -rw-r--r-- | media-sound/amarok/amarok-1.4.10_p20090130-r3.ebuild | 3 | ||||
| -rw-r--r-- | media-sound/amarok/files/amarok-libmp4v2-2.patch | 23 |
3 files changed, 30 insertions, 2 deletions
diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog index ec5e674159ac..54708065d4c4 100644 --- a/media-sound/amarok/ChangeLog +++ b/media-sound/amarok/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/amarok # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.336 2009/08/15 08:47:44 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.337 2009/08/15 18:18:15 ssuominen Exp $ + + 15 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> + amarok-1.4.10_p20090130-r3.ebuild, +files/amarok-libmp4v2-2.patch: + Include string.h for strcmp wrt #281217. 15 Aug 2009; Markus Meier <maekke@gentoo.org> amarok-1.4.10_p20090130-r3.ebuild: diff --git a/media-sound/amarok/amarok-1.4.10_p20090130-r3.ebuild b/media-sound/amarok/amarok-1.4.10_p20090130-r3.ebuild index f581a176c15c..af154b9aec74 100644 --- a/media-sound/amarok/amarok-1.4.10_p20090130-r3.ebuild +++ b/media-sound/amarok/amarok-1.4.10_p20090130-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.10_p20090130-r3.ebuild,v 1.3 2009/08/15 08:47:44 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.10_p20090130-r3.ebuild,v 1.4 2009/08/15 18:18:15 ssuominen Exp $ EAPI="2" @@ -76,6 +76,7 @@ PATCHES=( "${FILESDIR}/${PN}-1.4.10-gcc-4.3.patch" "${FILESDIR}/${PN}-1.4.10-gcc44.patch" "${FILESDIR}/${PN}-libmp4v2.patch" + "${FILESDIR}/${PN}-libmp4v2-2.patch" "${WORKDIR}/${PN}-1.4.10-post20090130.diff" "${WORKDIR}/${PN}-1.4.10-desktop-entry.diff" ) diff --git a/media-sound/amarok/files/amarok-libmp4v2-2.patch b/media-sound/amarok/files/amarok-libmp4v2-2.patch new file mode 100644 index 000000000000..39501f79682e --- /dev/null +++ b/media-sound/amarok/files/amarok-libmp4v2-2.patch @@ -0,0 +1,23 @@ +diff -ur amarok-1.4.10_p20090130-r3-orig/work/amarok-1.4.10/amarok/src/metadata/mp4/mp4properties.cpp amarok-1.4.10_p20090130-r3/work/amarok-1.4.10/amarok/src/metadata/mp4/mp4properties.cpp +--- amarok-1.4.10_p20090130-r3-orig/work/amarok-1.4.10/amarok/src/metadata/mp4/mp4properties.cpp 2009-08-15 15:28:01.000000000 +0700 ++++ amarok-1.4.10_p20090130-r3/work/amarok-1.4.10/amarok/src/metadata/mp4/mp4properties.cpp 2009-08-15 15:32:06.000000000 +0700 +@@ -28,7 +28,7 @@ + #ifdef HAVE_SYSTEMS_H + #include <systems.h> + #endif +- ++#include <string.h> + #include <stdint.h> + #include <sys/types.h> + +diff -ur amarok-1.4.10_p20090130-r3-orig/work/amarok-1.4.10/amarok/src/metadata/mp4/taglib_mp4filetyperesolver.cpp amarok-1.4.10_p20090130-r3/work/amarok-1.4.10/amarok/src/metadata/mp4/taglib_mp4filetyperesolver.cpp +--- amarok-1.4.10_p20090130-r3-orig/work/amarok-1.4.10/amarok/src/metadata/mp4/taglib_mp4filetyperesolver.cpp 2008-08-14 04:21:51.000000000 +0700 ++++ amarok-1.4.10_p20090130-r3/work/amarok-1.4.10/amarok/src/metadata/mp4/taglib_mp4filetyperesolver.cpp 2009-08-15 15:32:28.000000000 +0700 +@@ -24,6 +24,7 @@ + + #include "taglib_mp4filetyperesolver.h" + #include "mp4file.h" ++#include <string.h> + + TagLib::File *MP4FileTypeResolver::createFile(const char *fileName, + bool readProperties, |