From 3ba62db8f21f776bcbf40928e00272da78dc43ac Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Sun, 25 Sep 2011 20:52:41 +0000
Subject: Pilot error, commit the patches, not the diffs against the CVS tree.

---
 ...h-Source_Files-Network-Metaserver-network_metaserver.h | 12 ++++++++++++
 ...rce_Files-Network-Metaserver-network_metaserver.h.diff | 15 ---------------
 .../patches/patch-Source_Files-RenderOther-IMG_savepng.c  | 12 ++++++++++++
 .../patch-Source_Files-RenderOther-IMG_savepng.c.diff     | 15 ---------------
 4 files changed, 24 insertions(+), 30 deletions(-)
 create mode 100644 games/alephone/patches/patch-Source_Files-Network-Metaserver-network_metaserver.h
 delete mode 100644 games/alephone/patches/patch-Source_Files-Network-Metaserver-network_metaserver.h.diff
 create mode 100644 games/alephone/patches/patch-Source_Files-RenderOther-IMG_savepng.c
 delete mode 100644 games/alephone/patches/patch-Source_Files-RenderOther-IMG_savepng.c.diff

(limited to 'games')

diff --git a/games/alephone/patches/patch-Source_Files-Network-Metaserver-network_metaserver.h b/games/alephone/patches/patch-Source_Files-Network-Metaserver-network_metaserver.h
new file mode 100644
index 00000000000..e583fd5eac3
--- /dev/null
+++ b/games/alephone/patches/patch-Source_Files-Network-Metaserver-network_metaserver.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-Source_Files-Network-Metaserver-network_metaserver.h,v 1.1 2011/09/25 20:52:41 joerg Exp $
+
+--- Source_Files/Network/Metaserver/network_metaserver.h.orig	2011-09-24 20:39:50.000000000 +0000
++++ Source_Files/Network/Metaserver/network_metaserver.h
+@@ -32,6 +32,7 @@
+ #include <map>
+ #include <memory> // auto_ptr
+ #include <set>
++#include <stdexcept>
+ 
+ #include "Logging.h"
+ 
diff --git a/games/alephone/patches/patch-Source_Files-Network-Metaserver-network_metaserver.h.diff b/games/alephone/patches/patch-Source_Files-Network-Metaserver-network_metaserver.h.diff
deleted file mode 100644
index d6d4bd58bdc..00000000000
--- a/games/alephone/patches/patch-Source_Files-Network-Metaserver-network_metaserver.h.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- games/alephone/patches/patch-Source_Files-Network-Metaserver-network_metaserver.h
-+++ games/alephone/patches/patch-Source_Files-Network-Metaserver-network_metaserver.h
-@@ -0,0 +1,12 @@
-+$NetBSD: patch-Source_Files-Network-Metaserver-network_metaserver.h.diff,v 1.1 2011/09/25 19:47:38 joerg Exp $
-+
-+--- Source_Files/Network/Metaserver/network_metaserver.h.orig	2011-09-24 20:39:50.000000000 +0000
-++++ Source_Files/Network/Metaserver/network_metaserver.h
-+@@ -32,6 +32,7 @@
-+ #include <map>
-+ #include <memory> // auto_ptr
-+ #include <set>
-++#include <stdexcept>
-+ 
-+ #include "Logging.h"
-+ 
diff --git a/games/alephone/patches/patch-Source_Files-RenderOther-IMG_savepng.c b/games/alephone/patches/patch-Source_Files-RenderOther-IMG_savepng.c
new file mode 100644
index 00000000000..da5131679fe
--- /dev/null
+++ b/games/alephone/patches/patch-Source_Files-RenderOther-IMG_savepng.c
@@ -0,0 +1,12 @@
+$NetBSD: patch-Source_Files-RenderOther-IMG_savepng.c,v 1.1 2011/09/25 20:52:41 joerg Exp $
+
+--- Source_Files/RenderOther/IMG_savepng.c.orig	2011-09-24 21:23:44.000000000 +0000
++++ Source_Files/RenderOther/IMG_savepng.c
+@@ -29,6 +29,7 @@
+ #include <SDL/SDL.h>
+ #include <SDL/SDL_byteorder.h>
+ #include <png.h>
++#include <zlib.h>
+ #include "IMG_savepng.h"
+ 
+ int IMG_SavePNG(const char *file, SDL_Surface *surf,int compression, struct IMG_PNG_text* text, int num_text){
diff --git a/games/alephone/patches/patch-Source_Files-RenderOther-IMG_savepng.c.diff b/games/alephone/patches/patch-Source_Files-RenderOther-IMG_savepng.c.diff
deleted file mode 100644
index 860397c22af..00000000000
--- a/games/alephone/patches/patch-Source_Files-RenderOther-IMG_savepng.c.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- games/alephone/patches/patch-Source_Files-RenderOther-IMG_savepng.c
-+++ games/alephone/patches/patch-Source_Files-RenderOther-IMG_savepng.c
-@@ -0,0 +1,12 @@
-+$NetBSD: patch-Source_Files-RenderOther-IMG_savepng.c.diff,v 1.1 2011/09/25 19:47:38 joerg Exp $
-+
-+--- Source_Files/RenderOther/IMG_savepng.c.orig	2011-09-24 21:23:44.000000000 +0000
-++++ Source_Files/RenderOther/IMG_savepng.c
-+@@ -29,6 +29,7 @@
-+ #include <SDL/SDL.h>
-+ #include <SDL/SDL_byteorder.h>
-+ #include <png.h>
-++#include <zlib.h>
-+ #include "IMG_savepng.h"
-+ 
-+ int IMG_SavePNG(const char *file, SDL_Surface *surf,int compression, struct IMG_PNG_text* text, int num_text){
-- 
cgit v1.2.3