From e81462ff04657b6db9321b4211f995e7a0cab313 Mon Sep 17 00:00:00 2001
From: Bruno Wolff III <bruno@wolff.to>
Date: Apr 05 2012 03:53:32 +0000
Subject: Remove another upstreamed patch


---

diff --git a/vegastrike-libpng15.patch b/vegastrike-libpng15.patch
deleted file mode 100644
index ae02bdf..0000000
--- a/vegastrike-libpng15.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gfx/vsimage.cpp.libpng	2011-11-06 11:52:55.177722216 -0600
-+++ src/gfx/vsimage.cpp	2011-11-06 11:54:50.967438468 -0600
-@@ -867,7 +867,7 @@
-         png_destroy_write_struct( &png_ptr, (png_infopp) NULL );
-         return BadFormat;
-     }
--    if ( setjmp( png_ptr->jmpbuf ) ) {
-+    if ( setjmp( png_jmpbuf(png_ptr) ) ) {
-         png_destroy_write_struct( &png_ptr, &info_ptr );
-         return BadFormat;
-     }
diff --git a/vegastrike.spec b/vegastrike.spec
index 5105a48..2b70351 100644
--- a/vegastrike.spec
+++ b/vegastrike.spec
@@ -21,7 +21,6 @@ Patch6:         vegastrike-0.5.1-sys-python.patch
 Patch8:         vegastrike-0.5.1-gcc44.patch
 Patch9:         vegastrike-0.5.0-glext.patch
 Patch12:        vegastrike-0.5.1-boost146.patch
-Patch13:        vegastrike-libpng15.patch
 Patch14:        vegastrike-0.5.1-gcc47.patch
 BuildRequires:  libGLU-devel freeglut-devel libXi-devel libXmu-devel gtk2-devel
 BuildRequires:  libjpeg-devel libpng-devel boost-devel expat-devel python-devel
@@ -49,7 +48,6 @@ Yet danger lurks in the space beyond.
 %patch8 -p0
 %patch9 -p1
 %patch12 -p0
-%patch13 -z libpng
 %patch14 -p1
 iconv -f ISO-8859-1 -t UTF-8 README > README.tmp
 touch -r README README.tmp