diff options
Diffstat (limited to 'debian/pilot-link/pilot-link-0.12.5-dfsg/debian/patches/33-new-png-lib')
| -rw-r--r-- | debian/pilot-link/pilot-link-0.12.5-dfsg/debian/patches/33-new-png-lib | 97 |
1 files changed, 97 insertions, 0 deletions
diff --git a/debian/pilot-link/pilot-link-0.12.5-dfsg/debian/patches/33-new-png-lib b/debian/pilot-link/pilot-link-0.12.5-dfsg/debian/patches/33-new-png-lib new file mode 100644 index 00000000..e16d2b04 --- /dev/null +++ b/debian/pilot-link/pilot-link-0.12.5-dfsg/debian/patches/33-new-png-lib @@ -0,0 +1,97 @@ +Description: Fix compilation issue with a newer libpng-dev +From: Andrei V. Lavreniyuk <andy.lavr@reactor-xg.kiev.ua> +Origin: http://www.freebsd.org/cgi/query-pr.cgi?pr=145163 +Bug-Debian: http://bugs.debian.org/636758 + +--- a/src/pilot-read-notepad.c ++++ b/src/pilot-read-notepad.c +@@ -39,10 +39,6 @@ + + #ifdef HAVE_PNG + #include "png.h" +-#if (PNG_LIBPNG_VER < 10201) +- #define png_voidp_NULL (png_voidp)NULL +- #define png_error_ptr_NULL (png_error_ptr)NULL +-#endif + #endif + + const char *progname; +@@ -166,8 +162,7 @@ + width = n->body.width + 8; + + png_ptr = png_create_write_struct +- ( PNG_LIBPNG_VER_STRING, png_voidp_NULL, +- png_error_ptr_NULL, png_error_ptr_NULL); ++ ( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); + + if(!png_ptr) + return; +--- a/src/pilot-read-palmpix.c ++++ b/src/pilot-read-palmpix.c +@@ -42,10 +42,6 @@ + + #ifdef HAVE_PNG + #include "png.h" +-#if (PNG_LIBPNG_VER < 10201) +- #define png_voidp_NULL (png_voidp)NULL +- #define png_error_ptr_NULL (png_error_ptr)NULL +-#endif + #endif + + const char *progname; +@@ -223,8 +219,7 @@ + png_infop info_ptr; + + png_ptr = png_create_write_struct +- ( PNG_LIBPNG_VER_STRING, png_voidp_NULL, +- png_error_ptr_NULL, png_error_ptr_NULL); ++ ( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); + + if(!png_ptr) + return; +--- a/src/pilot-read-screenshot.c ++++ b/src/pilot-read-screenshot.c +@@ -40,10 +40,6 @@ + + #ifdef HAVE_PNG + # include "png.h" +-# if (PNG_LIBPNG_VER < 10201) +-# define png_voidp_NULL (png_voidp)NULL +-# define png_error_ptr_NULL (png_error_ptr)NULL +-# endif + #endif + + #define pi_mktag(c1,c2,c3,c4) (((c1)<<24)|((c2)<<16)|((c3)<<8)|(c4)) +@@ -87,8 +83,7 @@ + gray_buf = malloc( state->w ); + + png_ptr = png_create_write_struct +- (PNG_LIBPNG_VER_STRING, png_voidp_NULL, +- png_error_ptr_NULL, png_error_ptr_NULL); ++ (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); + + if (!png_ptr) + return; +--- a/src/pilot-read-veo.c ++++ b/src/pilot-read-veo.c +@@ -41,10 +41,6 @@ + + #ifdef HAVE_PNG + # include "png.h" +-# if (PNG_LIBPNG_VER < 10201) +-# define png_voidp_NULL (png_voidp)NULL +-# define png_error_ptr_NULL (png_error_ptr)NULL +-# endif + #endif + + #define pi_mktag(c1,c2,c3,c4) (((c1)<<24)|((c2)<<16)|((c3)<<8)|(c4)) +@@ -856,8 +852,7 @@ + png_infop info_ptr; + + png_ptr = png_create_write_struct +- (PNG_LIBPNG_VER_STRING, png_voidp_NULL, +- png_error_ptr_NULL, png_error_ptr_NULL); ++ (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); + + if (!png_ptr) + return; |