diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2010-03-11 13:19:44 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-03-11 13:19:44 +0000 |
commit | e46b5cacfe0d9ef94624d34fbb57bfaae0fcdf73 (patch) | |
tree | 2abda919bf96487e2ebe9acc790bb88ae849727a /app-pda/pilot-link/files | |
parent | Add a patch to fix fcrontab -u systab when using PAM. Thanks to Dmitry Karasi... (diff) | |
download | gentoo-2-e46b5cacfe0d9ef94624d34fbb57bfaae0fcdf73.tar.gz gentoo-2-e46b5cacfe0d9ef94624d34fbb57bfaae0fcdf73.tar.bz2 gentoo-2-e46b5cacfe0d9ef94624d34fbb57bfaae0fcdf73.zip |
Fix building with libpng14.
(Portage version: 2.2_rc66/cvs/Linux x86_64)
Diffstat (limited to 'app-pda/pilot-link/files')
-rw-r--r-- | app-pda/pilot-link/files/pilot-link-0.12.3-libpng14.patch | 98 |
1 files changed, 98 insertions, 0 deletions
diff --git a/app-pda/pilot-link/files/pilot-link-0.12.3-libpng14.patch b/app-pda/pilot-link/files/pilot-link-0.12.3-libpng14.patch new file mode 100644 index 000000000000..14b8c16ac3b1 --- /dev/null +++ b/app-pda/pilot-link/files/pilot-link-0.12.3-libpng14.patch @@ -0,0 +1,98 @@ +http://repos.archlinux.org/wsvn/packages/pilot-link/trunk/pilot-link-png14.patch + +--- src/pilot-read-notepad.c ++++ 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,8 @@ + 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; +--- src/pilot-read-palmpix.c ++++ 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,8 @@ + 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; +--- src/pilot-read-screenshot.c ++++ 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,8 @@ + 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; +--- src/pilot-read-veo.c ++++ 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,8 @@ + 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; |