From c74f641ea9c4c60fa431010067042feb267d4e75 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Thu, 30 Jul 2009 11:11:10 +0000 Subject: Fix building with GCC 4.4 wrt #277579. Package-Manager: portage-2.2_rc33/cvs/Linux x86_64 --- media-plugins/vdr-amarok/ChangeLog | 8 ++++++-- media-plugins/vdr-amarok/Manifest | 15 +++------------ .../vdr-amarok/files/vdr-amarok-0.0.2-gcc4.4.patch | 11 +++++++++++ media-plugins/vdr-amarok/vdr-amarok-0.0.2.ebuild | 7 ++++--- 4 files changed, 24 insertions(+), 17 deletions(-) create mode 100644 media-plugins/vdr-amarok/files/vdr-amarok-0.0.2-gcc4.4.patch (limited to 'media-plugins/vdr-amarok') diff --git a/media-plugins/vdr-amarok/ChangeLog b/media-plugins/vdr-amarok/ChangeLog index b1a416832c55..10e2b4da54e3 100644 --- a/media-plugins/vdr-amarok/ChangeLog +++ b/media-plugins/vdr-amarok/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-plugins/vdr-amarok -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-amarok/ChangeLog,v 1.3 2008/12/17 14:15:34 zzam Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-amarok/ChangeLog,v 1.4 2009/07/30 11:11:10 ssuominen Exp $ + + 30 Jul 2009; Samuli Suominen + vdr-amarok-0.0.2.ebuild, +files/vdr-amarok-0.0.2-gcc4.4.patch: + Fix building with GCC 4.4 wrt #277579. 17 Dec 2008; Matthias Schwarzott +files/vdr-amarok-0.0.2-gcc4.3.patch, vdr-amarok-0.0.2.ebuild: diff --git a/media-plugins/vdr-amarok/Manifest b/media-plugins/vdr-amarok/Manifest index f09301c597d6..03c35da4a26d 100644 --- a/media-plugins/vdr-amarok/Manifest +++ b/media-plugins/vdr-amarok/Manifest @@ -1,15 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX vdr-amarok-0.0.2-gcc4.3.patch 828 RMD160 4b4ef6f7feee4a32736db264a01126381084df7c SHA1 d26e54098ec664e60f17fc805009bacd82d7e0e9 SHA256 e6346d63914a91cc124e9c5994f040348c4c829bbb1e36b9283e06d777a5a718 +AUX vdr-amarok-0.0.2-gcc4.4.patch 502 RMD160 3aa22a4dde08ff21f85925aefc7bbd3611d32e11 SHA1 055f31b3a807c4bc8e6f20a5cf0f40998dea9b3c SHA256 d5d640a8e84bdad468d77369fb38b56a4e6730847cae3fd84a141d5d05263fd7 DIST vdr-amarok-0.0.2.tar.bz2 51816 RMD160 393827e9566d26b93da4fc6a5dc4860ab4674d6c SHA1 c5a22ff55bb0366965aa5a360191d1cfdc17fde2 SHA256 b96b6845eba17d500eeccc85f97cc0480e057801657133302ed7271167372a91 -EBUILD vdr-amarok-0.0.2.ebuild 696 RMD160 b930f02e52108756146f78081cfca6115bce5bd5 SHA1 d3ca10627f163e9eb2eaa008a7cd976b1e45f25d SHA256 3ab65352a3098119c62ae1f0a0439b7ca2a09a58209fb5a9c2eb401de38db4cc -MISC ChangeLog 655 RMD160 e7681119ac1768b857d5c36e4a7d2ff5e3673746 SHA1 626692635e9cf9808c8c4528437cdb0e24ae51e4 SHA256 6ec170dee0aed910c2599184ebc93a7797b0c6d809e4d210b704a17b1f03bc51 +EBUILD vdr-amarok-0.0.2.ebuild 736 RMD160 3226c5040b5ae838c48fea18fa5d7375c3844dbf SHA1 06c11d20c449113f8bfd74b2c84ee997c9c17a7b SHA256 46b13a2369053e1005dbce5aa37ec0d1130403ced9c118ba1c0d3c704a1ee0a9 +MISC ChangeLog 821 RMD160 4922cc3427542bf3dcf91af448d12c206cbc46d2 SHA1 a11c58c900a9e37a7fb16473f189358f1a4cb379 SHA256 4c21ed20fbbc5497120bb732f9e2b370f339ee8719b6cdf7f90f2aa219b69cbf MISC metadata.xml 258 RMD160 3978316b72989b0150dd21a2ba1f2449a158ebc9 SHA1 4ed083cc2156c1d9ea22136d69bcdd9da3d758b9 SHA256 1d6292676863287cee09b69ba35f3ea7546ed6718a3fea1d326deae735dadf64 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.9 (GNU/Linux) - -iEYEARECAAYFAklJCZgACgkQt2vP6XvVdOeqqwCfeC0aK7CWGrldxqEooxW9uFi/ -xQgAnRKXDFjcjyLpW/EDrpgh1eKjcKnQ -=R12h ------END PGP SIGNATURE----- diff --git a/media-plugins/vdr-amarok/files/vdr-amarok-0.0.2-gcc4.4.patch b/media-plugins/vdr-amarok/files/vdr-amarok-0.0.2-gcc4.4.patch new file mode 100644 index 000000000000..87a8cef5f150 --- /dev/null +++ b/media-plugins/vdr-amarok/files/vdr-amarok-0.0.2-gcc4.4.patch @@ -0,0 +1,11 @@ +diff -ur amarok-0.0.2.orig/amarokCommander.cpp amarok-0.0.2/amarokCommander.cpp +--- amarok-0.0.2.orig/amarokCommander.cpp 2006-12-10 23:34:15.000000000 +0200 ++++ amarok-0.0.2/amarokCommander.cpp 2009-07-30 14:10:38.000000000 +0300 +@@ -18,6 +18,7 @@ + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ***************************************************************************/ + ++#include + #include + #include "amarokCommander.h" + #include "amarokData.h" diff --git a/media-plugins/vdr-amarok/vdr-amarok-0.0.2.ebuild b/media-plugins/vdr-amarok/vdr-amarok-0.0.2.ebuild index bd9779777a1c..19c5d69b9729 100644 --- a/media-plugins/vdr-amarok/vdr-amarok-0.0.2.ebuild +++ b/media-plugins/vdr-amarok/vdr-amarok-0.0.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-amarok/vdr-amarok-0.0.2.ebuild,v 1.4 2008/12/17 14:15:34 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-amarok/vdr-amarok-0.0.2.ebuild,v 1.5 2009/07/30 11:11:10 ssuominen Exp $ inherit vdr-plugin @@ -15,7 +15,8 @@ IUSE="" DEPEND=">=media-video/vdr-1.4.0" -PATCHES=("${FILESDIR}/${P}-gcc4.3.patch") +PATCHES=( "${FILESDIR}/${P}-gcc4.3.patch" + "${FILESDIR}/${P}-gcc4.4.patch" ) pkg_postinst() { vdr-plugin_pkg_postinst -- cgit v1.2.3-65-gdbad