Fix build with gcc-4.6 (bug #363725, patch by Sergey Zubkov).

Package-Manager: portage-2.2.0_alpha55/cvs/Linux x86_64

diff --git a/media-libs/libsfml/ChangeLog b/media-libs/libsfml/ChangeLog
index 2a568609d1b73c822928efe5a0ad9a28fe1456b2..3364750b745d879cae01d449e064eab268974682 100644 (file)
--- 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/Manifest b/media-libs/libsfml/Manifest
index 8202e71dd30a2a319f2cabd0bf761a8abf67e142..6eff392f058d225e256f81f19ae07c654705c396 100644 (file)
--- a/media-libs/libsfml/Manifest
+++ b/media-libs/libsfml/Manifest
@@ -1,20 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX libsfml-1.6-deps-and-flags.patch 3546 RMD160 f1b2b9391d193a42e8d554936a45cc57143f1583 SHA1 53910669d105fd0d2fa8118e447b9ed87f74c849 SHA256 ae54446a78d96ec373dd8f28c7db7d8d64a87f90ae9d79d36ca14bec9ef7e813
 AUX libsfml-1.6-destdir.patch 3855 RMD160 a1152276e723dba9246e5fb252c3f5426266e21a SHA1 10e6d368db1c51c6ebc7378171efcc706138d992 SHA256 2f4343f60460bda2ad7b121e3e00a03b52c44366f488af1bfac7914019dc0094
+AUX libsfml-1.6-gcc46.patch 253 RMD160 58fb41cbfa2c509705d0569c8bfb188144326279 SHA1 af254cd682fc8a89c6bcf35d6781468d75dcade0 SHA256 87d9feb405492654f3423bcb43e4895a6856a70ae518f9e6951cc1b257399bdf
 DIST SFML-1.6-sdk-linux-32.tar.gz 12937755 RMD160 78058f4d24667b015c3e11421f0a0a01c49652b7 SHA1 85e3e0a73982678c2c0ab32275be7e365822d69c SHA256 b1c18f9b99c54ebb4cd433792f33ed2b85c846cca28eb871a12b3191dc1532f8
-EBUILD libsfml-1.6-r1.ebuild 1492 RMD160 34008c752967c7dcb73f1246e2464daa63290596 SHA1 24690b9276d2cdf3c2a43cb82c1288931d46d34b SHA256 ae08b7cc44265db90c58ff89d4f6354a4856767456107ba596a867c4780f5b9b
-MISC ChangeLog 1114 RMD160 ffeef66a7e31cf655adc69f884629af1a2f4b8dc SHA1 9911514e3a56f818b480f92f0d80df43217f1854 SHA256 a65990dd8818b47ceb2dccef5ea1b3877d802b63fdc86bdaab4db3187ddd2100
+EBUILD libsfml-1.6-r1.ebuild 1527 RMD160 332feb7e27ae18dd9646dd1e6de043ca044e1db8 SHA1 3c7ee926a910c9a95e8291c35e6e80fa3fdebab7 SHA256 00d4443b129c36eadbcdd05fb5b53e8100d6b1a47232c3cde98d23686d71a2fb
+MISC ChangeLog 1285 RMD160 0edcd3246eb2b543db457c6cde3c033044c42a11 SHA1 1c2b077fd690ed80fdd73a12e5dff65ce9fb7faf SHA256 164120f4103f21fb258531a58a3d1986c14cfa63abee80f28705c714330ae55a
 MISC metadata.xml 700 RMD160 db8950492c530186cec595e3fd2aefcfafa8067a SHA1 41001abc20e670f11a93fe278527b5755fdcc6cd SHA256 390a9c11770462b79093e3f0fc13b68065d49fbef5b140e81e19294bb896dcb7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJNUDvuAAoJEEqz6FtPBkyj4AMH/RHbjlMtPTG7fdxNM5oA7Moc
-RbdIOd763iHY1ftozirHLe2D63TW/AjW16tPeexWh5N0AounC47EpfHMhNL0bv3j
-Fl0vffvtd9BNmfgX1nUxtL6+oVYJxudu/R8l3NRgWEKnKx9XLk/X8dkP8I/T7o/a
-fN8Ud6Y3oLPqhp/uk9WenLMSPGscouuOYT7SktDQC16d1+VttNDodmeqItz7+CBo
-647xUWir6peoygwmfMexylSzvzPkkvv56yflYroBI35z1iJV4XW5G6nYjkvQCYRr
-3hLqMlK4/OJrBB2vGTyJT2g/uTxv0O24fBvMB5r+rP9ROyqNlI2RZe7QtXjgAK0=
-=eqyw
+iQEcBAEBCgAGBQJOa0JNAAoJEEqz6FtPBkyjzjsH/12oZGMw8yOWiGDihj/XFb8M
+GbTljhpqHRfxyZaCdZVYkOXXlUKmfy1JdDYQKMpSdPg0MJ88Dupp5AlVlMhjNzcm
+CHq9TIjuQ1UFBltpiMoxPOta5O9fHt5qzyLcrL0myWpsgqdFHFzOzkbF3tl2bU/7
+7LPdiywqVFv7MNM67LO3c5l3Qwml5e6LgjXJK7i+iHp+z5FvGbyKLjCc6nry8l2w
+ziCKn/8lFrwhs2J+6t+H8RN8u0md7SfuzYo8UqmIYK8e+YWvq4H235fqMalPezhB
+dvOUtro9Elxi1UuDv0zAPDll9PzYonh/QpCiATDKzDuf7swIv4tUwvMCf/ZzkrA=
+=Sl9l
 -----END PGP SIGNATURE-----

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 (file)
index 0000000..9b31d1b
--- /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\r
+ ////////////////////////////////////////////////////////////\r
+ #include <set>\r
+-\r
++#include <cstddef>\r
+ \r
+ namespace sf\r
+ {\r

diff --git a/media-libs/libsfml/libsfml-1.6-r1.ebuild b/media-libs/libsfml/libsfml-1.6-r1.ebuild
index 06ced9e07f617037225c3f247b0399cd53ca078e..73fddcc7594fb920ec7b42bf323126dc8af57cbf 100644 (file)
--- 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() {