Author: baggins Date: Sat Feb 6 01:42:29 2010 GMT Module: packages Tag: HEAD ---- Log message: - rel 3 - fix latest c++ problems
---- Files affected: packages/enigma: enigma.spec (1.32 -> 1.33) , enigma-gcc.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/enigma/enigma.spec diff -u packages/enigma/enigma.spec:1.32 packages/enigma/enigma.spec:1.33 --- packages/enigma/enigma.spec:1.32 Thu Sep 6 18:30:03 2007 +++ packages/enigma/enigma.spec Sat Feb 6 02:42:24 2010 @@ -3,12 +3,13 @@ Summary(pl.UTF-8): Klon gry Oxyd Name: enigma Version: 1.01 -Release: 2 +Release: 3 License: GPL v2+ Group: X11/Applications/Games Source0: http://download.berlios.de/enigma-game/%{name}-%{version}.tar.gz # Source0-md5: d3804534ac03425051ebfd383ed1b4ee Source1: %{name}.desktop +Patch0: %{name}-gcc.patch URL: http://www.nongnu.org/enigma/ BuildRequires: SDL_image-devel >= 1.2.0 BuildRequires: SDL_mixer-devel >= 1.2.5 @@ -47,6 +48,7 @@ %prep %setup -q +%patch0 -p1 # hack: don't rebuild it, requires too new(?) version of texi2html # (doesn't work with texi2html 1.56k from tetex 2.0.2) @@ -95,6 +97,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.33 2010/02/06 01:42:24 baggins +- rel 3 +- fix latest c++ problems + Revision 1.32 2007/09/06 16:30:03 wolf - rel 2 ================================================================ Index: packages/enigma/enigma-gcc.patch diff -u /dev/null packages/enigma/enigma-gcc.patch:1.1 --- /dev/null Sat Feb 6 02:42:29 2010 +++ packages/enigma/enigma-gcc.patch Sat Feb 6 02:42:24 2010 @@ -0,0 +1,96 @@ +--- enigma-1.01/lib-src/enigma-core/ecl_util.hh~ 2006-01-20 12:12:12.000000000 +0100 ++++ enigma-1.01/lib-src/enigma-core/ecl_util.hh 2010-02-06 01:53:10.484390523 +0100 +@@ -20,6 +20,7 @@ + #define ECL_UTIL_HH_INCLUDED + + #include <string> ++#include <algorithm> + + /* hide GNU extensions for non-gnu compilers: */ + #ifndef __GNU__ +diff -Nur enigma-1.01/build-tree/enigma-1.01/src/Utf8ToXML.cc enigma-1.01.new/build-tree/enigma-1.01/src/Utf8ToXML.cc +--- enigma-1.01/src/Utf8ToXML.cc 2006-09-03 19:15:33.000000000 +0000 ++++ enigma-1.01/src/Utf8ToXML.cc 2008-03-18 04:49:15.000000000 +0000 +@@ -21,6 +21,7 @@ + #include "main.hh" + #include <xercesc/util/XMLString.hpp> + #include <xercesc/util/TransService.hpp> ++#include <cstring> + + XERCES_CPP_NAMESPACE_USE + +diff -Nur enigma-1.01/build-tree/enigma-1.01/src/file.hh enigma-1.01.new/build-tree/enigma-1.01/src/file.hh +--- enigma-1.01/src/file.hh 2007-04-03 23:12:49.000000000 +0000 ++++ enigma-1.01/src/file.hh 2008-03-18 04:48:51.000000000 +0000 +@@ -22,6 +22,7 @@ + #include <iosfwd> + #include <vector> + #include <list> ++#include <memory> + #include "ecl_error.hh" + + namespace enigma +diff -Nur enigma-1.01/build-tree/enigma-1.01/src/gui/widgets.cc enigma-1.01.new/build-tree/enigma-1.01/src/gui/widgets.cc +--- enigma-1.01/src/gui/widgets.cc 2007-05-18 13:14:14.000000000 +0000 ++++ enigma-1.01/src/gui/widgets.cc 2008-03-18 04:48:51.000000000 +0000 +@@ -28,6 +28,7 @@ + #include <cassert> + #include <algorithm> + #include <iostream> ++#include <limits.h> + + using namespace enigma::gui; + using namespace ecl; +--- enigma-1.01/src/lua.cc~ 2010-02-06 02:00:59.472140143 +0100 ++++ enigma-1.01/src/lua.cc 2010-02-06 02:01:20.695139086 +0100 +@@ -572,7 +572,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)); +--- enigma-1.01/src/PropertyManager.cc~ 2007-05-18 15:14:15.000000000 +0200 ++++ enigma-1.01/src/PropertyManager.cc 2010-02-06 02:02:45.056139587 +0100 +@@ -29,6 +29,7 @@ + #include "XMLtoUtf8.hh" + #include "ecl_system.hh" + #include <iostream> ++#include <cstdio> + #include <xercesc/dom/DOM.hpp> + #include <xercesc/util/XMLDouble.hpp> + #include <xercesc/util/XMLString.hpp> +--- enigma-1.01/src/StateManager.cc~ 2010-02-06 02:04:34.963140776 +0100 ++++ enigma-1.01/src/StateManager.cc 2010-02-06 02:05:55.729138277 +0100 +@@ -33,6 +33,7 @@ + #include "gui/ErrorMenu.hh" + #include <iostream> + #include <sstream> ++#include <cstdio> + #include <xercesc/dom/DOM.hpp> + #include <xercesc/util/XMLDouble.hpp> + #include <xercesc/util/XMLString.hpp> +--- enigma-1.01/src/gui/LevelPackComposer.cc~ 2007-05-18 15:14:14.000000000 +0200 ++++ enigma-1.01/src/gui/LevelPackComposer.cc 2010-02-06 02:07:14.662390121 +0100 +@@ -16,7 +16,8 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ +- ++ ++#include <cstdio> + #include "gui/LevelPackComposer.hh" + #include "gui/HelpMenu.hh" + #include "ecl.hh" +--- enigma-1.01/src/lev/Index.cc~ 2007-05-22 22:02:53.000000000 +0200 ++++ enigma-1.01/src/lev/Index.cc 2010-02-06 02:08:15.873139909 +0100 +@@ -16,6 +16,7 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + ++#include <cstdio> + #include "lev/Index.hh" + #include "lev/VolatileIndex.hh" + #include "errors.hh" ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/enigma/enigma.spec?r1=1.32&r2=1.33&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
