diff options
author | Michael Sterrett <mr_bones_@gentoo.org> | 2015-03-24 14:52:48 +0000 |
---|---|---|
committer | Michael Sterrett <mr_bones_@gentoo.org> | 2015-03-24 14:52:48 +0000 |
commit | 337628d1b6739ceb381956e7ecff56fa6954b94a (patch) | |
tree | a666b07013bf132b57bce0130827e06adb9c54dd /games-puzzle/enigma | |
parent | cffi is also a build-time dep. (diff) | |
download | historical-337628d1b6739ceb381956e7ecff56fa6954b94a.tar.gz historical-337628d1b6739ceb381956e7ecff56fa6954b94a.tar.bz2 historical-337628d1b6739ceb381956e7ecff56fa6954b94a.zip |
mark stable; clean old
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Diffstat (limited to 'games-puzzle/enigma')
-rw-r--r-- | games-puzzle/enigma/ChangeLog | 9 | ||||
-rw-r--r-- | games-puzzle/enigma/Manifest | 33 | ||||
-rw-r--r-- | games-puzzle/enigma/enigma-1.01.ebuild | 53 | ||||
-rw-r--r-- | games-puzzle/enigma/enigma-1.21.ebuild | 4 | ||||
-rw-r--r-- | games-puzzle/enigma/files/enigma-1.01-autotools.patch | 109 | ||||
-rw-r--r-- | games-puzzle/enigma/files/enigma-1.01-gcc43.patch | 40 | ||||
-rw-r--r-- | games-puzzle/enigma/files/enigma-1.01-gcc44.patch | 51 | ||||
-rw-r--r-- | games-puzzle/enigma/files/enigma-1.01-gcc46.patch | 20 | ||||
-rw-r--r-- | games-puzzle/enigma/files/enigma-1.01-gcc47.patch | 11 | ||||
-rw-r--r-- | games-puzzle/enigma/files/enigma-1.01-libpng15.patch | 11 | ||||
-rw-r--r-- | games-puzzle/enigma/files/enigma-1.01-xerces-c.patch | 85 |
11 files changed, 12 insertions, 414 deletions
diff --git a/games-puzzle/enigma/ChangeLog b/games-puzzle/enigma/ChangeLog index 94bf33f3a528..0e1222cd73a9 100644 --- a/games-puzzle/enigma/ChangeLog +++ b/games-puzzle/enigma/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for games-puzzle/enigma # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/enigma/ChangeLog,v 1.58 2015/03/12 10:07:11 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/enigma/ChangeLog,v 1.59 2015/03/24 14:52:40 mr_bones_ Exp $ + + 24 Mar 2015; Michael Sterrett <mr_bones_@gentoo.org> -enigma-1.01.ebuild, + -files/enigma-1.01-autotools.patch, -files/enigma-1.01-gcc43.patch, + -files/enigma-1.01-gcc44.patch, -files/enigma-1.01-gcc46.patch, + -files/enigma-1.01-gcc47.patch, -files/enigma-1.01-libpng15.patch, + -files/enigma-1.01-xerces-c.patch, enigma-1.21.ebuild: + mark stable; clean old 12 Mar 2015; Agostino Sarubbo <ago@gentoo.org> enigma-1.21.ebuild: Stable for amd64, wrt bug #542934 diff --git a/games-puzzle/enigma/Manifest b/games-puzzle/enigma/Manifest index b9efa690e427..e1ec4ec78f9d 100644 --- a/games-puzzle/enigma/Manifest +++ b/games-puzzle/enigma/Manifest @@ -1,34 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX enigma-1.01-autotools.patch 2865 SHA256 141ea4b51ee272c2842983cab09e5631755f8738e367408de37fb435b84131e1 SHA512 04bcb4f5a59c7e900f94c9843d39cc9e082eefd024a5b95dd4f5a03f79e26cd5b6115d7b8715b97d6235d5b7136c18a07048656c486f3ed81a529054445a8ebe WHIRLPOOL e9f55ef6b03095feac955092678b866c6b59a2ba12b943e0b13c3ebed82c2e88a04d81395c9e2ce0251a08f14513f9612a77acc031ad0ecfcc1b20516795f11c -AUX enigma-1.01-gcc43.patch 813 SHA256 24f5f4f4b4235622d84bc5fd4c954aeffa7c3f2fccd1daa78ad458e44afca897 SHA512 ab5a4c37c1b6053904e60e11012e0aa9da2436860662085412a1b033e6c4b398f05e2b1d9fb6e8d531cef1d8ab84fe8788da2be216aac21be36a85ce41a40f9f WHIRLPOOL 5711326539e25d66047144f25c5dd1ca506c468dae967849b4a74664d01949ea773da02c275f7841574f987d2697a344e057ecf729af95a68e8d896d257e0151 -AUX enigma-1.01-gcc44.patch 1693 SHA256 77b9fd58a843a21afb8c8769e562e86c5d7e5fcaf87067ef4dd91cbe09b207ff SHA512 f65bce6c40a1d28128ced7b5fcf412a8314e4a37a592eedc5e2e973c9427233d2e6c48cc25df4db9ea4d831e8e5cd2d652978805fe810b726c87844b96b6caff WHIRLPOOL 31b85ab5075234883daa9f8baca4e74f9e67f63d437fcf3582d1b0e4e44b43081532e0fca1d9c18779a9e0b95c36b244ef3415f3d447b6c804097be1f7bce26b -AUX enigma-1.01-gcc46.patch 548 SHA256 712f8ffaf4e32c4603e8d977bc94feaadef7d5dfed62177ec9226e6cfe797a17 SHA512 b49f4979f6da5485f325e72665be2aa755677fa59c1f7b8e196d669417211afde864b57ee19fb8ffe1ccc84ebd05d43f9fcdf1421affcf96b0262293d7b2ff96 WHIRLPOOL 2b4bc9fa2c13f5640d8d1f5fe4a572c39364cd22ada8f9e172ab9ab1d4f36ed5a266c89a09acbb688eff6f00fd63427884a13ca1493d2e8f689ac0610e8720ac -AUX enigma-1.01-gcc47.patch 461 SHA256 9ad32cf9d58e3ee1016de6faab417c2cbbe2b9881f30502b7cad61fe398b5694 SHA512 cfc36af8af57526dc72509aedb9bdf8f5d29f09a6ccf7b151002d024a7dff3e43e12961b9921c1ff720dae3513b4b8afe870fb14a314a37bb3650697738a68c6 WHIRLPOOL 67a013d70fff1614e4a64f38f047329876f6141231bfe3e6bc5490f25cf99951fe3941f396f7b0eb1448d37c4b9c0ae795c0f336bf6b51d56879a647ee584eda -AUX enigma-1.01-libpng15.patch 393 SHA256 1351bfa3518b79bfab3473dd44bc6256b05c52d0d24c0706f52356603ecfac09 SHA512 2c2f2bdd4ab6916ea9d49ea25ae2e5404d07bf8bc59516e8e456acc0a460206c69f87f3a8f56b604416f73adcbc0b879441682f7fea1a8714dca20a95e97a146 WHIRLPOOL b3ff61a4917369ad7e091f76912f6d4ad3c8a37ba57fa968bf1baf6f7ffa315a614c86489753f992930846137ea229059e82d5060f1482f645c3819166aefbe8 -AUX enigma-1.01-xerces-c.patch 3824 SHA256 9868afa6bbb4f430bc708f6c5ce2c7c9b434ea044e9ccf239d706d56071c710f SHA512 db5ee4e19578ffc721f23ec92372557a1f77103db21b80dc33a11351d9bfb5e4a4353169daec563dd95631b1e4e072fa950cd43d3fc3991e8cb3333c00994134 WHIRLPOOL 259f7b8b0bcc8e471a7959d3a36477a61695de31a65d15dbe16db64d387b4a2f8036e19765e065a619f270e8e9ecb217c6fb25524f57d5cadb438f452fe30238 AUX enigma-1.21-build.patch 3543 SHA256 adf8008b557e08d37cb5dc898284f1c2ea714fe87d0644bf9cbe43841cde7a79 SHA512 accfb31abaadbee476961f38cc2f76a1fceac4befbf4721d4e08061a3509d05f2e534b4f8f69f1765e082a4ed4f70ccbba0c73c4479a49ee1cfde4c1ae1cdcc4 WHIRLPOOL 787501c1e36ed53026dff7d4eafc4d805e3d649681f80e224c99cc8ed304b8caa6b8dc6896f0eb313f5b569ed35a35dde09fb63a98c5e58c9e608dfc95451032 -DIST enigma-1.01-64bit.tar.gz 10891095 SHA256 ae87ecf635bd89bec143a8011e30a4a3b546edb3fe2ed2fca243d366bb599736 SHA512 345034bcdb7d237cd3e70d2439657e738456e5fd0c761ff3257f17e7c6adee78ee48673ce24f562cedf46040c4749081beaf568e0d823900c9179078fefd8686 WHIRLPOOL 6ae0955272bb443db22ce5f2f55103440a22077e260957168277f14f3f4be68c087aac245aebc81234f66a3225618283800f9a1bc8e3822d4b88ae741e6e3d93 DIST enigma-1.21.tar.gz 56409951 SHA256 d872cf067d8eb560d3bb1cb17245814bc56ac3953ae1f12e2229c8eb6f82ce01 SHA512 0cca56a193f0f416e0fde02caf2e30b61eef506b6c62e151ff575f5c130f1e2e778d77149007b114ebaeec3a3e793434328555cb5190954a0ae13ed6cee229f0 WHIRLPOOL 9583eaacd75c7a3cf5af172d1209771b599e6f8b0fed2b7ea6b0a76ccc2743615d47ac3199f56dd1e39203afc09a43d9aa5d8d879e38502b47d4b77274217b87 -EBUILD enigma-1.01.ebuild 1349 SHA256 2cd4413f5c4291f0ead49fdb9d30e0d1e44deecf33296a6fb805900ca3b6ada6 SHA512 0fb9f15e344bbb642b450a2d5f9c36378219f004b8635bbacf1a46c1eed280ed0cf1e5af6258aac2dadb87ea4775af772d919b2684684579efe1f2e9bbb224c5 WHIRLPOOL 445b20782bf2197566359332a13fe9aaada9f89ee2a7814e3ef9846e54145638a4eb10154dc2f237150d81fc56d5afe045ad9f1e114a6f0eb1939d31e870bec2 -EBUILD enigma-1.21.ebuild 1692 SHA256 7016558bbbb767e641af08594870ff5e73b3a06a381b86e8722bae4d768bc64c SHA512 7c882639e7206160f5b2a6d19a3e7fe9e11edd76ef3167be73e04f2d5627c606e4ddf992659e513bd64e0cf016c14fee7800a44e01285df4d6e9fef107d322aa WHIRLPOOL 1ead3c51478b877b81da24de7b4b4ca92df3731fe072a905342b0a8067469097a976b77f365d103ae9f37a45661ad91b0e866e60894a8c26f66be73c61113074 -MISC ChangeLog 8789 SHA256 d2bfd76fe10c638fc8b57e4f27780b0432a01ddf123bff5361520fe6842f2ba5 SHA512 2c3f68d1e0b2dde4bf55a8867e29c6352d5a3bb5075ebc619406d39007bc6300f779b8eb831e48533f83db3de1b92a173a1d2a9148b9fe3661b52f1b0faacc0f WHIRLPOOL dc3f48a2d4a26edda96af8e45355d6e0982ee628ae09de7a0f9ddd8782af4404d4c14ca8fc0480d0767c82d0aee577cf5922d803f85eedbbf2d23d87ce42d1de +EBUILD enigma-1.21.ebuild 1697 SHA256 e3262e0bc655d812b89a8132e72d474b2bd99c2814b30c8005ced984d0ccb173 SHA512 a61a7bceac18803d3f24ef19c481c26614cd3fcd96be630c0451206d24e1256709095ff77366df694a697974e49ce5e04ce05bdee80c1fbd1b9898a6ff8d1fd0 WHIRLPOOL d656799aeee1af9f3104adc34e5857d6f48f678435f2fe1fd0e3d0c4d82e8899dedfb6a3cb209fcd2d29305a53352e69704c676cd71b6484456b4dcca9474610 +MISC ChangeLog 9159 SHA256 ea2afc10bf1e321028558f6bdd9d0a2391713b4d9527b86b6cdbab11e1f389bc SHA512 f78101e2926de04cc1c593012bb9e6018b9d640692bb03739a9bab7414dd74deae1102b0871823455a397f8da67f23dc99fdd582a2c96d34af1d8bbd804d1ba3 WHIRLPOOL c3b10e9d49fd1248d9a02e85a5853c0a01398a543db15e03fe11fb0f268821c75591a388656091ff35f9c68c8150f826fc2f81659602607198001e088c3cd01b MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQIcBAEBCAAGBQJVAWVQAAoJELp701BxlEWfq7oP/0rwGF5WzfTm6238pLqlVICH -KjD+Tvj+o46vLe6WLd4KiSsxS1yajpacMclANDH6b9LHlELoL2itllz5jnmCabnX -TAMxTbc/dF1IPXBastE3569H1V6QUU3maEfZmoxf+lgsZF6eTV1nxOjfmHcw5vDi -t/HHGZr3YZomKbyORND32qver3WR3A1SkgWeg9Evd3RPMxLKDMtAD4wLreJOWtqU -906VKzHEa8JErfDkdLBSr4zXMXsqNYZO4LWiOlhAKc9DdZF4RCuEVeUZ6U2lRMV0 -240ROgRphNytasYFvbIDid4RZNnWZSdSEGssxWUiWV3v8//k/iQaHN+OaLM2vfZP -almyhY9pgOINrirdw8EHjnGDBWIySITwm3iLZ01Gf2GB0t/Nxwx5B+rQbfNVitb9 -Vs15oKXK/2kQP4E5Tonr7k22+TOYkbpLFBH748A8OUxP00iCYo9RJug4Err2qSle -BJE+LdW0ZTM40ELzdj70G1FKxRxhbbjk+W/rMucGjKzohlKxs+l6lT1XRQe27EG0 -aeuv9y7lrRiGqXw00Eg5KaMA6/tHDSlO3I9xT/TASMUeQOdO/yx3aRNMBzhPXU4x -b4UWFrkf6hPtYdHNshlYXWKxZ+nnSPD8te6bhnUmT7LueaqmSX9EDuQo3LvRAnhD -EXFKP5G58eR94z1N/HKh -=gu4Y ------END PGP SIGNATURE----- diff --git a/games-puzzle/enigma/enigma-1.01.ebuild b/games-puzzle/enigma/enigma-1.01.ebuild deleted file mode 100644 index 59805e93bf91..000000000000 --- a/games-puzzle/enigma/enigma-1.01.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/enigma/enigma-1.01.ebuild,v 1.17 2012/09/28 12:24:34 tupone Exp $ - -EAPI=2 -inherit autotools eutils games - -DESCRIPTION="puzzle game similar to Oxyd" -HOMEPAGE="http://www.nongnu.org/enigma/" -SRC_URI="mirror://berlios/enigma-game/${P}-64bit.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="nls" - -RDEPEND="media-libs/sdl-ttf - media-libs/libsdl - media-libs/sdl-mixer - media-libs/sdl-image[jpeg,png] - media-libs/libpng - || ( >=dev-libs/xerces-c-3[icu] >=dev-libs/xerces-c-3[-icu,-iconv] ) - net-libs/enet:0 - nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - sys-devel/gettext" - -src_prepare() { - cp /usr/share/gettext/config.rpath . - epatch \ - "${FILESDIR}"/${P}-autotools.patch \ - "${FILESDIR}"/${P}-gcc43.patch \ - "${FILESDIR}"/${P}-gcc44.patch \ - "${FILESDIR}"/${P}-gcc46.patch \ - "${FILESDIR}"/${P}-gcc47.patch \ - "${FILESDIR}"/${P}-xerces-c.patch \ - "${FILESDIR}"/${P}-libpng15.patch - eautoreconf -} - -src_configure() { - egamesconf \ - --disable-dependency-tracking \ - $(use_enable nls) -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc ACKNOWLEDGEMENTS AUTHORS CHANGES README doc/HACKING - dohtml -r doc/* - doman doc/enigma.6 - prepgamesdirs -} diff --git a/games-puzzle/enigma/enigma-1.21.ebuild b/games-puzzle/enigma/enigma-1.21.ebuild index 7610e3b2280a..abc6169e4ba6 100644 --- a/games-puzzle/enigma/enigma-1.21.ebuild +++ b/games-puzzle/enigma/enigma-1.21.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/enigma/enigma-1.21.ebuild,v 1.3 2015/03/12 10:07:11 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/enigma/enigma-1.21.ebuild,v 1.4 2015/03/24 14:52:40 mr_bones_ Exp $ EAPI=5 inherit autotools eutils gnome2-utils games @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/enigma-game/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc x86" IUSE="nls" COMMON_DEPS="media-libs/sdl-ttf diff --git a/games-puzzle/enigma/files/enigma-1.01-autotools.patch b/games-puzzle/enigma/files/enigma-1.01-autotools.patch deleted file mode 100644 index 68116e1c0fbf..000000000000 --- a/games-puzzle/enigma/files/enigma-1.01-autotools.patch +++ /dev/null @@ -1,109 +0,0 @@ ---- configure.ac -+++ configure.ac -@@ -260,7 +260,6 @@ - CXXFLAGS="$CXXFLAGS -O2 -ffast-math -fomit-frame-pointer" - AC_MSG_RESULT(yes) - else -- CXXFLAGS="$CXXFLAGS -g" - AC_MSG_RESULT(no) - fi - -@@ -321,7 +320,6 @@ - dnl Configure libraries - dnl ---------------------------------------------------------- - AC_CONFIG_SUBDIRS(lib-src/zipios++) --AC_CONFIG_SUBDIRS(lib-src/enet) - - AC_CONFIG_FILES([Makefile m4/Makefile intl/Makefile - data/Makefile ---- etc/Makefile.am -+++ etc/Makefile.am -@@ -1,14 +1,14 @@ - # if !MINGW32 - # Comply with xdg icon theme specification --icondir = $(prefix)/share/icons/hicolor/48x48/apps -+icondir = /usr/share/icons/hicolor/48x48/apps - icon_DATA = enigma.png - - # Backwards-compatible global search location for images --pixmapdir = $(prefix)/share/pixmaps -+pixmapdir = /usr/share/pixmaps - pixmap_DATA = enigma.png - - # Install .desktop file in xdg standard location --desktopdir = $(prefix)/share/applications -+desktopdir = /usr/share/applications - desktop_DATA = enigma.desktop - # endif !MINGW32 - ---- lib-src/Makefile.am -+++ lib-src/Makefile.am -@@ -1 +1 @@ --SUBDIRS = oxydlib lua zipios++ enet enigma-core -+SUBDIRS = oxydlib lua zipios++ enigma-core ---- Makefile.am -+++ Makefile.am -@@ -3,11 +3,9 @@ - # tools -> lib-src/lua - # src -> tools, lib-src - # --SUBDIRS = m4 lib-src tools intl src data doc po etc -+SUBDIRS = m4 lib-src tools intl src data po etc - EXTRA_DIST = enigma CHANGES ACKNOWLEDGEMENTS - --docdir = @datadir@/doc/enigma --doc_DATA = README CHANGES COPYING ACKNOWLEDGEMENTS - - ACLOCAL_AMFLAGS = -I m4 - ---- po/Makefile.in.in -+++ po/Makefile.in.in -@@ -24,12 +24,12 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - datadir = @datadir@ --localedir = $(datadir)/locale -+localedir = /usr/share/locale - gettextsrcdir = $(datadir)/gettext/po - - INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ --MKINSTALLDIRS = @MKINSTALLDIRS@ -+MKINSTALLDIRS = $(top_srcdir)/mkinstalldirs - #install_sh@ -d - mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) - ---- src/Makefile.am -+++ src/Makefile.am -@@ -12,12 +12,11 @@ - - CXXFLAGS = @CXXFLAGS@\ - -DSYSTEM_DATA_DIR=\"$(datadir)/enigma\" \ -- -DLOCALEDIR=\"$(localedir)\" \ -+ -DLOCALEDIR=\"/usr/share/locale\" \ - -I$(top_srcdir)/lib-src/zipios++ \ - -I$(top_builddir)/lib-src/zipios++ \ - -I$(top_srcdir)/lib-src/lua \ - -I$(top_srcdir)/lib-src/enigma-core \ -- -I$(top_srcdir)/lib-src/enet/include \ - -I$(top_srcdir)/lib-src \ - -I$(top_builddir)/intl @SDL_CFLAGS@ - -@@ -193,7 +192,7 @@ - - else # not MINGW32 - -- localedir = $(datadir)/locale -+ localedir = /usr/share/locale - mingw_ldadd = - - endif -@@ -202,7 +201,7 @@ - @LIBINTL@ \ - $(top_builddir)/lib-src/enigma-core/libecl.a \ - $(top_builddir)/lib-src/lua/liblua.a \ -- $(top_builddir)/lib-src/enet/libenet.a \ -+ -lenet \ - $(top_builddir)/lib-src/oxydlib/liboxyd.a \ - $(top_builddir)/lib-src/zipios++/src/libzipios.a \ - -lz \ diff --git a/games-puzzle/enigma/files/enigma-1.01-gcc43.patch b/games-puzzle/enigma/files/enigma-1.01-gcc43.patch deleted file mode 100644 index 32fba0caca98..000000000000 --- a/games-puzzle/enigma/files/enigma-1.01-gcc43.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- lib-src/enigma-core/ecl_util.hh -+++ lib-src/enigma-core/ecl_util.hh -@@ -20,6 +20,7 @@ - #define ECL_UTIL_HH_INCLUDED - - #include <string> -+#include <algorithm> - - /* hide GNU extensions for non-gnu compilers: */ - #ifndef __GNU__ ---- src/Utf8ToXML.cc -+++ src/Utf8ToXML.cc -@@ -21,6 +21,7 @@ - #include "main.hh" - #include <xercesc/util/XMLString.hpp> - #include <xercesc/util/TransService.hpp> -+#include <cstring> - - XERCES_CPP_NAMESPACE_USE - ---- src/file.hh -+++ src/file.hh -@@ -22,6 +22,7 @@ - #include <iosfwd> - #include <vector> - #include <list> -+#include <memory> - #include "ecl_error.hh" - - namespace enigma ---- src/gui/widgets.cc -+++ src/gui/widgets.cc -@@ -28,6 +28,7 @@ - #include <cassert> - #include <algorithm> - #include <iostream> -+#include <climits> - - using namespace enigma::gui; - using namespace ecl; diff --git a/games-puzzle/enigma/files/enigma-1.01-gcc44.patch b/games-puzzle/enigma/files/enigma-1.01-gcc44.patch deleted file mode 100644 index 9a14063cf764..000000000000 --- a/games-puzzle/enigma/files/enigma-1.01-gcc44.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- src/PropertyManager.cc.old 2009-05-22 10:50:04.000000000 +0200 -+++ src/PropertyManager.cc 2009-05-22 10:50:30.000000000 +0200 -@@ -28,6 +28,7 @@ - #include "XMLtoLocal.hh" - #include "XMLtoUtf8.hh" - #include "ecl_system.hh" -+#include <cstdio> - #include <iostream> - #include <xercesc/dom/DOM.hpp> - #include <xercesc/util/XMLDouble.hpp> ---- src/StateManager.cc.old 2009-05-22 10:52:13.000000000 +0200 -+++ src/StateManager.cc 2009-05-22 10:52:38.000000000 +0200 -@@ -31,6 +31,7 @@ - #include "XMLtoUtf8.hh" - #include "ecl_system.hh" - #include "gui/ErrorMenu.hh" -+#include <cstdio> - #include <iostream> - #include <sstream> - #include <xercesc/dom/DOM.hpp> ---- src/gui/LevelPackComposer.cc.old 2009-05-22 10:53:46.000000000 +0200 -+++ src/gui/LevelPackComposer.cc 2009-05-22 10:54:24.000000000 +0200 -@@ -28,6 +28,7 @@ - #include "lev/Index.hh" - - #include "main.hh" -+#include <cstdio> - - using namespace ecl; - using namespace std; ---- src/lev/Index.cc.old 2009-05-22 10:55:16.000000000 +0200 -+++ src/lev/Index.cc 2009-05-22 10:55:41.000000000 +0200 -@@ -26,6 +26,7 @@ - #include "StateManager.hh" - #include "lev/ScoreManager.hh" - #include "lev/RatingManager.hh" -+#include <cstdio> - - - namespace enigma { namespace lev { ---- src/lua.cc.old 2009-05-28 09:43:36.000000000 +0200 -+++ src/lua.cc 2009-05-28 09:44:22.000000000 +0200 -@@ -574,7 +574,7 @@ - int y = round_down<int>(lua_tonumber(L, 2)); - const char *dir = lua_tostring(L,3); - const char *allowed = "wsen"; -- char *found = strchr(allowed, dir[0]); -+ const char *found = strchr(allowed, dir[0]); - - if (found && found[0]) - world::AddScramble(GridPos(x,y), enigma::Direction(found-allowed)); diff --git a/games-puzzle/enigma/files/enigma-1.01-gcc46.patch b/games-puzzle/enigma/files/enigma-1.01-gcc46.patch deleted file mode 100644 index 18c98ecd6974..000000000000 --- a/games-puzzle/enigma/files/enigma-1.01-gcc46.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- lib-src/enigma-core/ecl_dict.hh.old 2011-04-29 08:41:47.649582258 +0200 -+++ lib-src/enigma-core/ecl_dict.hh 2011-04-29 08:42:05.404691426 +0200 -@@ -21,6 +21,7 @@ - - #include "ecl_error.hh" - #include <utility> -+#include <cstddef> - - namespace ecl - { ---- lib-src/zipios++/src/directory.h.old 2011-04-29 08:40:31.063798354 +0200 -+++ lib-src/zipios++/src/directory.h 2011-04-29 08:40:52.656147037 +0200 -@@ -31,6 +31,7 @@ - #include <string> - #include <ctime> - #include <stdexcept> -+#include <cstddef> - - // #include <boost.h> Contents of boost.h - diff --git a/games-puzzle/enigma/files/enigma-1.01-gcc47.patch b/games-puzzle/enigma/files/enigma-1.01-gcc47.patch deleted file mode 100644 index 622b2a14c6ce..000000000000 --- a/games-puzzle/enigma/files/enigma-1.01-gcc47.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- lib-src/enigma-core/ecl_alist.hh.old 2012-09-28 12:28:01.465223434 +0200 -+++ lib-src/enigma-core/ecl_alist.hh 2012-09-28 12:28:41.195739039 +0200 -@@ -61,7 +61,7 @@ - VAL &operator[] (const key_type &key) { - iterator i=find(key); - if (i==this->end()) -- i=insert(this->end(), make_pair(key, VAL())); -+ i=this->insert(this->end(), make_pair(key, VAL())); - return i->second; - } - }; diff --git a/games-puzzle/enigma/files/enigma-1.01-libpng15.patch b/games-puzzle/enigma/files/enigma-1.01-libpng15.patch deleted file mode 100644 index a6ce342bd168..000000000000 --- a/games-puzzle/enigma/files/enigma-1.01-libpng15.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- lib-src/enigma-core/IMG_SavePNG.c -+++ lib-src/enigma-core/IMG_SavePNG.c -@@ -84,7 +84,7 @@ - png_bytep *row_pointers = 0; - - /* Set error handling. */ -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - IMG_SetError("Error writing the PNG file"); - } - else { diff --git a/games-puzzle/enigma/files/enigma-1.01-xerces-c.patch b/games-puzzle/enigma/files/enigma-1.01-xerces-c.patch deleted file mode 100644 index 2f7e0c0523a3..000000000000 --- a/games-puzzle/enigma/files/enigma-1.01-xerces-c.patch +++ /dev/null @@ -1,85 +0,0 @@ ---- configure.ac 2008-11-18 14:09:53.724778996 +0500 -+++ configure.ac3 2008-11-18 14:42:30.322032537 +0500 -@@ -167,14 +167,14 @@ dnl ------------------------------------ - dnl Check for xerces - dnl ---------------------------------------- - if test "$MINGW32" = yes; then -- AC_MSG_CHECKING([for Xerces 3.0 experimental version]) -- AC_EGREP_HEADER([gXercesMajVersion = 3],[xercesc/util/XercesVersion.hpp], -+ AC_MSG_CHECKING([for Xerces 3 version]) -+ AC_EGREP_HEADER([XERCES_VERSION_MAJOR 3],[xercesc/util/XercesVersion.hpp], - [AC_MSG_RESULT([found])], - [AC_MSG_ERROR([not found])]) - AC_CHECK_LIB(xerces, main,,[AC_MSG_ERROR([xerces is required to compile Enigma])]) - else -- AC_MSG_CHECKING([for Xerces 3.0 experimental version]) -- AC_EGREP_HEADER([gXercesMajVersion = 3],[xercesc/util/XercesVersion.hpp], -+ AC_MSG_CHECKING([for Xerces 3 version]) -+ AC_EGREP_HEADER([XERCES_VERSION_MAJOR 3],[xercesc/util/XercesVersion.hpp], - xerces3exp="yes", - xerces3exp="no") - if test "x$xerces3exp" = xyes; then ---- src/lev/ScoreManager.cc -+++ src/lev/ScoreManager.cc -@@ -65,15 +65,23 @@ - class ScoreDomSerFilter : public DOMWriterFilter { - #endif - public: -+#if _XERCES_VERSION >= 30000 -+ virtual DOMNodeFilter::FilterAction acceptNode(const DOMNode *node) const; -+#else - virtual short acceptNode(const DOMNode *node) const; -+#endif - virtual unsigned long getWhatToShow () const { - return DOMNodeFilter::SHOW_ALL; - } - virtual void setWhatToShow (unsigned long toShow) {} - }; -- -+ -+#if _XERCES_VERSION >= 30000 -+ DOMNodeFilter::FilterAction ScoreDomSerFilter::acceptNode(const DOMNode *node) const { -+#else - short ScoreDomSerFilter::acceptNode(const DOMNode *node) const { -- if (node->getNodeType () == DOMNode::ELEMENT_NODE && -+#endif -+ if (node->getNodeType () == DOMNode::ELEMENT_NODE && - std::string(XMLtoUtf8(node->getNodeName()).c_str()) == "level") { - const DOMElement *e = dynamic_cast<const DOMElement *>(node); - std::string id = XMLtoUtf8(e->getAttribute(Utf8ToXML("id").x_str())).c_str(); ---- src/Utf8ToXML.cc~ 2008-12-29 00:12:26.000000000 +0600 -+++ src/Utf8ToXML.cc 2008-12-29 00:15:19.000000000 +0600 -@@ -40,11 +40,11 @@ - } - - void Utf8ToXML::init(const char * const toTranscode) { -- unsigned int srcLength = std::strlen(toTranscode) + 1; -+ XMLSize_t srcLength = std::strlen(toTranscode) + 1; - // make safe assumptions on utf-16 size -- unsigned int maxDestLength = srcLength; -- unsigned int charsEaten; -- unsigned int destLength; -+ XMLSize_t maxDestLength = srcLength; -+ XMLSize_t charsEaten; -+ XMLSize_t destLength; - unsigned char *charSizes = new unsigned char[maxDestLength]; // just junk - // make a buffer - size does not matter - the object is temporary - xmlString = new XMLCh[maxDestLength]; ---- src/XMLtoUtf8.cc~ 2008-12-29 00:12:12.000000000 +0600 -+++ src/XMLtoUtf8.cc 2008-12-29 00:14:47.000000000 +0600 -@@ -27,11 +27,11 @@ - namespace enigma - { - XMLtoUtf8::XMLtoUtf8(const XMLCh* const toTranscode) { -- unsigned int srcLength = XMLString::stringLen(toTranscode) + 1; -+ XMLSize_t srcLength = XMLString::stringLen(toTranscode) + 1; - // make safe assumptions on utf-8 size -- unsigned int maxDestLength = 3 * srcLength; -- unsigned int charsEaten; -- unsigned int destLength; -+ XMLSize_t maxDestLength = 3 * srcLength; -+ XMLSize_t charsEaten; -+ XMLSize_t destLength; - // make a buffer - size does not matter - the object is temporary - utf8String = new char[maxDestLength]; - // transcode to utf-8 -- there are no unrepresentable chars |