diff options
Diffstat (limited to 'source/l/pilot-link')
| -rwxr-xr-x | source/l/pilot-link/pilot-link.SlackBuild | 32 | ||||
| -rw-r--r-- | source/l/pilot-link/pilot-link.png14.diff | 96 |
2 files changed, 123 insertions, 5 deletions
diff --git a/source/l/pilot-link/pilot-link.SlackBuild b/source/l/pilot-link/pilot-link.SlackBuild index ca32428cc..c6dac9fa3 100755 --- a/source/l/pilot-link/pilot-link.SlackBuild +++ b/source/l/pilot-link/pilot-link.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,9 +20,18 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=${VERSION:-0.12.3} -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-9} +VERSION=${VERSION:-0.12.5} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi NUMJOBS=${NUMJOBS:-" -j7 "} @@ -41,6 +50,9 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi cd $TMP @@ -48,6 +60,8 @@ rm -rf pilot-link-$VERSION tar xvf $CWD/pilot-link-$VERSION.tar.bz2 || exit 1 cd pilot-link-$VERSION +zcat $CWD/pilot-link.png14.diff.gz | patch -p1 --verbose || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -102,9 +116,17 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \ mkdir -p $PKG/usr/doc/pilot-link-$VERSION cp -a \ - AUTHORS COPYING* INSTALL NEWS README \ + AUTHORS COPYING* INSTALL NEWS README* \ $PKG/usr/doc/pilot-link-$VERSION +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + # Install man pages: mkdir -p $PKG/usr/man/man{1,7} cp -a doc/man/*.1 $PKG/usr/man/man1 diff --git a/source/l/pilot-link/pilot-link.png14.diff b/source/l/pilot-link/pilot-link.png14.diff new file mode 100644 index 000000000..bc1cba25d --- /dev/null +++ b/source/l/pilot-link/pilot-link.png14.diff @@ -0,0 +1,96 @@ +--- ./src/pilot-read-veo.c.orig 2007-02-04 17:06:03.000000000 -0600 ++++ ./src/pilot-read-veo.c 2010-02-19 12:52:30.000000000 -0600 +@@ -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; +--- ./src/pilot-read-notepad.c.orig 2007-02-04 17:06:02.000000000 -0600 ++++ ./src/pilot-read-notepad.c 2010-02-19 12:53:03.000000000 -0600 +@@ -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-screenshot.c.orig 2006-11-02 08:54:31.000000000 -0600 ++++ ./src/pilot-read-screenshot.c 2010-02-19 12:50:44.000000000 -0600 +@@ -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-palmpix.c.orig 2007-02-04 17:06:03.000000000 -0600 ++++ ./src/pilot-read-palmpix.c 2010-02-19 12:51:10.000000000 -0600 +@@ -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; |