- up to 1.20

diff --git a/enigma-gcc.patch b/enigma-gcc.patch
deleted file mode 100644 (file)
index b9e960b..0000000
--- a/enigma-gcc.patch
+++ /dev/null
@@ -1,116 +0,0 @@
---- 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"
---- enigma-1.01/lib-src/zipios++/src/directory.h~      2006-05-01 11:13:01.000000000 +0200
-+++ enigma-1.01/lib-src/zipios++/src/directory.h       2012-02-12 09:32:06.068895517 +0100
-@@ -31,6 +31,7 @@
- #include <string>
- #include <ctime>
- #include <stdexcept>
-+#include <cstddef>
- 
- // #include <boost.h>  Contents of boost.h
- 
---- enigma-1.01/lib-src/enigma-core/ecl_dict.hh~       2005-11-25 00:17:06.000000000 +0100
-+++ enigma-1.01/lib-src/enigma-core/ecl_dict.hh        2012-02-12 09:34:46.143015339 +0100
-@@ -21,6 +21,7 @@
- 
- #include "ecl_error.hh"
- #include <utility>
-+#include <cstddef>
- 
- namespace ecl
- {

diff --git a/enigma-libpng15.patch b/enigma-libpng15.patch
deleted file mode 100644 (file)
index 98b4b67..0000000
--- a/enigma-libpng15.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- enigma-1.01/lib-src/enigma-core/IMG_SavePNG.c~     2005-11-25 00:17:06.000000000 +0100
-+++ enigma-1.01/lib-src/enigma-core/IMG_SavePNG.c      2012-02-12 09:33:05.722521948 +0100
-@@ -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/enigma-xerces.patch b/enigma-xerces.patch
deleted file mode 100644 (file)
index 51f3f2b..0000000
--- a/enigma-xerces.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- enigma-1.01/configure.ac~  2007-05-25 23:28:44.000000000 +0200
-+++ enigma-1.01/configure.ac   2010-11-24 00:07:13.166423002 +0100
-@@ -179,7 +179,7 @@
-       xerces3exp="no")      
-   if test "x$xerces3exp" = xyes; then
-     AC_MSG_RESULT([found])
--    AC_CHECK_LIB(xerces, main,,[AC_MSG_ERROR([xerces is required to compile Enigma])])
-+    AC_CHECK_LIB(xerces-c, main,,[AC_MSG_ERROR([xerces is required to compile Enigma])])
-   else
-     AC_MSG_RESULT([not found])
-     AC_MSG_CHECKING([for Xerces >=2.4 released version])
---- enigma-1.01/src/Utf8ToXML.cc~      2010-11-24 00:08:40.166982997 +0100
-+++ enigma-1.01/src/Utf8ToXML.cc       2010-11-24 00:17:40.325982996 +0100
-@@ -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];
---- enigma-1.01/src/XMLtoUtf8.cc~      2006-01-20 12:12:12.000000000 +0100
-+++ enigma-1.01/src/XMLtoUtf8.cc       2010-11-24 00:20:37.279982998 +0100
-@@ -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
---- enigma-1.01/src/lev/ScoreManager.cc.orig   2007-04-10 23:52:50.000000000 +0200
-+++ enigma-1.01/src/lev/ScoreManager.cc        2010-11-24 00:31:38.370982993 +0100
-@@ -61,18 +61,20 @@
- namespace {
- #if _XERCES_VERSION >= 30000
-     class ScoreDomSerFilter : public DOMLSSerializerFilter {
-+      public:
-+          virtual DOMNodeFilter::FilterAction acceptNode(const DOMNode *node) const;
- #else
-     class ScoreDomSerFilter : public DOMWriterFilter {
--#endif
-         public:
-             virtual short acceptNode(const DOMNode *node) const;
-+#endif
-             virtual unsigned long getWhatToShow () const {
-                 return DOMNodeFilter::SHOW_ALL;
-             }
-             virtual void setWhatToShow (unsigned long toShow) {}
-     };
--    
--    short ScoreDomSerFilter::acceptNode(const DOMNode *node) const {
-+   
-+    DOMNodeFilter::FilterAction ScoreDomSerFilter::acceptNode(const DOMNode *node) const {
-         if (node->getNodeType () == DOMNode::ELEMENT_NODE &&
-                  std::string(XMLtoUtf8(node->getNodeName()).c_str()) == "level") {
-             const DOMElement *e = dynamic_cast<const DOMElement *>(node);

diff --git a/enigma.spec b/enigma.spec
index b374c62cdbdedf4ef68a189fd33ef801bc12d133..2d5c80c7dee9f6459c07529dc82faa37e575b97e 100644 (file)
--- a/enigma.spec
+++ b/enigma.spec
@@ -1,16 +1,13 @@
 Summary:       Oxyd clone
 Summary(pl.UTF-8):     Klon gry Oxyd
 Name:          enigma
-Version:       1.01
-Release:       11
+Version:       1.20
+Release:       1
 License:       GPL v2+
 Group:         X11/Applications/Games
-Source0:       http://download.berlios.de/enigma-game/%{name}-%{version}.tar.gz
-# Source0-md5: d3804534ac03425051ebfd383ed1b4ee
+Source0:       http://downloads.sourceforge.net/project/enigma-game/Release%20%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 5871158e07e675d1472f3cfc2a6557ff
 Source1:       %{name}.desktop
-Patch0:                %{name}-gcc.patch
-Patch1:                %{name}-xerces.patch
-Patch2:                %{name}-libpng15.patch
 URL:           http://www.nongnu.org/enigma/
 BuildRequires: SDL_image-devel >= 1.2.0
 BuildRequires: SDL_mixer-devel >= 1.2.5
@@ -50,13 +47,6 @@ blokujących drogę do kamieni Oxyd.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-
-# hack: don't rebuild it, requires too new(?) version of texi2html
-# (doesn't work with texi2html 1.56k from tetex 2.0.2)
-touch doc/manual/*.html
 
 %build
 %{__gettextize}