[raidem] Inlcude zlib.h since png.h no longer does
Bruno Wolff III
bruno at fedoraproject.org
Sun Nov 6 15:39:41 UTC 2011
commit 8fbcf22089604a6d3a438abb0e6b6844906946a0
Author: Bruno Wolff III <bruno at wolff.to>
Date: Sun Nov 6 09:04:17 2011 -0600
Inlcude zlib.h since png.h no longer does
raidem-libpng15.patch | 10 ++++++++++
raidem.spec | 4 +++-
2 files changed, 13 insertions(+), 1 deletions(-)
---
diff --git a/raidem-libpng15.patch b/raidem-libpng15.patch
new file mode 100644
index 0000000..90677a4
--- /dev/null
+++ b/raidem-libpng15.patch
@@ -0,0 +1,10 @@
+--- lib/loadpng/loadpng.c.orig 2011-11-06 09:00:39.113061546 -0600
++++ lib/loadpng/loadpng.c 2011-11-06 09:01:08.770830874 -0600
+@@ -14,6 +14,7 @@
+ */
+
+
++#include <zlib.h>
+ #include <png.h>
+ #include <allegro.h>
+ #include <allegro/internal/aintern.h>
diff --git a/raidem.spec b/raidem.spec
index b318013..e634c0c 100644
--- a/raidem.spec
+++ b/raidem.spec
@@ -12,6 +12,7 @@ Source1: raidem.png
Source2: raidem.desktop
Patch0: raidem-0.3.1-syslibs.patch
Patch1: raidem-0.3.1-zziplib.patch
+Patch2: raidem-libpng15.patch
BuildRequires: gcc-objc glyph-keeper-allegro-devel freetype-devel adime-devel
BuildRequires: zziplib-devel libpng-devel AllegroOGG-devel
BuildRequires: automake desktop-file-utils
@@ -30,6 +31,7 @@ fun.
%setup -q -n %{name}-%{version}-src
%patch0 -p1 -z .syslibs
%patch1 -p1
+%patch2
# remove all included system libs, to avoid using the included system headers.
mv lib/loadpng .
rm -fr lib/*
@@ -86,7 +88,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
* Sun Nov 06 2011 Bruno Wolff III <bruno at wolff.to> - 0.3.1-17
-- Rebuild for libpng 1.5
+- Include zlib.h since png.h no longer does for libpng 1.5
* Sat Jul 16 2011 Hans de Goede <hdegoede at redhat.com> - 0.3.1-16
- Fix zziplib zzip_freopen abuse (fixes crash on startup, rhbz#710190)
More information about the scm-commits
mailing list