13 files changed, 11 insertions, 330 deletions

diff --git a/games/enigma/files/patch-Makefile.in b/games/enigma/files/patch-Makefile.in
deleted file mode 100644
index f3a9798ac749..000000000000
--- a/games/enigma/files/patch-Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.in.orig	2007-09-08 14:39:17.000000000 +0200
-+++ Makefile.in	2011-08-01 09:52:47.000000000 +0200
-@@ -246,7 +246,7 @@ target_vendor = @target_vendor@
- #   tools -> lib-src/lua
- #   src   -> tools, lib-src
- #
--SUBDIRS = m4 lib-src tools intl src data doc po etc
-+SUBDIRS = m4 lib-src src data doc po etc
- EXTRA_DIST = enigma CHANGES ACKNOWLEDGEMENTS
- doc_DATA = README CHANGES COPYING ACKNOWLEDGEMENTS
- ACLOCAL_AMFLAGS = -I m4
-@@ -633,7 +633,7 @@ info: info-recursive
- 
- info-am:
- 
--install-data-am: install-docDATA
-+install-data-am: 
- 
- install-exec-am:
- 
diff --git a/games/enigma/files/patch-configure b/games/enigma/files/patch-configure
deleted file mode 100644
index b40666933878..000000000000
--- a/games/enigma/files/patch-configure
+++ /dev/null
@@ -1,62 +0,0 @@
---- configure.orig	2007-09-08 16:39:18.000000000 +0400
-+++ configure	2014-12-11 18:27:47.000000000 +0300
-@@ -753,8 +753,7 @@
- CXX
- CXXFLAGS
- CCC'
--ac_subdirs_all='lib-src/zipios++
--lib-src/enet'
-+ac_subdirs_all='lib-src/zipios++'
- 
- # Initialize some variables set by options.
- ac_init_help=
-@@ -14740,7 +14739,7 @@
- 
- _ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  $EGREP "gXercesMajVersion = 3" >/dev/null 2>&1; then
-+  $EGREP "XERCES_VERSION_MAJOR 3" >/dev/null 2>&1; then
-   { echo "$as_me:$LINENO: result: found" >&5
- echo "${ECHO_T}found" >&6; }
- else
-@@ -14848,7 +14847,7 @@
- 
- _ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  $EGREP "gXercesMajVersion = 3" >/dev/null 2>&1; then
-+  $EGREP "XERCES_VERSION_MAJOR 3" >/dev/null 2>&1; then
-   xerces3exp="yes"
- else
-   xerces3exp="no"
-@@ -15279,10 +15278,10 @@
- 
- subdirs="$subdirs lib-src/zipios++"
- 
--subdirs="$subdirs lib-src/enet"
- 
- 
--ac_config_files="$ac_config_files Makefile m4/Makefile intl/Makefile data/Makefile data/gfx/Makefile data/gfx32/Makefile data/gfx40/Makefile data/gfx48/Makefile data/levels/Makefile data/levels/enigma_tutorial/Makefile data/levels/enigma_i/Makefile data/levels/enigma_ii/Makefile data/levels/enigma_iii/Makefile data/levels/enigma_iv/Makefile data/levels/enigma_v/Makefile data/levels/enigma_vi/Makefile data/levels/enigma_vii/Makefile data/levels/enigma_cross/Makefile data/levels/enigma_esprit/Makefile data/levels/enigma_oxyd/Makefile data/levels/enigma_peroxyd/Makefile data/levels/enigma_oxydmagnum/Makefile data/levels/enigma_oxydextra/Makefile data/levels/enigma_experimental/Makefile data/levels/enigma_stable/Makefile data/levels/enigma_sokoban/Makefile data/levels/enigma_microban/Makefile data/levels/enigma_mas_microban/Makefile data/levels/lib/Makefile data/levels/patches/Makefile data/fonts/Makefile data/sound/Makefile data/soundsets/Makefile data/soundsets/enigma/Makefile data/schemas/Makefile doc/Makefile doc/images/Makefile doc/images/flags25x15/Makefile doc/manual/Makefile doc/manual/images/Makefile doc/reference/Makefile doc/reference/images/Makefile etc/Makefile lib-src/Makefile lib-src/oxydlib/Makefile lib-src/lua/Makefile lib-src/enigma-core/Makefile src/Makefile tools/Makefile etc/enigma.spec etc/enigma.nsi etc/Info.plist po/Makefile.in"
-+
-+ac_config_files="$ac_config_files Makefile m4/Makefile data/Makefile data/gfx/Makefile data/gfx32/Makefile data/gfx40/Makefile data/gfx48/Makefile data/levels/Makefile data/levels/enigma_tutorial/Makefile data/levels/enigma_i/Makefile data/levels/enigma_ii/Makefile data/levels/enigma_iii/Makefile data/levels/enigma_iv/Makefile data/levels/enigma_v/Makefile data/levels/enigma_vi/Makefile data/levels/enigma_vii/Makefile data/levels/enigma_cross/Makefile data/levels/enigma_esprit/Makefile data/levels/enigma_oxyd/Makefile data/levels/enigma_peroxyd/Makefile data/levels/enigma_oxydmagnum/Makefile data/levels/enigma_oxydextra/Makefile data/levels/enigma_experimental/Makefile data/levels/enigma_stable/Makefile data/levels/enigma_sokoban/Makefile data/levels/enigma_microban/Makefile data/levels/enigma_mas_microban/Makefile data/levels/lib/Makefile data/levels/patches/Makefile data/fonts/Makefile data/sound/Makefile data/soundsets/Makefile data/soundsets/enigma/Makefile data/schemas/Makefile doc/Makefile doc/images/Makefile doc/images/flags25x15/Makefile doc/manual/Makefile doc/manual/images/Makefile doc/reference/Makefile doc/reference/images/Makefile etc/Makefile lib-src/Makefile lib-src/oxydlib/Makefile lib-src/enigma-core/Makefile src/Makefile etc/enigma.spec etc/enigma.nsi etc/Info.plist po/Makefile.in"
- 
- 
- ac_config_files="$ac_config_files etc/mingw32-dist.sh"
-@@ -15912,7 +15911,6 @@
-     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-     "m4/Makefile") CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;;
--    "intl/Makefile") CONFIG_FILES="$CONFIG_FILES intl/Makefile" ;;
-     "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
-     "data/gfx/Makefile") CONFIG_FILES="$CONFIG_FILES data/gfx/Makefile" ;;
-     "data/gfx32/Makefile") CONFIG_FILES="$CONFIG_FILES data/gfx32/Makefile" ;;
-@@ -15955,10 +15953,8 @@
-     "etc/Makefile") CONFIG_FILES="$CONFIG_FILES etc/Makefile" ;;
-     "lib-src/Makefile") CONFIG_FILES="$CONFIG_FILES lib-src/Makefile" ;;
-     "lib-src/oxydlib/Makefile") CONFIG_FILES="$CONFIG_FILES lib-src/oxydlib/Makefile" ;;
--    "lib-src/lua/Makefile") CONFIG_FILES="$CONFIG_FILES lib-src/lua/Makefile" ;;
-     "lib-src/enigma-core/Makefile") CONFIG_FILES="$CONFIG_FILES lib-src/enigma-core/Makefile" ;;
-     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
--    "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
-     "etc/enigma.spec") CONFIG_FILES="$CONFIG_FILES etc/enigma.spec" ;;
-     "etc/enigma.nsi") CONFIG_FILES="$CONFIG_FILES etc/enigma.nsi" ;;
-     "etc/Info.plist") CONFIG_FILES="$CONFIG_FILES etc/Info.plist" ;;
diff --git a/games/enigma/files/patch-lib-src-Makefile.in b/games/enigma/files/patch-lib-src-Makefile.in
deleted file mode 100644
index c543742145ad..000000000000
--- a/games/enigma/files/patch-lib-src-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib-src/Makefile.in.orig	2007-09-08 14:39:16.000000000 +0200
-+++ lib-src/Makefile.in	2011-08-01 08:48:34.000000000 +0200
-@@ -214,7 +214,7 @@ target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--SUBDIRS = oxydlib lua zipios++ enet enigma-core
-+SUBDIRS = oxydlib zipios++ enigma-core
- all: all-recursive
- 
- .SUFFIXES:
diff --git a/games/enigma/files/patch-lib-src-enigma-core-ecl__alist.hh b/games/enigma/files/patch-lib-src-enigma-core-ecl__alist.hh
deleted file mode 100644
index 0029d2ecd18c..000000000000
--- a/games/enigma/files/patch-lib-src-enigma-core-ecl__alist.hh
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib-src/enigma-core/ecl_alist.hh.orig	2007-09-08 16:20:05.000000000 +0400
-+++ lib-src/enigma-core/ecl_alist.hh	2013-07-10 23:10:11.780119603 +0400
-@@ -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/enigma/files/patch-lib-src-enigma-core-ecl__dict.hh b/games/enigma/files/patch-lib-src-enigma-core-ecl__dict.hh
deleted file mode 100644
index 1cb2c6268fce..000000000000
--- a/games/enigma/files/patch-lib-src-enigma-core-ecl__dict.hh
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib-src/enigma-core/ecl_dict.hh.orig	2007-09-08 16:20:05.000000000 +0400
-+++ lib-src/enigma-core/ecl_dict.hh	2013-07-10 23:08:37.858113264 +0400
-@@ -27,6 +27,7 @@
-     extern unsigned hash(const std::string &key);
- 
-     class XInvalidKey : XGeneric {
-+    public:
- 	XInvalidKey () : XGeneric("invalid dictionary key")
-         {}
-     };
diff --git a/games/enigma/files/patch-lib-src_enigma-core_IMG__SavePNG.c b/games/enigma/files/patch-lib-src_enigma-core_IMG__SavePNG.c
deleted file mode 100644
index 9363c5f152a9..000000000000
--- a/games/enigma/files/patch-lib-src_enigma-core_IMG__SavePNG.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- lib-src/enigma-core/IMG_SavePNG.c.orig	2007-09-08 12:20:05 UTC
-+++ lib-src/enigma-core/IMG_SavePNG.c
-@@ -7,7 +7,7 @@
- #define IMG_SetError(a) SDL_SetError(a)
- 
- /* Save a PNG type image to an SDL datasource */
--static void png_write_data(png_structp ctx, png_bytep area, png_size_t size)
-+static void local_png_write_data(png_structp ctx, png_bytep area, png_size_t size)
- {
- 	SDL_RWops *src;
- 	
-@@ -84,12 +84,12 @@ int IMG_SavePNG_RW(SDL_Surface *face, SD
-                 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 {
- 					int colortype;
--                    png_set_write_fn(png_ptr, src, png_write_data, png_io_flush);
-+                    png_set_write_fn(png_ptr, src, local_png_write_data, png_io_flush);
-                     /* Set the image information here.  Width and height are up to 2^31,
-                      * bit_depth is one of 1, 2, 4, 8, or 16, but valid values also depend on
-                      * the color_type selected. color_type is one of PNG_COLOR_TYPE_GRAY,
diff --git a/games/enigma/files/patch-src-Makefile.in b/games/enigma/files/patch-src-Makefile.in
deleted file mode 100644
index 43d689cfb0c7..000000000000
--- a/games/enigma/files/patch-src-Makefile.in
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/Makefile.in.orig	2007-09-08 14:39:17.000000000 +0200
-+++ src/Makefile.in	2011-08-01 08:49:09.000000000 +0200
-@@ -98,8 +98,6 @@ am_enigma_OBJECTS = actors.$(OBJEXT) cli
- enigma_OBJECTS = $(am_enigma_OBJECTS)
- @MINGW32_TRUE@am__DEPENDENCIES_1 = enigma_ico.o
- enigma_DEPENDENCIES = $(top_builddir)/lib-src/enigma-core/libecl.a \
--	$(top_builddir)/lib-src/lua/liblua.a \
--	$(top_builddir)/lib-src/enet/libenet.a \
- 	$(top_builddir)/lib-src/oxydlib/liboxyd.a \
- 	$(top_builddir)/lib-src/zipios++/src/libzipios.a \
- 	$(am__DEPENDENCIES_1)
-@@ -446,8 +444,7 @@ enigma_SOURCES = \
- enigma_LDADD = \
- 	@LIBINTL@ \
- 	$(top_builddir)/lib-src/enigma-core/libecl.a \
--	$(top_builddir)/lib-src/lua/liblua.a \
--	$(top_builddir)/lib-src/enet/libenet.a \
-+	-llua -ltolua++ -lenet \
- 	$(top_builddir)/lib-src/oxydlib/liboxyd.a \
- 	$(top_builddir)/lib-src/zipios++/src/libzipios.a \
- 	-lz \
diff --git a/games/enigma/files/patch-src-client.cc b/games/enigma/files/patch-src-client.cc
deleted file mode 100644
index 94a4e7150f23..000000000000
--- a/games/enigma/files/patch-src-client.cc
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/client.cc.orig	2011-11-07 19:49:08.000000000 +0100
-+++ src/client.cc	2011-11-07 19:53:20.000000000 +0100
-@@ -128,6 +128,9 @@
- 
-     m_network_host = enet_host_create (NULL,
-                                        1 /* only allow 1 outgoing connection */,
-+#if ENET_VERSION > 130
-+                                       0,
-+#endif
-                                        57600 / 8 /* 56K modem with 56 Kbps downstream bandwidth */,
-                                        14400 / 8 /* 56K modem with 14 Kbps upstream bandwidth */);
- 
-@@ -148,8 +151,11 @@
-     sv_address.port = 12345;
- 
-     /* Initiate the connection, allocating the two channels 0 and 1. */
-+#if ENET_VERSION > 130
-+    m_server = enet_host_connect (m_network_host, &sv_address, 2, 0);
-+#else
-     m_server = enet_host_connect (m_network_host, &sv_address, 2);    
--    
-+#endif    
-     if (m_server == NULL) {
-        fprintf (stderr, 
-                 "No available peers for initiating an ENet connection.\n");
diff --git a/games/enigma/files/patch-src-lua.cc b/games/enigma/files/patch-src-lua.cc
deleted file mode 100644
index c123e24c62af..000000000000
--- a/games/enigma/files/patch-src-lua.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/lua.cc.orig	2007-09-08 16:20:02.000000000 +0400
-+++ src/lua.cc	2013-09-14 02:32:22.905227099 +0400
-@@ -171,7 +171,7 @@
-     if (lua_isnil(L,idx))
-         return 0;
- 
--    if (!is_object(L,idx)) {
-+    if (!::is_object(L,idx)) {
-         throwLuaError(L, "Cannot convert type to an Object");
-         return 0;
-     }
-@@ -294,7 +294,7 @@
- 
-     if (lua_isnil(L, 3))
-         fl = 0;
--    else if (is_object(L,3)) {
-+    else if (::is_object(L,3)) {
-         fl = static_cast<Floor*>(*(static_cast<void**> (lua_touserdata(L,3))));
-     	if( ! fl)
- 	    throwLuaError(L, "object is no valid floor");
diff --git a/games/enigma/files/patch-src-netgame.cc b/games/enigma/files/patch-src-netgame.cc
deleted file mode 100644
index 0301a3c6963c..000000000000
--- a/games/enigma/files/patch-src-netgame.cc
+++ /dev/null
@@ -1,38 +0,0 @@
---- src/netgame.cc.orig	2011-11-07 19:55:38.000000000 +0100
-+++ src/netgame.cc	2011-11-07 19:59:07.000000000 +0100
-@@ -154,8 +154,11 @@
- 
-     network_address.host = ENET_HOST_ANY;
-     network_address.port = 12345;
--
-+#if ENET_VERSION > 130
-+    network_host = enet_host_create (&network_address, 1, 0, 0, 0);
-+#else
-     network_host = enet_host_create (&network_address, 1, 0, 0);
-+#endif
-     if (network_host == NULL) {
-         fprintf (stderr, 
-                  "SV: An error occurred while trying to create an ENet server host.\n");
-@@ -240,6 +243,9 @@
-     ENetHost *m_network_host;
-     m_network_host = enet_host_create (NULL,
-                                        1 /* only allow 1 outgoing connection */,
-+#if ENET_VERSION > 130
-+                                       0,
-+#endif
-                                        57600 / 8 /* 56K modem with 56 Kbps downstream bandwidth */,
-                                        14400 / 8 /* 56K modem with 14 Kbps upstream bandwidth */);
- 
-@@ -260,8 +266,11 @@
- 
-     /* Initiate the connection, allocating the two channels 0 and 1. */
-     int numchannels = 2;
-+#if ENET_VERSION > 130
-+    m_server = enet_host_connect (m_network_host, &sv_address, numchannels, 0);
-+#else
-     m_server = enet_host_connect (m_network_host, &sv_address, numchannels);
--    
-+#endif
-     if (m_server == NULL) {
-         fprintf (stderr, 
-                  "CL: No available peers for initiating an ENet connection.\n");
diff --git a/games/enigma/files/patch-src-oxyd.cc b/games/enigma/files/patch-src-oxyd.cc
deleted file mode 100644
index 2efd9145949d..000000000000
--- a/games/enigma/files/patch-src-oxyd.cc
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/oxyd.cc.orig	2007-09-08 16:20:02.000000000 +0400
-+++ src/oxyd.cc	2013-08-07 20:36:58.150878990 +0400
-@@ -130,7 +130,7 @@
-         }
-     }
- 
--    GridLoc to_gridloc (const SignalLocation &a)
-+    GridLoc signal_to_gridloc (const SignalLocation &a)
-     {
-         assert (a.getGridType() >= GridType_First &&
-                 a.getGridType() <= GridType_Last);
-@@ -644,8 +644,8 @@
-         int nrec = level.getNumRecipients(sender);
-         for (int irec=0; irec<nrec; ++irec) {
-             SignalLocation recipient = level.getRecipient(sender, irec);
--            GridLoc src = to_gridloc(sender);
--            GridLoc dst = to_gridloc(recipient);
-+            GridLoc src = signal_to_gridloc(sender);
-+            GridLoc dst = signal_to_gridloc(recipient);
-             world::AddSignal (src, dst, "signal");
-         }
-     }
diff --git a/games/enigma/files/patch-src_items_Meditation.cc b/games/enigma/files/patch-src_items_Meditation.cc
new file mode 100644
index 000000000000..71d2f240ae07
--- /dev/null
+++ b/games/enigma/files/patch-src_items_Meditation.cc
@@ -0,0 +1,11 @@
+--- src/items/Meditation.cc.orig	2014-12-19 21:24:33 UTC
++++ src/items/Meditation.cc
+@@ -27,7 +27,7 @@ namespace enigma {
+ 
+     Meditation::Meditation(int initState) {
+         state = initState;
+-        //whiteball = NULL;
++        whiteball = NULL;
+     }
+ 
+     std::string Meditation::getClass() const {
diff --git a/games/enigma/files/patch-xerces-3 b/games/enigma/files/patch-xerces-3
deleted file mode 100644
index 4cfde8aaff80..000000000000
--- a/games/enigma/files/patch-xerces-3
+++ /dev/null
@@ -1,64 +0,0 @@
---- 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