diff options
| author |   Tristan Heaven <tristan@gentoo.org> | 2009-07-27 19:52:48 +0000 |
|---|---|---|
| committer | Tristan Heaven <tristan@gentoo.org> | 2009-07-27 19:52:48 +0000 |
| commit | d482723928704a21573aaffd70fc70fe11b5c5ae (patch) | |
| tree | 802511db8704c833663909ae5ee8e969071f7bc7 /games-engines/exult | |
| parent | Fix old version as well. Last one in Portage that's using this flag. Close 22... (diff) | |
| download | historical-d482723928704a21573aaffd70fc70fe11b5c5ae.tar.gz historical-d482723928704a21573aaffd70fc70fe11b5c5ae.tar.bz2 historical-d482723928704a21573aaffd70fc70fe11b5c5ae.zip | |
Fix building with gcc-4.4, bug #273506
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
Diffstat (limited to 'games-engines/exult')
| -rw-r--r-- | games-engines/exult/ChangeLog | 8 | ||||
| -rw-r--r-- | games-engines/exult/Manifest | 11 | ||||
| -rw-r--r-- | games-engines/exult/exult-1.2.ebuild | 7 | ||||
| -rw-r--r-- | games-engines/exult/files/exult-1.2-gcc44.patch | 21 |
4 files changed, 36 insertions, 11 deletions
diff --git a/games-engines/exult/ChangeLog b/games-engines/exult/ChangeLog index ed670ac0c88b..2d07933ea05c 100644 --- a/games-engines/exult/ChangeLog +++ b/games-engines/exult/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-engines/exult -# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/ChangeLog,v 1.23 2009/02/24 19:29:34 mr_bones_ Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/ChangeLog,v 1.24 2009/07/27 19:52:47 nyhm Exp $ + + 27 Jul 2009; Tristan Heaven <nyhm@gentoo.org> exult-1.2.ebuild, + +files/exult-1.2-gcc44.patch: + Fix building with gcc-4.4, bug #273506 24 Feb 2009; Michael Sterrett <mr_bones_@gentoo.org> exult-1.2.ebuild: Add timidity use-based dep for bug #203104 diff --git a/games-engines/exult/Manifest b/games-engines/exult/Manifest index ad0ab9461801..980da9f95d38 100644 --- a/games-engines/exult/Manifest +++ b/games-engines/exult/Manifest @@ -4,19 +4,20 @@ Hash: SHA1 AUX exult-1.2-64bits.patch 591 RMD160 8674319c38bb9f06975e52494e00f8a4b5c47a96 SHA1 1a5d1db8212be32ed20cf0e41edbb137d6ed19ea SHA256 723cd3a9cc76909db45429192fb88c0cbb941eb10822a8acba7da87a370a5675 AUX exult-1.2-gcc41.patch 1357 RMD160 c18a2bf589d106e265a543821502be55a9cdbe60 SHA1 7ad3d82641f1e3f355c7085cc3c7349e5687b008 SHA256 cee50e50c21e00d832552d659d08e4b985b84cbeb6ed07e32e0af8b71eee5c04 AUX exult-1.2-gcc43.patch 3741 RMD160 b513b8e88f476b06aa2ecbbdd40d082996d8eb54 SHA1 e0542298b8136edf1666882804f3eee8bf3f27ff SHA256 4a4f224cd44c3250ac43ffaae1d0fae0a8a8a2d291ddcd9e4a053bceda36bf6a +AUX exult-1.2-gcc44.patch 508 RMD160 7974d2f85a700c03f30943618f06bc68d4f8c087 SHA1 733a4f5be2b0db89191e130f73ebff0f35ddd4d8 SHA256 14148f3d74fb6e491bff4de7e8341e6c948765731f6c77b1ebdb98ac777953e4 AUX exult-1.2-x11link.patch 286 RMD160 426eb039f9becfbcad6d87cacef4b489e423d45b SHA1 bc76419d4a86d88fa3f3f26da29ae0c03ef4757b SHA256 c0b971e64fb04e8ec91fea77b530755aa9c448d1421bca176f56b5561c2ab308 DIST U7MusicOGG_1of2.zip 12614413 RMD160 2818c026664f6c8ef79201ea34a507091340fbb8 SHA1 50684766f3ca3eb33a777b752e904939a1470bd8 SHA256 ccf748b346345986b08355ae3bf21c72e3bfffe30ecf9f70fe10fdc8c573a503 DIST U7MusicOGG_2of2.zip 11382878 RMD160 830a718674e1a2acf79ef131d30929c55fb91b44 SHA1 91250accd89bf931ce5fee6433ae988d55266a2f SHA256 58627a090f3f75cc4f5731053d5a2b02c6ba0edff1db0551bcd565d04089baaa DIST exult-1.2.tar.gz 1722259 RMD160 339231edf84507f05115ab3189875cb15be9c04f SHA1 81f9d3d428c80990b8e970a4dee5c85a7236dace SHA256 a6dd9d4e399281ed2db691ede21dbb79818ee11b08ef717e3eac255e290cf21a DIST jmsfx.zip 4778572 RMD160 6998abd6cf42e2011c71bb4c39f651b3ccd103c4 SHA1 933678416679b8fd42240f8fe38fa3474dd65267 SHA256 6932a70e999a203fb478edc6c009ad331709b9d1a760316244b82b60f93b41b2 DIST jmsfxsi.zip 6194646 RMD160 3d1badcda304c12d738f49bc9f559465620248eb SHA1 a8d546b44c81c49f0560f97a2e43d55c6444fd6b SHA256 be842ae046453ff969bd68516638cf9b66fc0395013c0b0350688f9dcb0e7f42 -EBUILD exult-1.2.ebuild 2764 RMD160 a810e146984fc34103b1c052d9d034addca31917 SHA1 cfd65cecaf2033da5589362a6cdafa4fa85837d0 SHA256 ce3bc4b87a3c7cc5d37b23fc9e582a76ec4b3b9e628a8f28594f30148d1b74c7 -MISC ChangeLog 3027 RMD160 69c449042ef099c4f90fa2c1e024147ce91fde38 SHA1 3eb201ea13f97d58eddfe0ed23cd55d8404f73d1 SHA256 11cae4e2e00d3e07edd06767a862bb9c94a81dbf597d850c86abc2aab10e658c +EBUILD exult-1.2.ebuild 2761 RMD160 04cf5d8f0108e27bd975bce11285fcdca01b45d3 SHA1 998107126243ae15c3fa1af7fbd92b1792455961 SHA256 dce7f527d71f343ac70c38d0b1e2dd1202bf60eac24253183657ce17f8c833e9 +MISC ChangeLog 3162 RMD160 ed8ec6cc1ec824305ba3f1149a034075a16b47c1 SHA1 f782d8fa22c01b51f4bf0a08848c896e079d7021 SHA256 86235de132bdc7c7a60deb48e8a1c6ffe39bc05b0f57626cd08aba35c3057821 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.11 (GNU/Linux) -iEYEARECAAYFAknmZqcACgkQdz7hIScOURESgwCdGbYw5baVSt5+xtWCJzCqr0IS -8WYAn1QAvaaB188ux9tn2TM0BvnN130g -=MGLs +iEYEARECAAYFAkpuBZYACgkQdz7hIScOURE3lgCeIjKej2c/g97bHjWI8UjBqpQO +qtkAoILH630tv8+wpuu/Dc5VqouPLMde +=UqB+ -----END PGP SIGNATURE----- diff --git a/games-engines/exult/exult-1.2.ebuild b/games-engines/exult/exult-1.2.ebuild index b7b11b4adf01..a55bf8e2ab73 100644 --- a/games-engines/exult/exult-1.2.ebuild +++ b/games-engines/exult/exult-1.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/exult-1.2.ebuild,v 1.18 2009/04/15 22:58:40 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/exult-1.2.ebuild,v 1.19 2009/07/27 19:52:47 nyhm Exp $ EAPI=2 inherit eutils autotools multilib games @@ -48,7 +48,8 @@ src_prepare() { "${FILESDIR}"/${P}-gcc41.patch \ "${FILESDIR}"/${P}-64bits.patch \ "${FILESDIR}"/${P}-x11link.patch \ - "${FILESDIR}"/${P}-gcc43.patch + "${FILESDIR}"/${P}-gcc43.patch \ + "${FILESDIR}"/${P}-gcc44.patch sed -i \ -e "s/u7siinstrics.data/u7siintrinsics.data/" \ usecode/ucxt/data/Makefile.am \ @@ -67,8 +68,6 @@ src_configure() { --disable-dependency-tracking \ --disable-tools \ --disable-opengl \ - --disable-3dnow \ - --disable-mmx \ $(use_enable timidity) \ $(use_enable zlib zip-support) } diff --git a/games-engines/exult/files/exult-1.2-gcc44.patch b/games-engines/exult/files/exult-1.2-gcc44.patch new file mode 100644 index 000000000000..056feb25c6c7 --- /dev/null +++ b/games-engines/exult/files/exult-1.2-gcc44.patch @@ -0,0 +1,21 @@ +--- exult.cc ++++ exult.cc +@@ -350,7 +350,7 @@ + add_system_path("<DATA>", "data"); + if(!U7exists("<DATA>/exult.flx")) + { +- char *sep = std::strrchr(runpath,'/'); ++ const char *sep = std::strrchr(runpath,'/'); + if (!sep) sep = std::strrchr(runpath,'\\'); + int plen = sep-runpath; + char *dpath = new char[plen+10]; +--- files/utils.h ++++ files/utils.h +@@ -24,6 +24,7 @@ + + #include <iostream> + #include <string> ++#include <cstdio> + #ifndef ALPHA_LINUX_CXX + # include <iosfwd> + #endif |