From b76270bf9e6dd375e495fec92140a79a79415d27 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Wed, 19 May 2010 08:58:23 +0000
Subject: Slackware 13.1

Wed May 19 08:58:23 UTC 2010
Slackware 13.1 x86_64 stable is released!
Lots of thanks are due -- see the RELEASE_NOTES and the rest of the
ChangeLog for credits.  The ISOs are on their way to replication,
a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD.
We are taking pre-orders now at store.slackware.com, and offering
a discount if you sign up for a subscription.  Consider picking up
a copy to help support the project.  Thanks again to the Slackware
community for testing, contributing, and generally holding us to a
high level of quality.  :-)
Enjoy!
---
 source/l/cairo/cairo.SlackBuild    | 23 +++++++++++++++++++----
 source/l/cairo/cairo.libpng14.diff | 11 +++++++++++
 2 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 source/l/cairo/cairo.libpng14.diff

(limited to 'source/l/cairo')

diff --git a/source/l/cairo/cairo.SlackBuild b/source/l/cairo/cairo.SlackBuild
index a6ddc3447..655cf2f49 100755
--- a/source/l/cairo/cairo.SlackBuild
+++ b/source/l/cairo/cairo.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008-2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,10 +21,19 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=1.8.6
-ARCH=${ARCH:-x86_64}
+VERSION=1.8.8
 BUILD=${BUILD:-3}
 
+# 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 "}
 
 if [ "$ARCH" = "i486" ]; then
@@ -36,6 +45,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 CWD=$(pwd)
@@ -46,7 +58,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf cairo-$VERSION
-tar xvf $CWD/cairo-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/cairo-$VERSION.tar.?z* || exit 1
 cd cairo-$VERSION
 chown -R root:root .
 find . \
@@ -55,6 +67,9 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
+# Use libpng-1.4.x:
+zcat $CWD/cairo.libpng14.diff.gz | patch -p0 --verbose || exit 1
+
 # Time to try leaving this out again?
 #  --disable-xcb
 
diff --git a/source/l/cairo/cairo.libpng14.diff b/source/l/cairo/cairo.libpng14.diff
new file mode 100644
index 000000000..12bed2c0e
--- /dev/null
+++ b/source/l/cairo/cairo.libpng14.diff
@@ -0,0 +1,11 @@
+--- ./configure.orig	2009-06-16 07:25:50.000000000 -0500
++++ ./configure	2010-05-03 00:12:23.000000000 -0500
+@@ -27890,7 +27890,7 @@
+ 
+   if test "x$png_REQUIRES" = x; then
+     # libpng13 is GnuWin32's libpng-1.2.8 :-(
+-    for l in libpng12 libpng13 libpng10 ; do
++    for l in libpng14 libpng12 libpng13 libpng10 ; do
+       if $PKG_CONFIG --exists $l ; then
+         png_REQUIRES=$l
+         use_png=yes
-- 
cgit v1.2.3