summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2012-06-07 20:18:23 +0000
committerTim Harder <radhermit@gentoo.org>2012-06-07 20:18:23 +0000
commit17b013658b3b90922b84a55c80e925d061a72d48 (patch)
treea79ef9d45251a5c3aa3c7309f3507c31e5f022f5 /media-libs/libsfml
parentmarking ~ppc (bug 410601) (diff)
downloadhistorical-17b013658b3b90922b84a55c80e925d061a72d48.tar.gz
historical-17b013658b3b90922b84a55c80e925d061a72d48.tar.bz2
historical-17b013658b3b90922b84a55c80e925d061a72d48.zip
Fix build with gcc-4.7 (bug #420017 by Sergey Zubkov).
Package-Manager: portage-2.2.0_alpha109/cvs/Linux x86_64
Diffstat (limited to 'media-libs/libsfml')
-rw-r--r--media-libs/libsfml/ChangeLog8
-rw-r--r--media-libs/libsfml/Manifest21
-rw-r--r--media-libs/libsfml/files/libsfml-1.6-gcc47.patch11
-rw-r--r--media-libs/libsfml/libsfml-1.6-r1.ebuild5
4 files changed, 32 insertions, 13 deletions
diff --git a/media-libs/libsfml/ChangeLog b/media-libs/libsfml/ChangeLog
index 5bd1ef63ec22..670e9c81cdc8 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.7 2011/09/14 09:14:02 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsfml/ChangeLog,v 1.8 2012/06/07 20:18:23 radhermit Exp $
+
+ 07 Jun 2012; Tim Harder <radhermit@gentoo.org> libsfml-1.6-r1.ebuild,
+ +files/libsfml-1.6-gcc47.patch:
+ Fix build with gcc-4.7 (bug #420017 by Sergey Zubkov).
14 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> libsfml-1.6-r1.ebuild,
+files/libsfml-1.6-libpng15.patch:
diff --git a/media-libs/libsfml/Manifest b/media-libs/libsfml/Manifest
index b93df23fb0dd..a5a4b50bbc47 100644
--- a/media-libs/libsfml/Manifest
+++ b/media-libs/libsfml/Manifest
@@ -1,20 +1,23 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+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
+AUX libsfml-1.6-gcc47.patch 283 RMD160 ced2cb9f2b1370c7f214d5cbcdf6be550e57707f SHA1 85697ff5bc1aaafa04586598d989000b0c77fe3f SHA256 292f2fb0afb3fed73ce066021a2dfb5d007a5c595d7395319a62e4761161d2a7
AUX libsfml-1.6-libpng15.patch 566 RMD160 f082a98198bce2587fb5be74c0ba372c2eb81f76 SHA1 d1add452c596b05b9bae96e980491f4a9ce9b15d SHA256 caaa919fb601f2c83a3403695f6974955149f430904a7b9861389d9dc3e59fab
DIST SFML-1.6-sdk-linux-32.tar.gz 12937755 RMD160 78058f4d24667b015c3e11421f0a0a01c49652b7 SHA1 85e3e0a73982678c2c0ab32275be7e365822d69c SHA256 b1c18f9b99c54ebb4cd433792f33ed2b85c846cca28eb871a12b3191dc1532f8
-EBUILD libsfml-1.6-r1.ebuild 1575 RMD160 5321de0526b8b59f3909a0022bab04d1e83f4790 SHA1 80a8752328e47fcb1be37f5f522f901961162a0d SHA256 4dc9ad01a60f161f8643f48a44f8c1fa37ba1b937bc0fd6278c78cd511970156
-MISC ChangeLog 1464 RMD160 7479bcec1462f8f1f7b3f0b50901541ffcfcb7a6 SHA1 dbffc2e867e3004be3130886795dca8d16087c4f SHA256 df552ef50f42f310300ec8cafbda4f68ca738c1870bd38eb4de9a47eb2d52027
+EBUILD libsfml-1.6-r1.ebuild 1610 RMD160 f85a1fad81bef21016935abbdb5f94506bb53f1e SHA1 e2c5d3ddd4fd761eef0e3618f794fa60974bbec2 SHA256 509436c2efa62b3142e692b9d30ef5bc5874433949a368e749e14849141f506b
+MISC ChangeLog 1628 RMD160 363494654c61182ad07df77c57a4013be6098165 SHA1 7bb6066bb7479c557bc70a0c3f19692d2347b0d5 SHA256 a32ec235bf61aff551a99284a5b90586be653a20753c118bf568e1839bff5412
MISC metadata.xml 678 RMD160 b140741848509604d37c0d00b4fbadd11a9e049d SHA1 0983324552166040d534495e4b0f1aca4535360b SHA256 56befeaa2bad0d2139834c1a193f107392c208448fdeafd55c65c32a02d620b6
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
-iJwEAQEIAAYFAk59pdIACgkQfXuS5UK5QB0xvAP/fn6DOSD6QRozSxXg051Uw9PY
-w/mpr3pH0dl20xKJxnBXNFPbsXokZF2GUhmoqkYBYv/nFGHxxAKFKwJGk1aB9Dlq
-uD3SjFh7g44kuzxsNzwL7kyluTL1S0OWG1XwBLWxR9mGWkMeihkBYGbnsgehof7X
-2a39PcDObVln9IAfgsY=
-=cWyY
+iQEcBAEBCgAGBQJP0QygAAoJEEqz6FtPBkyjFDAH/1Yr4Y+P4LOKvP1XsEq2JTEt
+Txb1cw02TCKqOzvMFZlN5wsdBJy1yHERCRu0kj27en01gtvvcoRhnWN4lcqxgJDm
+eogwaJ4eW54GNyJZw7kbrU0A4EwDlPiLNRS0ROn5b+Tio7sLy6PlEPXI1hB8tnP8
+zF5vwd9lSoACCJZNx8fNEm7bmetZ/sYSdXtqfOJ34imfEak79YxmyACLK1JwgNq3
+M87mtHFzibZEg45A7mXAKH8r3p9KtGn8XQCjU91l5WCRg1MYRzMgUi6XOh1SGOY8
+qyF9PdRMlXqaG2eKtIZvdcmKHptckiZcTR51Lo1N7QPafN/B22yVTnhg+GCBx+Y=
+=dWxT
-----END PGP SIGNATURE-----
diff --git a/media-libs/libsfml/files/libsfml-1.6-gcc47.patch b/media-libs/libsfml/files/libsfml-1.6-gcc47.patch
new file mode 100644
index 000000000000..8608cf538d56
--- /dev/null
+++ b/media-libs/libsfml/files/libsfml-1.6-gcc47.patch
@@ -0,0 +1,11 @@
+--- SFML-1.6/src/SFML/Window/Linux/Joystick.cpp
++++ SFML-1.6/src/SFML/Window/Linux/Joystick.cpp
+@@ -27,7 +27,7 @@
+ ////////////////////////////////////////////////////////////
+ #include <SFML/Window/Joystick.hpp>
+ #include <sstream>
+-
++#include <unistd.h>
+
+ namespace sf
+ {
diff --git a/media-libs/libsfml/libsfml-1.6-r1.ebuild b/media-libs/libsfml/libsfml-1.6-r1.ebuild
index f16505362dfc..4c9261500d33 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
+# Copyright 1999-2012 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.4 2011/09/14 09:14:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsfml/libsfml-1.6-r1.ebuild,v 1.5 2012/06/07 20:18:23 radhermit Exp $
EAPI=4
@@ -35,6 +35,7 @@ src_prepare() {
"${FILESDIR}"/${P}-destdir.patch \
"${FILESDIR}"/${P}-deps-and-flags.patch \
"${FILESDIR}"/${P}-gcc46.patch \
+ "${FILESDIR}"/${P}-gcc47.patch \
"${FILESDIR}"/${P}-libpng15.patch
}