diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2012-10-17 08:05:27 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2012-10-17 08:05:27 +0000 |
| commit | 7fafc83a33ec1d8e162fcfaa5de4f8e9e0d45b6a (patch) | |
| tree | b14aa5c2b89cc4504ede58affee5c3341d4f69d3 /games-puzzle | |
| parent | Version bump with gnome-3.6 visual fixes. Use a single flag for gtk2 and gtk3... (diff) | |
| download | historical-7fafc83a33ec1d8e162fcfaa5de4f8e9e0d45b6a.tar.gz historical-7fafc83a33ec1d8e162fcfaa5de4f8e9e0d45b6a.tar.bz2 historical-7fafc83a33ec1d8e162fcfaa5de4f8e9e0d45b6a.zip | |
Fix build with gcc-4.7 Bug #422555
Package-Manager: portage-2.1.11.28/cvs/Linux i686
Manifest-Sign-Key: 0x0145142D
Diffstat (limited to 'games-puzzle')
| -rw-r--r-- | games-puzzle/xye/ChangeLog | 7 | ||||
| -rw-r--r-- | games-puzzle/xye/Manifest | 19 | ||||
| -rw-r--r-- | games-puzzle/xye/files/xye-0.12.0-gcc47.patch | 22 | ||||
| -rw-r--r-- | games-puzzle/xye/xye-0.12.0.ebuild | 9 |
4 files changed, 48 insertions, 9 deletions
diff --git a/games-puzzle/xye/ChangeLog b/games-puzzle/xye/ChangeLog index 56cf5fe52d82..82aee808deef 100644 --- a/games-puzzle/xye/ChangeLog +++ b/games-puzzle/xye/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-puzzle/xye # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xye/ChangeLog,v 1.30 2012/07/02 20:55:00 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xye/ChangeLog,v 1.31 2012/10/17 08:05:17 tupone Exp $ + + 17 Oct 2012; Tupone Alfredo <tupone@gentoo.org> xye-0.12.0.ebuild, + +files/xye-0.12.0-gcc47.patch: + Fix build with gcc-4.7 Bug #422555 by Diego + Moving to EAPI 4 02 Jul 2012; Michael Sterrett <mr_bones_@gentoo.org> -xye-0.10.0.ebuild: old diff --git a/games-puzzle/xye/Manifest b/games-puzzle/xye/Manifest index a58ddb82043a..54ddffeacd9f 100644 --- a/games-puzzle/xye/Manifest +++ b/games-puzzle/xye/Manifest @@ -1,4 +1,15 @@ -DIST xye-0.12.0.tar.gz 3074536 RMD160 2445358bd93ba815b70eb9be259a5be1fb4bda15 SHA1 23c9017733ca7ed7d1f446c7dad1ccce689363c6 SHA256 0116afe64c64684feee3a3f9ea8e2308059afe3d3d30edc8c3731d573eb96a92 -EBUILD xye-0.12.0.ebuild 1073 RMD160 e06546caba337544b2a5f08a526516ae9cb770c4 SHA1 d18a5ba0df1c9722dc6b55fd9cea8eb224db423e SHA256 287f6ce6b04925fccf474782693a1d36a10ae0ea69e0a8f4aa70a4db6da2c112 -MISC ChangeLog 3885 RMD160 5428ccfb229105e8ecddacb3531d70bce0ddb5ec SHA1 2f080181673a1d0ec9f4b304b36bae5f7712abba SHA256 62fdc22115a78ed0733f6a4d295cbc11d19ee35b0147a6e5d9e5a6079361e64a -MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +AUX xye-0.12.0-gcc47.patch 956 SHA256 c875a431bdf26eb4348e2ed28dbd234d3792224be7c69db31090362f0f49d17e SHA512 63936aa43b8dcbb306693dfd29ea6dea7fd0f4a3f270a4d77ba6e031b8d5b42d83046aa071d35424bb719e555daab26ec82b384badba18fc1b143e92cbe479f1 WHIRLPOOL e98e9f5a724f2d1c05dcbd1095e9ac8c4f8fb166543fc0dae8caf51319d81f3f22f16b59b3dbe7575160392fb32bc4d1e14d30ebac041bdd1a81ca1c1ea29f60 +DIST xye-0.12.0.tar.gz 3074536 SHA256 0116afe64c64684feee3a3f9ea8e2308059afe3d3d30edc8c3731d573eb96a92 SHA512 c29d805239f401cd5f4e975651d49ab2fd12c12ab695e23e4303310497f46295208d7177bc5957287e2d6c43dfcc501f988e49c586e7f0616a13dc655c40a126 WHIRLPOOL abef97188564a8d380d06ab7c8da0d8f8cedb738e6db641735873f6878502a86244ee7842fcdfa4a9b5043f1fe2869255d00e072fa5057906eddb5c6ffb1296e +EBUILD xye-0.12.0.ebuild 1094 SHA256 a9fe2de069b03bc9fad8720ee4af702546fa260aee0ffce9b9d01ea7d41c9c66 SHA512 482752864967edc8941fe57ec65b70442d37ab719db4f513258cce5d4972494b11f66384d8fc53a1f698971e942735e3d69d2557633c859a206a1023af9420be WHIRLPOOL 7b226f96fa97acb86ac725fef6f905a99b062c82ea16da96f3539bed360b3708fd790308633167c20fa24e4f6e2233d2fab1726435d8d3f49aa036f680e30414 +MISC ChangeLog 4050 SHA256 52cfc6b60cf2f075b85e147789bd51b101543b2e2cf3993179dc03c81b245797 SHA512 fb68ae41ff9165b7e866071b9e03ae832fab76afd0513139d14f5bf3115e9e68f5fc028926194fb43986cffa2b6b8a712253373c5dc7dc9ee290d5f69d4de5e3 WHIRLPOOL a369c9c9342a8b3be8948f83aa1f96247d12775abb84f77cb30048a3682e5ca0a0d56bc6a196a9c23485ec18e6278510f1941e9b4f5336e171e8cbaa22e7ad7a +MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) + +iEYEAREIAAYFAlB+ZsMACgkQIY77eQFFFC3PlACgg1SNWN95vhRNqnH8lykz6kmz +HM0Amwb7Rk4aN+ESj8N2+Fw87ASFKRnM +=dKqa +-----END PGP SIGNATURE----- diff --git a/games-puzzle/xye/files/xye-0.12.0-gcc47.patch b/games-puzzle/xye/files/xye-0.12.0-gcc47.patch new file mode 100644 index 000000000000..f638968dd404 --- /dev/null +++ b/games-puzzle/xye/files/xye-0.12.0-gcc47.patch @@ -0,0 +1,22 @@ +--- src/editorsave.cpp.old 2012-10-17 09:47:46.413566575 +0200 ++++ src/editorsave.cpp 2012-10-17 09:48:17.314366174 +0200 +@@ -642,7 +642,8 @@ + file << "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n"; + file << "<pack>\n<name>"<< stripXML(editorboard::filetitle) <<"</name><author>"<< stripXML(editorboard::author) <<"</author>\n<description>"<< stripXML(editorboard::description) <<"</description>\n"; + +- for (int i=first; i<editorboard::CountLevels(); i++) { ++ int i; ++ for (i=first; i<editorboard::CountLevels(); i++) { + editorboard::LoadLevelNumber(board, i); + file << "\n<level>\n"; + file << "<title>"<< stripXML(board->title) <<"</title>\n"; +--- src/gen.cpp.old 2012-10-17 09:41:40.825540267 +0200 ++++ src/gen.cpp 2012-10-17 09:41:57.087387319 +0200 +@@ -21,6 +21,7 @@ + #include<cstdio>
+ #include<iostream>
+ #include<fstream>
++#include <unistd.h>
+
+ const float F_RAND_MAX = (float)(RAND_MAX);
+
diff --git a/games-puzzle/xye/xye-0.12.0.ebuild b/games-puzzle/xye/xye-0.12.0.ebuild index 843f8f4fcd79..63d22777aea3 100644 --- a/games-puzzle/xye/xye-0.12.0.ebuild +++ b/games-puzzle/xye/xye-0.12.0.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xye/xye-0.12.0.ebuild,v 1.3 2012/01/21 16:33:05 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xye/xye-0.12.0.ebuild,v 1.4 2012/10/17 08:05:17 tupone Exp $ -EAPI=2 +EAPI=4 inherit autotools eutils games DESCRIPTION="Free version of the classic game Kye" @@ -20,14 +20,15 @@ DEPEND="media-libs/libsdl[video] media-fonts/dejavu" src_prepare() { + epatch "${FILESDIR}"/${P}-gcc47.patch sed -i -e '/^xye_LDFLAGS/d' Makefile.am || die eautoreconf } src_install() { - dogamesbin "${PN}" || die + dogamesbin "${PN}" insinto "${GAMES_DATADIR}/${PN}" - doins -r levels res || die + doins -r levels res rm -f "${D}${GAMES_DATADIR}/${PN}"/res/DejaVuSans* dosym /usr/share/fonts/dejavu/DejaVuSans.ttf "${GAMES_DATADIR}/${PN}"/res/ dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf "${GAMES_DATADIR}/${PN}"/res/ |