Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=imgrebuild.git;a=commitdiff;h=3695a6f2c545aaac77225247a1b6347c8115bfe8
commit 3695a6f2c545aaac77225247a1b6347c8115bfe8 Author: bouleetbil <bouleet...@frogdev.info> Date: Fri Apr 23 10:17:32 2010 +0000 pilot-link-0.12.5-2-i686 *rebuild with new libs. diff --git a/source/lib/pilot-link/FrugalBuild b/source/lib/pilot-link/FrugalBuild index ead8369..5cda58e 100644 --- a/source/lib/pilot-link/FrugalBuild +++ b/source/lib/pilot-link/FrugalBuild @@ -4,16 +4,17 @@ pkgname=pilot-link pkgver=0.12.5 -pkgrel=1 +pkgrel=2 pkgdesc="A suite of tools for connecting to PalmOS handheld devices" url="http://www.pilot-link.org/"; groups=('lib') archs=('i686' 'x86_64' 'ppc') -depends=('popt' 'libpng' 'readline' 'libusb' 'bluez>=4.61') +depends=('popt' 'libpng>=1.4.1' 'readline' 'libusb' 'bluez>=4.61') makedepends=('python' 'perl') up2date="lynx -dump http://www.pilot-link.org/|grep -om1 'pilot-link-\(.*\).tar.bz2'|sed 's/.*k-\(.*\).t.*/\1/'" -source=(http://downloads.pilot-link.org/$pkgname-$pkgver.tar.bz2) -sha1sums=('b822466333ba58bbb32d7cfe5c547f4e7a78bdee') +source=(http://downloads.pilot-link.org/$pkgname-$pkgver.tar.bz2 libpng14.diff) +sha1sums=('b822466333ba58bbb32d7cfe5c547f4e7a78bdee' \ + '4395981cb3b0cd2489e017b5861c95ca9c20e02d') build() { diff --git a/source/lib/pilot-link/libpng14.diff b/source/lib/pilot-link/libpng14.diff new file mode 100644 index 0000000..53d4f60 --- /dev/null +++ b/source/lib/pilot-link/libpng14.diff @@ -0,0 +1,99 @@ +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; + _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
