From eeccbbdf2765c6afa47f04859b7baac067864d4f Mon Sep 17 00:00:00 2001 From: tnut Date: Fri, 30 Apr 2010 21:57:07 +0200 Subject: maj pilot-link#0.12.5-1 --- extra/pilot-link/.footprint | 3 + extra/pilot-link/.md5sum | 3 +- extra/pilot-link/Pkgfile | 8 ++- extra/pilot-link/pilot-link-png14.patch | 100 ++++++++++++++++++++++++++++++++ 4 files changed, 110 insertions(+), 4 deletions(-) create mode 100644 extra/pilot-link/pilot-link-png14.patch diff --git a/extra/pilot-link/.footprint b/extra/pilot-link/.footprint index e0d73e234..62774edc7 100644 --- a/extra/pilot-link/.footprint +++ b/extra/pilot-link/.footprint @@ -43,8 +43,10 @@ drwxr-xr-x root/root usr/include/ -rw-r--r-- root/root usr/include/pi-address.h -rw-r--r-- root/root usr/include/pi-appinfo.h -rw-r--r-- root/root usr/include/pi-args.h +-rw-r--r-- root/root usr/include/pi-blob.h -rw-r--r-- root/root usr/include/pi-bluetooth.h -rw-r--r-- root/root usr/include/pi-buffer.h +-rw-r--r-- root/root usr/include/pi-calendar.h -rw-r--r-- root/root usr/include/pi-cmp.h -rw-r--r-- root/root usr/include/pi-contact.h -rw-r--r-- root/root usr/include/pi-datebook.h @@ -57,6 +59,7 @@ drwxr-xr-x root/root usr/include/ -rw-r--r-- root/root usr/include/pi-header.h -rw-r--r-- root/root usr/include/pi-hinote.h -rw-r--r-- root/root usr/include/pi-inet.h +-rw-r--r-- root/root usr/include/pi-location.h -rw-r--r-- root/root usr/include/pi-macros.h -rw-r--r-- root/root usr/include/pi-mail.h -rw-r--r-- root/root usr/include/pi-md5.h diff --git a/extra/pilot-link/.md5sum b/extra/pilot-link/.md5sum index 73a4ead8d..447d86823 100644 --- a/extra/pilot-link/.md5sum +++ b/extra/pilot-link/.md5sum @@ -1 +1,2 @@ -257124484d50552679c53cae8e118aa3 pilot-link-0.12.3.tar.bz2 +568c55bf504b044f6fbd50baa407c990 pilot-link-0.12.5.tar.bz2 +a21a2eeb01544a8a261a75e64a3120c3 pilot-link-png14.patch diff --git a/extra/pilot-link/Pkgfile b/extra/pilot-link/Pkgfile index 71de4b6b1..3ce0d5e4f 100644 --- a/extra/pilot-link/Pkgfile +++ b/extra/pilot-link/Pkgfile @@ -2,15 +2,17 @@ # URL: http://www.pilot-link.org/ # Maintainer: NutyX core team # Packager: thierryn1 at hispeed dot ch -# Depends on : +# Depends on: libusb, libpng, popt name=pilot-link -version=0.12.3 +version=0.12.5 release=1 -source=(http://downloads.pilot-link.org/$name-$version.tar.bz2) +source=(http://downloads.pilot-link.org/$name-$version.tar.bz2\ + pilot-link-png14.patch) build () { cd $name-$version +patch -Np1 -i ../pilot-link-png14.patch ./configure --prefix=/usr \ --enable-conduits \ --enable-libusb \ diff --git a/extra/pilot-link/pilot-link-png14.patch b/extra/pilot-link/pilot-link-png14.patch new file mode 100644 index 000000000..9d753332e --- /dev/null +++ b/extra/pilot-link/pilot-link-png14.patch @@ -0,0 +1,100 @@ +diff -ru pilot-link-0.12.4/src/pilot-read-notepad.c pilot-link-0.12.4.png14/src/pilot-read-notepad.c +--- pilot-link-0.12.4/src/pilot-read-notepad.c 2007-02-05 00:06:02.000000000 +0100 ++++ pilot-link-0.12.4.png14/src/pilot-read-notepad.c 2010-01-17 15:04:33.000000000 +0100 +@@ -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 -ru pilot-link-0.12.4/src/pilot-read-palmpix.c pilot-link-0.12.4.png14/src/pilot-read-palmpix.c +--- pilot-link-0.12.4/src/pilot-read-palmpix.c 2007-02-05 00:06:03.000000000 +0100 ++++ pilot-link-0.12.4.png14/src/pilot-read-palmpix.c 2010-01-17 15:03:20.000000000 +0100 +@@ -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 -ru pilot-link-0.12.4/src/pilot-read-screenshot.c pilot-link-0.12.4.png14/src/pilot-read-screenshot.c +--- pilot-link-0.12.4/src/pilot-read-screenshot.c 2006-11-02 15:54:31.000000000 +0100 ++++ pilot-link-0.12.4.png14/src/pilot-read-screenshot.c 2010-01-17 15:03:52.000000000 +0100 +@@ -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 -ru pilot-link-0.12.4/src/pilot-read-veo.c pilot-link-0.12.4.png14/src/pilot-read-veo.c +--- pilot-link-0.12.4/src/pilot-read-veo.c 2007-02-05 00:06:03.000000000 +0100 ++++ pilot-link-0.12.4.png14/src/pilot-read-veo.c 2010-01-17 15:04:14.000000000 +0100 +@@ -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; -- cgit v1.2.3-70-g09d2