diff options
author | Michael Sterrett <mr_bones_@gentoo.org> | 2015-01-09 02:57:19 +0000 |
---|---|---|
committer | Michael Sterrett <mr_bones_@gentoo.org> | 2015-01-09 02:57:19 +0000 |
commit | 26029e0b4b3449a01654c3b1cfa78cc05f3f99c9 (patch) | |
tree | ebe884a7447784ec17b5b4b61d1dfd5ad1f39278 | |
parent | asdf-3.0.3 needs the same prefix changes as asdf-3.1.4 since it uses the same... (diff) | |
download | historical-26029e0b4b3449a01654c3b1cfa78cc05f3f99c9.tar.gz historical-26029e0b4b3449a01654c3b1cfa78cc05f3f99c9.tar.bz2 historical-26029e0b4b3449a01654c3b1cfa78cc05f3f99c9.zip |
remove old and broken 'stable' version since it is not recommended for use by upstream
Package-Manager: portage-2.2.14/cvs/Linux x86_64
-rw-r--r-- | games-engines/exult/ChangeLog | 10 | ||||
-rw-r--r-- | games-engines/exult/Manifest | 15 | ||||
-rw-r--r-- | games-engines/exult/exult-1.2.ebuild | 103 | ||||
-rw-r--r-- | games-engines/exult/files/exult-1.2-64bits.patch | 20 | ||||
-rw-r--r-- | games-engines/exult/files/exult-1.2-gcc41.patch | 42 | ||||
-rw-r--r-- | games-engines/exult/files/exult-1.2-gcc43.patch | 212 | ||||
-rw-r--r-- | games-engines/exult/files/exult-1.2-gcc44.patch | 21 | ||||
-rw-r--r-- | games-engines/exult/files/exult-1.2-libpng14.patch | 22 | ||||
-rw-r--r-- | games-engines/exult/files/exult-1.2-libpng15.patch | 29 | ||||
-rw-r--r-- | games-engines/exult/files/exult-1.2-x11link.patch | 11 |
10 files changed, 10 insertions, 475 deletions
diff --git a/games-engines/exult/ChangeLog b/games-engines/exult/ChangeLog index 96f5b7db87ef..70b4331a03b5 100644 --- a/games-engines/exult/ChangeLog +++ b/games-engines/exult/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for games-engines/exult # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/ChangeLog,v 1.33 2015/01/09 01:52:57 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/ChangeLog,v 1.34 2015/01/09 02:57:14 mr_bones_ Exp $ + + 09 Jan 2015; Michael Sterrett <mr_bones_@gentoo.org> -exult-1.2.ebuild, + -files/exult-1.2-64bits.patch, -files/exult-1.2-gcc41.patch, + -files/exult-1.2-gcc43.patch, -files/exult-1.2-gcc44.patch, + -files/exult-1.2-libpng14.patch, -files/exult-1.2-libpng15.patch, + -files/exult-1.2-x11link.patch: + remove old and broken 'stable' version since it is not recommended for use by + upstream *exult-9999 (09 Jan 2015) diff --git a/games-engines/exult/Manifest b/games-engines/exult/Manifest index 5aac9c1ec894..8fe2e701f2d6 100644 --- a/games-engines/exult/Manifest +++ b/games-engines/exult/Manifest @@ -1,16 +1,3 @@ -AUX exult-1.2-64bits.patch 591 SHA256 723cd3a9cc76909db45429192fb88c0cbb941eb10822a8acba7da87a370a5675 SHA512 aac479a9591d14ed9db7962981b66804218b6e99ba30a82314259a7eda170c20302828c02a4111d2fae32a54559197a7ed83f307b710138625932a63186571c1 WHIRLPOOL e6544877bb373a8d57d160b65de71b9bdac5c2541e100496b9bddec7d0209f712a3e973c5269408eced7c47e2947f92ddcfaef98d255be15c8427b29b498f6a0 -AUX exult-1.2-gcc41.patch 1357 SHA256 cee50e50c21e00d832552d659d08e4b985b84cbeb6ed07e32e0af8b71eee5c04 SHA512 f2bd7237583b62d6762eb375364127c0119f0067d359fd114c455bbcb0c742e5489fa13e65bdcc5822fb267270b9f5803901585e9a70b031cbd233c80160b556 WHIRLPOOL 3506f979090f98c52bafc6dd709a3882de3228a7851ccde95ce2034a3b956cddd0a63202ef168c5b85edf25e518fe819ce8ba558cff7c50b1a328ce59d95a4a2 -AUX exult-1.2-gcc43.patch 3741 SHA256 4a4f224cd44c3250ac43ffaae1d0fae0a8a8a2d291ddcd9e4a053bceda36bf6a SHA512 a75bd99af9a9c2325a3dc87a010dd23f0825ee04e00ec27a84dc5cfb662361c277d8189b4ed4d67ae0074b69cf475d1e3b238d9e5b7b150fe15069e64edf46b1 WHIRLPOOL 08fa336eabc9c0a5507cdc8e045c06eed3e908ac9998e422510f6ab374a633563167e2f262cab52adf8622a3da3e64cd376a8fa767a3be14daf9df106daaadc2 -AUX exult-1.2-gcc44.patch 508 SHA256 14148f3d74fb6e491bff4de7e8341e6c948765731f6c77b1ebdb98ac777953e4 SHA512 e8841abb815cd7ea22da9dc87aa8773c4b1d0c4ceb1551d07227d7e1d293c29e1005a4a87c0e5e43fcefb4add0e1dd3ecade4ac4629cf24429b947d14be0e8fd WHIRLPOOL c8ce03148066f6d1a205e72ab45084b88be834c6863b523349ed5f5937eb037e6183e2790b0e5de77a2518c826fdab44dd589779f34d92ebe3c5505c03116e80 -AUX exult-1.2-libpng14.patch 735 SHA256 a2a2d6c97528d7cafa9cab4fe5e2aeadd92e9e1e35c6c6c26adbd8e641f6ca5c SHA512 b23d55596a2a168b5406d27ca6a6f4b48de97e0a6f045b2e94867523487216644efea0d2eb09245bb07e590654721adc328abc2dd9c2966effb49e51196ee54b WHIRLPOOL f6d8a786c491b330f2c6f14923c414ea5a9594959cc3dfc9ee1119ba8d5b8abccb1b8238bba1fd134d0d789fc0a4630b35ca6f678465bb9a75b2cd998884c4f9 -AUX exult-1.2-libpng15.patch 834 SHA256 536105b801eb23b3f67742b91d569efeee8e8fd2ec4693ecca1521c0b1ce9d76 SHA512 eed93df543071e80a7c1c8f5ccde5de26918f5bd29aeef9bc7dca8688977c53b583f484cf62c4a7d7e1c8fe1b5d1c2672bc6feaf29b761b75206ba042a9a3779 WHIRLPOOL 158e20a68ecaaef34eec2103b92f5f694c7cc2e540f644ed93f8e3d8cb5c6901ef3e05428413821d6b279cab616a65e667aa0f99fd85ce1869200f409c91033d -AUX exult-1.2-x11link.patch 286 SHA256 c0b971e64fb04e8ec91fea77b530755aa9c448d1421bca176f56b5561c2ab308 SHA512 bf07af4eec4e7ef1b7435b0fb0b88538b73e75de9d99ceafcd64ccde873eab9f1d8b597da275f2de7132b4c2f0b03251de1e4e7e9f7dc0476306b0f86af62967 WHIRLPOOL 1c6aee503c68da97c4a9655ba457522366cfe2dc13cf6443b06e46708f2c798ac79aea368e5106a298052a31b2d01b36d0f8600a776afb8355f6322e1de1dfc0 -DIST U7MusicOGG_1of2.zip 12614413 SHA256 ccf748b346345986b08355ae3bf21c72e3bfffe30ecf9f70fe10fdc8c573a503 SHA512 aadcb085cc97b5330622c4acbd9d00912af7a87371b38e5d984882686ac1624dba1a70a21e66943d8e4de1c5583ab58a32ed851e50d7ecc861d7051383fb21c0 WHIRLPOOL 331c4e4a30dd1918dd2997b52f7fe9fb0c2f033b2a62dae3af46d818b72ed2135877cd7053eddb5c359b156fbebf1ebfd561060037a7c5e298a317af2e745656 -DIST U7MusicOGG_2of2.zip 11382878 SHA256 58627a090f3f75cc4f5731053d5a2b02c6ba0edff1db0551bcd565d04089baaa SHA512 c3157faad5e02531732cd8e7ceb2a81cdb3a5b3eeaf48c73c0e753fc99c0ad438bc49f290d202f59851072aca50d22594f5c4782606d0f70d91d747cea9de924 WHIRLPOOL e73ea2246bb809b0d9b405de60b5cef62a206d85c8311dd3f064d7d56cef632ea07532da0c827dcf2ef908e86ffbab11821f7d1da0cf35693bfb5cd272d84b72 -DIST exult-1.2.tar.gz 1722259 SHA256 a6dd9d4e399281ed2db691ede21dbb79818ee11b08ef717e3eac255e290cf21a SHA512 88211e7bf216180f025ad4d7318a49166364f5acb1ddaad3ae634c25bf0801eddb09aaf0a4989b5346145d0c743983007bde37ce0344faf586c2b070956b9f08 WHIRLPOOL f535ce9e248b0c697a0a2703b8ab0a38c7b0dd896bd9d965163171c128b9e3bc12a19a2733a1befc4c97bc91ff33acff63ff61f9bcfc89f18ad57c418758cabb -DIST jmsfx.zip 4778572 SHA256 6932a70e999a203fb478edc6c009ad331709b9d1a760316244b82b60f93b41b2 SHA512 0822a8008ad3b9e2e6824dc6666968b8aa5f475b35dae31cf3d35d36422d68570cef440572bde07d4b4b580520b34581ab0700f7bded0bc66ae5d6020feb1662 WHIRLPOOL a36d1fef2e8a72c76c84b6843cc46e465d4ac192b22daeed19c8ab999f91603e16fb489e2602764b3b9c35bfc126125ca9de343a28da8043b7f9cdaeedda5ea2 -DIST jmsfxsi.zip 6194646 SHA256 be842ae046453ff969bd68516638cf9b66fc0395013c0b0350688f9dcb0e7f42 SHA512 1712d7d264f06d84ba38e864174d2e40a77a4270c94b2a5bccbf31dc41e187d6eeb013ebbfbc171bb6314df103a3ad5dd06daeb8ede0b5aead6cd1443680abdf WHIRLPOOL 3188937cfc454277152c3cb99a0435e7b709c41864a22ec649ce4b6798ce014b124c7fdafb07f489208e25497922dff3d766cffd9b1eba3703720852d3a5c28a -EBUILD exult-1.2.ebuild 2949 SHA256 2dcc8ad2a8ab033eb7616f401d82a4c142aed1003fe66c289b4e7157cc6ea65f SHA512 4b77c8fbf2d05aabe73676c067749944a8c130a9ca286eb7750af851c05db1d6c9638f9a7befdb7f4b4dbbbf75b4fe68da125223aa1113dfa10373b7b66b7c92 WHIRLPOOL 2be4a953af9e5984230afd4fc642deb414ca1918a1f356565db41a2ac7d27ed5a91eb9b064fbe8bd02c926529e87d068330f0851882491648b19097b2de813ce EBUILD exult-9999.ebuild 1530 SHA256 f79aec79eec0ab399123233fca737ff99ac4fb5dbb4ebeda3e6a872aa3717a1a SHA512 a883d897aa1c8da97ad9e5206d9a676695b0386bd20bc9bdf06f9ee5742ded420549f888555b3b83faff235587c05513b8355cf83c3096163c92297d4b02d355 WHIRLPOOL fede42892322b289e8fc15ec9f2009943a2a1d26f1367a39a633948179042969d4b880db180d274ac26e3deed2e145d164d35c22638655f62fe6bd4bb5ed64ac -MISC ChangeLog 4584 SHA256 c5ea4a2fd90a3ae8e0bbfa4e80baa3f5231443f964bedd705d7923057b3d3dae SHA512 518adcc2262a28f4c412807586fb9ada8dc23c0243537263e3eb32541ede9613f6aac018cb461acee107cd4358417d3bab0c92f1ddd8af46261a51ec1060d2cc WHIRLPOOL ff70df2869938525caf3d89163f00c19f750eb7205e9b3638f230e6fad25cc6b81af3bd3a15eef5a28a393eb4874c32054aa91d95e074ef43ffca833135b4a40 +MISC ChangeLog 4977 SHA256 72015aada4d390f5c4f00bb4bceaafa07f6c7cc1879f193ffa18bbac43895537 SHA512 756ab573775a3c76ff786b6df1e7ff4c46e099ab7521c247c0ea037c5b1d46f4baddf86190844e378bd22b370ca37b99d46286abd421c6592c68460c08b8d160 WHIRLPOOL aa5100ecf1308b49c00fe244046c1fb2b7a7c0725a392fe54e3267aa6b7c9aa7066201e13e3ca4d7384609df2f9356b83b2f381877bb284610e39ae67c186cab MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada diff --git a/games-engines/exult/exult-1.2.ebuild b/games-engines/exult/exult-1.2.ebuild deleted file mode 100644 index 55370edefcd0..000000000000 --- a/games-engines/exult/exult-1.2.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2014 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.24 2014/05/15 16:41:45 ulm Exp $ - -EAPI=2 -inherit eutils autotools multilib games - -DESCRIPTION="an Ultima 7 game engine that runs on modern operating systems" -HOMEPAGE="http://exult.sourceforge.net/" -SRC_URI="mirror://sourceforge/exult/${P}.tar.gz - mirror://sourceforge/exult/U7MusicOGG_1of2.zip - mirror://sourceforge/exult/U7MusicOGG_2of2.zip - mirror://sourceforge/exult/jmsfx.zip - mirror://sourceforge/exult/jmsfxsi.zip" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ppc ~sparc x86" -IUSE="timidity zlib" - -RDEPEND=">=media-libs/libpng-1.4 - media-libs/libsdl[sound,video,X] - media-libs/sdl-mixer[vorbis,timidity?] - timidity? ( >=media-sound/timidity++-2 ) - zlib? ( sys-libs/zlib )" -DEPEND="${RDEPEND} - app-arch/unzip" - -# upstream says... "the opengl renderer is very very experimental and -# not recommended for actual use" -#opengl? ( virtual/opengl ) - -src_unpack() { - unpack ${P}.tar.gz - mkdir music/ - cd music/ - unpack U7MusicOGG_{1,2}of2.zip - cd "${WORKDIR}" - mkdir flx/ - cd flx/ - unpack jmsfx{,si}.zip -} - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-gcc41.patch \ - "${FILESDIR}"/${P}-64bits.patch \ - "${FILESDIR}"/${P}-x11link.patch \ - "${FILESDIR}"/${P}-gcc43.patch \ - "${FILESDIR}"/${P}-gcc44.patch \ - "${FILESDIR}"/${P}-libpng14.patch \ - "${FILESDIR}"/${P}-libpng15.patch - sed -i \ - -e "s/u7siinstrics.data/u7siintrinsics.data/" \ - usecode/ucxt/data/Makefile.am \ - || die "sed usecode/ucxt/data/Makefile.am failed" - sed -i \ - -e '/^Encoding/d' \ - -e '/^Icon/s/\.png//' \ - -e '/^Categories/s/Application;//' \ - desktop/exult.desktop \ - || die - # This fix is needed for gimp-plugin support if we want to turn that on. - #sed -i \ - #-e 's/$(DESTDIR)$(GIMP_PLUGINS) /$(GIMP_PLUGINS) $(DESTDIR)/' \ - #mapedit/Makefile.in \ - #|| die "sed mapedit/Makefile.in failed" - eautoreconf -} - -src_configure() { - egamesconf \ - --x-libraries="/usr/$(get_libdir)" \ - --disable-dependency-tracking \ - --disable-tools \ - --disable-opengl \ - $(use_enable timidity) \ - $(use_enable zlib zip-support) -} - -src_install() { - emake \ - DESTDIR="${D}" \ - desktopdir=/usr/share/applications/ \ - icondir=/usr/share/icons \ - install || die "emake install failed" - # no need for this directory for just playing the game - rm -rf "${D}${GAMES_DATADIR}/${PN}/estudio" - dodoc AUTHORS ChangeLog NEWS FAQ README README.1ST - insinto "${GAMES_DATADIR}/${PN}/music" - doins "${WORKDIR}/music/"*ogg || die "doins failed" - insinto "${GAMES_DATADIR}/${PN}/" - doins "${WORKDIR}/flx/"*.flx || die "doins failed" - newdoc "${WORKDIR}/music/readme.txt" music-readme.txt - prepgamesdirs -} - -pkg_postinst() { - games_pkg_postinst - elog "You *must* have the original Ultima7 The Black Gate and/or" - elog "The Serpent Isle installed." - elog "See README in /usr/share/doc/${PF} for information." -} diff --git a/games-engines/exult/files/exult-1.2-64bits.patch b/games-engines/exult/files/exult-1.2-64bits.patch deleted file mode 100644 index ed4be4a4f2da..000000000000 --- a/games-engines/exult/files/exult-1.2-64bits.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- usecode/useval.cc.old 2006-10-25 21:43:21.000000000 +0200 -+++ usecode/useval.cc 2006-10-25 21:48:49.000000000 +0200 -@@ -464,7 +464,7 @@ - if (buflen < 5) - return -1; - *ptr++ = type; -- Write4(ptr, (int)value.ptr); -+ Write4(ptr, 0); - break; - case string_type: - { -@@ -525,7 +525,7 @@ - case pointer_type: - if (buflen < 5) - return false; -- value.ptr = (Game_object*)Read4(ptr); //DON'T dereference this pointer! -+ value.ptr = 0; //DON'T dereference this pointer! - // Maybe add a new type "serialized_pointer" to prevent "accidents"? - return true; - case string_type: diff --git a/games-engines/exult/files/exult-1.2-gcc41.patch b/games-engines/exult/files/exult-1.2-gcc41.patch deleted file mode 100644 index 045fd83405d5..000000000000 --- a/games-engines/exult/files/exult-1.2-gcc41.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- hash_utils.h.old 2006-05-04 20:47:24.000000000 +0200 -+++ hash_utils.h 2006-05-04 20:58:58.000000000 +0200 -@@ -26,7 +26,7 @@ - #else - #if HAVE_EXT_HASH_MAP - # include <ext/hash_map> --# if (defined(__GNUC__) && (__GNUC__ == 3) && ( __GNUC_MINOR__ > 0)) -+# if defined(__GNUC__) && (((__GNUC__ == 3) && ( __GNUC_MINOR__ > 0)) || __GNUC__ >= 4) - using __gnu_cxx::hash_map; - # else - using std::hash_map; -@@ -44,7 +44,7 @@ - #else - #if HAVE_EXT_HASH_SET - # include <ext/hash_set> --# if (defined(__GNUC__) && (__GNUC__ == 3) && ( __GNUC_MINOR__ > 0)) -+# if defined(__GNUC__) && (((__GNUC__ == 3) && ( __GNUC_MINOR__ > 0)) || __GNUC__ >= 4) - using __gnu_cxx::hash_set; - # else - using std::hash_set; ---- mouse.h.old 2006-05-04 21:02:49.000000000 +0200 -+++ mouse.h 2006-05-04 21:03:37.000000000 +0200 -@@ -27,6 +27,8 @@ - #include "vgafile.h" - #include "glshape.h" - -+class Game_window; -+ - /* - * Handle custom mouse pointers. - */ ---- audio/midi_drivers/fmopldrv.h.old 2006-05-04 21:05:16.000000000 +0200 -+++ audio/midi_drivers/fmopldrv.h 2006-05-04 21:05:29.000000000 +0200 -@@ -76,7 +76,7 @@ - /* output a packed midi command to the midi stream - * valid only if mode is MO_SIMPLE - */ -- void OplDriver::send(uint32 b); -+ void send(uint32 b); - - /* retrieve a string representation of an error code */ - static const char *get_error_name(int error_code); diff --git a/games-engines/exult/files/exult-1.2-gcc43.patch b/games-engines/exult/files/exult-1.2-gcc43.patch deleted file mode 100644 index 7900b6c50575..000000000000 --- a/games-engines/exult/files/exult-1.2-gcc43.patch +++ /dev/null @@ -1,212 +0,0 @@ ---- actions.cc -+++ actions.cc -@@ -22,6 +22,8 @@ - # include <config.h> - #endif - -+#include <cstdlib> -+#include <cstring> - #include "gamewin.h" - #include "actions.h" - #include "actors.h" ---- args.cc -+++ args.cc -@@ -24,6 +24,7 @@ - # include <iostream> - #endif - -+#include <cstdlib> - #include "args.h" - - #ifndef UNDER_CE ---- audio/xmidi.cc -+++ audio/xmidi.cc -@@ -31,6 +31,7 @@ - # include <cmath> - #endif - #include <unistd.h> -+#include <cstdlib> - #include "../files/utils.h" - #include "xmidi.h" - #include "../conf/Configuration.h" ---- conf/Configuration.cc -+++ conf/Configuration.cc -@@ -32,6 +32,7 @@ - #include <stdio.h> - #include <iostream> - #include <fstream> -+#include <cstdlib> - #ifdef HAVE_SSTREAM - #include <sstream> - #endif ---- files/Flex.h -+++ files/Flex.h -@@ -24,6 +24,7 @@ - #include <vector> - #include <string> - #include <iosfwd> -+#include <cstring> - #include "common_types.h" - #include "U7file.h" - ---- files/IFF.h -+++ files/IFF.h -@@ -21,6 +21,7 @@ - - #include <vector> - #include <string> -+#include <cstring> - #include "common_types.h" - #include "U7file.h" - ---- files/listfiles.cc -+++ files/listfiles.cc -@@ -29,6 +29,7 @@ - #include <vector> - #include <string> - #include <iostream> -+#include <cstring> - - #ifndef UNDER_CE - using std::vector; ---- files/msgfile.cc -+++ files/msgfile.cc -@@ -24,6 +24,7 @@ - - #include <iostream> - #include <vector> -+#include <cstdlib> - #include "utils.h" - - using std::istream; ---- files/Table.cc -+++ files/Table.cc -@@ -26,6 +26,7 @@ - # include <cstdio> - #endif - #include <iostream> -+#include <cstdlib> - #include "exceptions.h" - #include "utils.h" - ---- files/U7file.cc -+++ files/U7file.cc -@@ -24,6 +24,7 @@ - # include <cstdio> - #endif - #include <iostream> -+#include <cstdlib> - - #include "U7file.h" - #include "Flex.h" ---- hash_utils.h -+++ hash_utils.h -@@ -19,6 +19,7 @@ - #ifndef _HASH_UTILS_H_ - #define _HASH_UTILS_H_ - -+#include <cstring> - #include "exult_types.h" - - #ifdef DONT_HAVE_HASH_MAP ---- imagewin/ibuf8.cc -+++ imagewin/ibuf8.cc -@@ -29,6 +29,8 @@ - # include <iostream> - #endif - -+#include <cstdlib> -+#include <cstring> - #include "exult_types.h" - #include "utils.h" - ---- objs/chunkter.cc -+++ objs/chunkter.cc -@@ -25,6 +25,7 @@ - #ifdef HAVE_CONFIG_H - # include <config.h> - #endif -+#include <cstring> - #include "chunkter.h" - #include "gamewin.h" - #ifdef INCL_OPENGL ---- party.cc -+++ party.cc -@@ -26,6 +26,7 @@ - - #include <iostream> - #include <string> -+#include <cstring> - #include "party.h" - #include "actors.h" - #include "gamewin.h" ---- server/objserial.cc -+++ server/objserial.cc -@@ -30,6 +30,7 @@ - #include "objserial.h" - #include "servemsg.h" - #include <iostream> -+#include <cstring> - - using std::cout; - using std::endl; ---- server/server.cc -+++ server/server.cc -@@ -45,6 +45,7 @@ - #endif - - #include <cstdio> -+#include <cstdlib> - - #ifdef _AIX - #include <strings.h> ---- shapes/shapeinf.cc -+++ shapes/shapeinf.cc -@@ -32,6 +32,7 @@ - - #include "utils.h" - #include <iomanip> /* Debugging */ -+#include <cstring> - using std::cout; - using std::endl; - ---- shapes/shapewrite.cc -+++ shapes/shapewrite.cc -@@ -24,6 +24,7 @@ - # include <config.h> - #endif - -+#include <cstring> - #include "shapevga.h" - #include "shapeinf.h" - #include "monstinf.h" ---- usecode/ucmachine.cc -+++ usecode/ucmachine.cc -@@ -23,6 +23,7 @@ - # include <config.h> - #endif - -+#include <cstring> - #include "ucmachine.h" - #include "keyring.h" - #include "conversation.h" ---- usecode/useval.cc -+++ usecode/useval.cc -@@ -32,6 +32,7 @@ - #include <cstdio> - #endif - -+#include <cstdlib> - #include "useval.h" - #include "utils.h" - ---- usecode/useval.h -+++ usecode/useval.h -@@ -24,6 +24,7 @@ - - #include <cassert> - #include <iostream> -+#include <cstdlib> - - #include <vector> // STL container - #include <deque> // STL container diff --git a/games-engines/exult/files/exult-1.2-gcc44.patch b/games-engines/exult/files/exult-1.2-gcc44.patch deleted file mode 100644 index 056feb25c6c7..000000000000 --- a/games-engines/exult/files/exult-1.2-gcc44.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- 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 diff --git a/games-engines/exult/files/exult-1.2-libpng14.patch b/games-engines/exult/files/exult-1.2-libpng14.patch deleted file mode 100644 index 7617ad6b9a8e..000000000000 --- a/games-engines/exult/files/exult-1.2-libpng14.patch +++ /dev/null @@ -1,22 +0,0 @@ -http://exult.svn.sourceforge.net/viewvc/exult/exult/trunk/shapes/pngio.cc?r1=3752&r2=5381 - ---- shapes/pngio.cc -+++ shapes/pngio.cc -@@ -89,7 +89,7 @@ - // Indicate we already read something. - png_set_sig_bytes(png, sizeof(sigbuf)); - png_read_info(png, info); // Read in image info. -- unsigned long w, h; -+ png_uint_32 w, h; - int depth, color, interlace; - png_get_IHDR(png, info, &w, &h, &depth, &color, - &interlace, 0, 0); -@@ -316,7 +316,7 @@ - // Indicate we already read something. - png_set_sig_bytes(png, sizeof(sigbuf)); - png_read_info(png, info); // Read in image info. -- unsigned long w, h; -+ png_uint_32 w, h; - int depth, color, interlace; - png_get_IHDR(png, info, &w, &h, &depth, &color, - &interlace, 0, 0); diff --git a/games-engines/exult/files/exult-1.2-libpng15.patch b/games-engines/exult/files/exult-1.2-libpng15.patch deleted file mode 100644 index 1577658ce6d6..000000000000 --- a/games-engines/exult/files/exult-1.2-libpng15.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- shapes/pngio.cc -+++ shapes/pngio.cc -@@ -79,7 +79,7 @@ - } - // Allocate info. structure. - png_infop info = png_create_info_struct(png); -- if (setjmp(png->jmpbuf)) // Handle errors. -+ if (setjmp(png_jmpbuf(png))) // Handle errors. - { - png_destroy_read_struct(&png, &info, 0); - fclose(fp); -@@ -208,7 +208,7 @@ - } - // Allocate info. structure. - png_infop info = png_create_info_struct(png); -- if (setjmp(png->jmpbuf)) // Handle errors. -+ if (setjmp(png_jmpbuf(png))) // Handle errors. - { - png_destroy_write_struct(&png, &info); - fclose(fp); -@@ -306,7 +306,7 @@ - } - // Allocate info. structure. - png_infop info = png_create_info_struct(png); -- if (setjmp(png->jmpbuf)) // Handle errors. -+ if (setjmp(png_jmpbuf(png))) // Handle errors. - { - png_destroy_read_struct(&png, &info, 0); - fclose(fp); diff --git a/games-engines/exult/files/exult-1.2-x11link.patch b/games-engines/exult/files/exult-1.2-x11link.patch deleted file mode 100644 index 5fbd3a6ab4ce..000000000000 --- a/games-engines/exult/files/exult-1.2-x11link.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.ac.old 2006-10-08 12:38:54.000000000 +0200 -+++ configure.ac 2006-10-08 12:39:19.000000000 +0200 -@@ -49,6 +49,8 @@ - EXULT_DATADIR="$datadir/exult" - ARCH="" - -+AC_PATH_XTRA -+ - # determine windowing system from 'host' - AC_MSG_CHECKING("windowing system") - case "$host_os" in |