--- a/ChangeLog	Mon Aug 02 04:56:28 2010 +0000
+++ b/ChangeLog	Tue Aug 03 08:13:03 2010 +0000
@@ -1,12 +1,18 @@
+2010-08-03  Dave Lin  <[email protected]>
+
+	* patches/pilot-link-03-libpng.diff: Added.
+	* base-specs/pilot-link.spec: Add patch to fix build issue 
+	  with the new version of libpng. 
+
+2010-08-02  Dave Lin <[email protected]>
+
+	==== Nevada build 146 ====
+
 2010-08-02  Brian Lu  <[email protected]>
 
 	* base-specs/thunderbird.spec:
 	  Bump to 3.1.1
 
-2010-08-02  Dave Lin <[email protected]>
-
-	==== Nevada build 146 ====
-
 2010-08-02  Elaine Xiong  <[email protected]>
 
 	* base-specs/firefox.spec: Bump to Firefox 3.6.8.

--- a/base-specs/pilot-link.spec	Mon Aug 02 04:56:28 2010 +0000
+++ b/base-specs/pilot-link.spec	Tue Aug 03 08:13:03 2010 +0000
@@ -24,6 +24,8 @@
 Patch1:		pilot-link-01-man.diff
 #date:2008-08-07 owner:halton type:branding
 Patch2:		pilot-link-02-manpages.diff
+#date:2010-08-02 owner:kewang type:bug
+Patch3:		pilot-link-03-libpng.diff
 URL:		http://www.pilot-link.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Autoreqprov:    on
@@ -48,6 +50,7 @@
 %setup -q -n %{name}-%{version}
 %patch1 -p0
 %patch2 -p1
+%patch3 -p1
 
 %build
 %ifos linux

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/pilot-link-03-libpng.diff	Tue Aug 03 08:13:03 2010 +0000
@@ -0,0 +1,100 @@
+diff -ur pilot-link-0.12.4-old/src/pilot-read-notepad.c pilot-link-0.12.4/src/pilot-read-notepad.c
+--- pilot-link-0.12.4-old/src/pilot-read-notepad.c	2007-02-05 07:06:02.000000000 +0800
++++ pilot-link-0.12.4/src/pilot-read-notepad.c	2010-07-30 14:23:24.736922013 +0800
+@@ -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;
+diff -ur pilot-link-0.12.4-old/src/pilot-read-palmpix.c pilot-link-0.12.4/src/pilot-read-palmpix.c
+--- pilot-link-0.12.4-old/src/pilot-read-palmpix.c	2007-02-05 07:06:03.000000000 +0800
++++ pilot-link-0.12.4/src/pilot-read-palmpix.c	2010-07-30 14:26:11.835122751 +0800
+@@ -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;
+diff -ur pilot-link-0.12.4-old/src/pilot-read-screenshot.c pilot-link-0.12.4/src/pilot-read-screenshot.c
+--- pilot-link-0.12.4-old/src/pilot-read-screenshot.c	2006-11-02 22:54:31.000000000 +0800
++++ pilot-link-0.12.4/src/pilot-read-screenshot.c	2010-07-30 14:25:00.792246819 +0800
+@@ -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;
+diff -ur pilot-link-0.12.4-old/src/pilot-read-veo.c pilot-link-0.12.4/src/pilot-read-veo.c
+--- pilot-link-0.12.4-old/src/pilot-read-veo.c	2007-02-05 07:06:03.000000000 +0800
++++ pilot-link-0.12.4/src/pilot-read-veo.c	2010-07-30 14:27:08.042967985 +0800
+@@ -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;