7 files changed, 50 insertions, 50 deletions

diff --git a/games/scorched3d/files/patch-configure-al.m4 b/games/scorched3d/files/patch-configure-al.m4
index 73c5ca668787..76adaf5a2820 100644
--- a/games/scorched3d/files/patch-configure-al.m4
+++ b/games/scorched3d/files/patch-configure-al.m4
@@ -1,5 +1,5 @@
---- configure-al.m4.orig	2011-12-31 23:51:36.000000000 +0900
-+++ configure-al.m4	2012-03-08 02:09:57.000000000 +0900
+--- configure-al.m4.orig	2011-12-31 14:51:36 UTC
++++ configure-al.m4
 @@ -1,118 +1,8 @@
  dnl Checking for OpenAL
 -AC_ARG_WITH([openal-static],
diff --git a/games/scorched3d/files/patch-src_client_GLEXT_GLFont2dFreeType.h b/games/scorched3d/files/patch-src_client_GLEXT_GLFont2dFreeType.h
index 5bcad3c1b8ff..b8fe14351be9 100644
--- a/games/scorched3d/files/patch-src_client_GLEXT_GLFont2dFreeType.h
+++ b/games/scorched3d/files/patch-src_client_GLEXT_GLFont2dFreeType.h
@@ -1,5 +1,5 @@
---- src/client/GLEXT/GLFont2dFreeType.h.orig	2013-12-17 09:58:11.000000000 +0100
-+++ src/client/GLEXT/GLFont2dFreeType.h	2013-12-17 09:59:18.000000000 +0100
+--- src/client/GLEXT/GLFont2dFreeType.h.orig	2016-06-20 14:16:37 UTC
++++ src/client/GLEXT/GLFont2dFreeType.h
 @@ -23,10 +23,10 @@
  
  #include <GLEXT/GLFont2dStorage.h>
diff --git a/games/scorched3d/files/patch-src__client__client__LoadPNG.cpp b/games/scorched3d/files/patch-src_client_client_LoadPNG.cpp
index 8db4ee8ad643..138a50aead91 100644
--- a/games/scorched3d/files/patch-src__client__client__LoadPNG.cpp
+++ b/games/scorched3d/files/patch-src_client_client_LoadPNG.cpp
@@ -1,6 +1,6 @@
---- src/client/client/LoadPNG.cpp.orig	2010-08-16 08:26:36.000000000 +0900
-+++ src/client/client/LoadPNG.cpp	2012-03-07 19:25:24.000000000 +0900
-@@ -28,6 +28,8 @@
+--- src/client/client/LoadPNG.cpp.orig	2016-06-20 14:16:37 UTC
++++ src/client/client/LoadPNG.cpp
+@@ -28,6 +28,8 @@ SDL_Surface *EXT_LoadPNG_RW(SDL_RWops *s
  	int row, i;
  	volatile int ckey = -1;
  	png_color_16 *transv;
@@ -9,7 +9,7 @@
  
  	if ( !src ) {
  		/* The error message has been set in SDL_RWFromFile */
-@@ -58,7 +60,7 @@
+@@ -58,7 +60,7 @@ SDL_Surface *EXT_LoadPNG_RW(SDL_RWops *s
  	 * the normal method of doing things with libpng).  REQUIRED unless you
  	 * set up your own error handlers in png_create_read_struct() earlier.
  	 */
@@ -18,7 +18,7 @@
  		error = "Error reading the PNG file.";
  		goto done;
  	}
-@@ -127,9 +129,9 @@
+@@ -127,9 +129,9 @@ SDL_Surface *EXT_LoadPNG_RW(SDL_RWops *s
  			Rmask = 0x000000FF;
  			Gmask = 0x0000FF00;
  			Bmask = 0x00FF0000;
@@ -30,7 +30,7 @@
  			Rmask = 0xFF000000 >> s;
  			Gmask = 0x00FF0000 >> s;
  			Bmask = 0x0000FF00 >> s;
-@@ -137,7 +139,7 @@
+@@ -137,7 +139,7 @@ SDL_Surface *EXT_LoadPNG_RW(SDL_RWops *s
  		}
  	}
  	surface = SDL_AllocSurface(SDL_SWSURFACE, width, height,
@@ -39,7 +39,7 @@
  	if ( surface == NULL ) {
  		error = "Out of memory";
  		goto done;
-@@ -185,12 +187,15 @@
+@@ -185,12 +187,15 @@ SDL_Surface *EXT_LoadPNG_RW(SDL_RWops *s
  		    palette->colors[i].g = i;
  		    palette->colors[i].b = i;
  		}
diff --git a/games/scorched3d/files/patch-src-client-client-SecureID.cpp b/games/scorched3d/files/patch-src_client_client_SecureID.cpp
index 5701b71b4221..b1549c629724 100644
--- a/games/scorched3d/files/patch-src-client-client-SecureID.cpp
+++ b/games/scorched3d/files/patch-src_client_client_SecureID.cpp
@@ -1,9 +1,9 @@
---- src/client/client/SecureID.cpp.orig	2008-03-03 00:47:36.000000000 +0600
-+++ src/client/client/SecureID.cpp	2009-09-29 14:13:58.000000000 +0700
-@@ -34,6 +34,47 @@
- 	return "0:0:0:0:0:0";

- }

- 

+--- src/client/client/SecureID.cpp.orig	2016-06-20 14:16:37 UTC
++++ src/client/client/SecureID.cpp
+@@ -71,6 +71,47 @@ std::string SecureID::GetPrivateKey(void
+ 	return result;
+ }
+ 
 +#elif defined(__FreeBSD__)
 +
 +#include <sys/types.h>
@@ -45,6 +45,6 @@
 +       return Key;
 +}
 +
- #else

- 

- #include <sys/ioctl.h>

+ #else
+ 
+ #include <sys/ioctl.h>
diff --git a/games/scorched3d/files/patch-src__common__image__ImagePngFactory.cpp b/games/scorched3d/files/patch-src_common_image_ImagePngFactory.cpp
index 43ad7a9ca254..1afd54ffe0da 100644
--- a/games/scorched3d/files/patch-src__common__image__ImagePngFactory.cpp
+++ b/games/scorched3d/files/patch-src_common_image_ImagePngFactory.cpp
@@ -1,11 +1,11 @@
---- src/common/image/ImagePngFactory.cpp.orig	2012-01-10 09:52:15.000000000 +0900
-+++ src/common/image/ImagePngFactory.cpp	2012-03-07 18:31:12.000000000 +0900
-@@ -62,7 +62,7 @@
- 

- static void user_png_error(png_structp png_ptr, png_const_charp msg) 

- {

--	longjmp(png_ptr->jmpbuf,1);

-+	longjmp(png_jmpbuf(png_ptr),1);

- }

- 

- static void user_png_warning(png_structp png_ptr, png_const_charp msg) 

+--- src/common/image/ImagePngFactory.cpp.orig	2016-06-20 14:16:37 UTC
++++ src/common/image/ImagePngFactory.cpp
+@@ -62,7 +62,7 @@ struct user_read_struct
+ 
+ static void user_png_error(png_structp png_ptr, png_const_charp msg) 
+ {
+-	longjmp(png_ptr->jmpbuf,1);
++	longjmp(png_jmpbuf(png_ptr),1);
+ }
+ 
+ static void user_png_warning(png_structp png_ptr, png_const_charp msg) 
diff --git a/games/scorched3d/files/patch-src__common__porting__windows.h b/games/scorched3d/files/patch-src_common_porting_windows.h
index 7c591c924c22..35521a22ba48 100644
--- a/games/scorched3d/files/patch-src__common__porting__windows.h
+++ b/games/scorched3d/files/patch-src_common_porting_windows.h
@@ -1,18 +1,18 @@
---- src/common/porting/windows.h.orig	2008-03-03 03:47:36.000000000 +0900
-+++ src/common/porting/windows.h	2012-03-07 18:29:31.000000000 +0900
+--- src/common/porting/windows.h.orig	2016-06-20 14:16:37 UTC
++++ src/common/porting/windows.h
 @@ -9,6 +9,7 @@
- #include <ctype.h>

- #include <common/Defines.h>

- 

-+#if defined(_WIN32)

- typedef char * 		LPSTR;

- typedef const char *	LPCTSTR;

- typedef unsigned int 	DWORD;

-@@ -27,6 +28,7 @@
- typedef int 	LRESULT;

- typedef void *	HDC;

- typedef void *  HGLRC;

-+#endif

- 

- #define _strnicmp(a,b,c)	strncasecmp(a,b,c)

- #define stricmp(a,b)		strcasecmp(a,b)

+ #include <ctype.h>
+ #include <common/Defines.h>
+ 
++#if defined(_WIN32)
+ typedef char * 		LPSTR;
+ typedef const char *	LPCTSTR;
+ typedef unsigned int 	DWORD;
+@@ -27,6 +28,7 @@ typedef int 	LPARAM;
+ typedef int 	LRESULT;
+ typedef void *	HDC;
+ typedef void *  HGLRC;
++#endif
+ 
+ #define _strnicmp(a,b,c)	strncasecmp(a,b,c)
+ #define stricmp(a,b)		strcasecmp(a,b)
diff --git a/games/scorched3d/files/patch-src_launcher_wxdialogs_TrueTypeFont.h b/games/scorched3d/files/patch-src_launcher_wxdialogs_TrueTypeFont.h
index d3f212392a55..1c6f5fad2761 100644
--- a/games/scorched3d/files/patch-src_launcher_wxdialogs_TrueTypeFont.h
+++ b/games/scorched3d/files/patch-src_launcher_wxdialogs_TrueTypeFont.h
@@ -1,5 +1,5 @@
---- src/launcher/wxdialogs/TrueTypeFont.h.orig	2013-12-17 10:01:02.000000000 +0100
-+++ src/launcher/wxdialogs/TrueTypeFont.h	2013-12-17 10:01:16.000000000 +0100
+--- src/launcher/wxdialogs/TrueTypeFont.h.orig	2016-06-20 14:16:37 UTC
++++ src/launcher/wxdialogs/TrueTypeFont.h
 @@ -25,10 +25,10 @@
  #include <wx/image.h>
  #include <ft2build.h>