diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2011-09-10 10:56:07 +0000 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2011-09-10 10:56:07 +0000 |
| commit | d6d84b08ef457d152e823e90837848ee6ff553f0 (patch) | |
| tree | 12a69f149a0a875a1113e2ff0b1276fbd8adfb57 /media-libs | |
| parent | Version bump, remove old. (diff) | |
| download | gentoo-2-d6d84b08ef457d152e823e90837848ee6ff553f0.tar.gz gentoo-2-d6d84b08ef457d152e823e90837848ee6ff553f0.tar.bz2 gentoo-2-d6d84b08ef457d152e823e90837848ee6ff553f0.zip | |
Fix build with gcc-4.6 (bug #363725, patch by Sergey Zubkov).
(Portage version: 2.2.0_alpha55/cvs/Linux x86_64)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/libsfml/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/libsfml/files/libsfml-1.6-gcc46.patch | 11 | ||||
| -rw-r--r-- | media-libs/libsfml/libsfml-1.6-r1.ebuild | 5 |
3 files changed, 19 insertions, 3 deletions
diff --git a/media-libs/libsfml/ChangeLog b/media-libs/libsfml/ChangeLog index 2a568609d1b7..3364750b745d 100644 --- a/media-libs/libsfml/ChangeLog +++ b/media-libs/libsfml/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libsfml # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libsfml/ChangeLog,v 1.5 2011/02/07 18:37:21 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libsfml/ChangeLog,v 1.6 2011/09/10 10:56:07 radhermit Exp $ + + 10 Sep 2011; Tim Harder <radhermit@gentoo.org> libsfml-1.6-r1.ebuild, + +files/libsfml-1.6-gcc46.patch: + Fix build with gcc-4.6 (bug #363725, patch by Sergey Zubkov). 07 Feb 2011; Tim Harder <radhermit@gentoo.org> libsfml-1.6-r1.ebuild: Minor fixes as suggested by Mr_Bones. diff --git a/media-libs/libsfml/files/libsfml-1.6-gcc46.patch b/media-libs/libsfml/files/libsfml-1.6-gcc46.patch new file mode 100644 index 000000000000..9b31d1b0e409 --- /dev/null +++ b/media-libs/libsfml/files/libsfml-1.6-gcc46.patch @@ -0,0 +1,11 @@ +--- SFML-1.6.old/include/SFML/System/Resource.hpp ++++ SFML-1.6/include/SFML/System/Resource.hpp +@@ -29,7 +29,7 @@ + // Headers
+ ////////////////////////////////////////////////////////////
+ #include <set>
+-
++#include <cstddef>
+
+ namespace sf
+ {
diff --git a/media-libs/libsfml/libsfml-1.6-r1.ebuild b/media-libs/libsfml/libsfml-1.6-r1.ebuild index 06ced9e07f61..73fddcc7594f 100644 --- a/media-libs/libsfml/libsfml-1.6-r1.ebuild +++ b/media-libs/libsfml/libsfml-1.6-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libsfml/libsfml-1.6-r1.ebuild,v 1.2 2011/02/07 18:37:21 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libsfml/libsfml-1.6-r1.ebuild,v 1.3 2011/09/10 10:56:07 radhermit Exp $ EAPI=4 @@ -32,7 +32,8 @@ S=${WORKDIR}/${MY_P} src_prepare() { epatch "${FILESDIR}"/${P}-destdir.patch \ - "${FILESDIR}"/${P}-deps-and-flags.patch + "${FILESDIR}"/${P}-deps-and-flags.patch \ + "${FILESDIR}"/${P}-gcc46.patch } src_compile() { |