[fenix] 120/127: Fix undefined reference to `freee' caused by libpng1.5 patch
Peter Pentchev
roam at ringlet.net
Thu Dec 17 14:39:42 UTC 2015
This is an automated email from the git hooks/post-receive script.
roam-guest pushed a commit to branch master
in repository fenix.
commit 66908d8afb01da8a5533006da7feea67745253e2
Author: Vincent Cheng <vcheng at debian.org>
Date: Mon Mar 31 07:34:45 2014 +0000
Fix undefined reference to `freee' caused by libpng1.5 patch
---
debian/patches/fix_ftbfs_libpng1.5.patch | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/debian/patches/fix_ftbfs_libpng1.5.patch b/debian/patches/fix_ftbfs_libpng1.5.patch
index c4ab47c..1c8ddab 100644
--- a/debian/patches/fix_ftbfs_libpng1.5.patch
+++ b/debian/patches/fix_ftbfs_libpng1.5.patch
@@ -70,7 +70,7 @@
+ png_free(png_ptr, palette);
+ palette = NULL;
+#else
-+ freee(info_ptr->palette) ;
++ free(info_ptr->palette) ;
info_ptr->palette = NULL ;
+#endif
}
@@ -93,21 +93,21 @@
@@ -33,6 +33,7 @@
#define _(String) String
#endif
-
+
+#include <zlib.h>
- #include <png.h>
-
- #define MAXPATH 1024
+ #include <png.h>
+
+ #define MAXPATH 1024
@@ -187,8 +188,11 @@ MAP * png_load (const char * filename)
- if (!info_ptr || !end_info) fatal_error (_("Error loading PNG file")) ;
-
- /* Rutina de error */
--
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
+ if (!info_ptr || !end_info) fatal_error (_("Error loading PNG file")) ;
+
+ /* Rutina de error */
+-
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
+ if (setjmp(png_jmpbuf(png_ptr)))
+#else
- if (setjmp (png_ptr->jmpbuf))
+ if (setjmp (png_ptr->jmpbuf))
+#endif
- {
- png_destroy_read_struct (&png_ptr, &info_ptr, &end_info) ;
- fclose (png) ;
+ {
+ png_destroy_read_struct (&png_ptr, &info_ptr, &end_info) ;
+ fclose (png) ;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/fenix.git
More information about the Pkg-games-commits
mailing list