summaryrefslogtreecommitdiffstats
path: root/libraries/libgnomecups/libgnomecups.SlackBuild
diff options
context:
space:
mode:
author dsomero <xgizzmo@slackbuilds.org>2012-08-30 21:23:55 -0400
committer dsomero <xgizzmo@slackbuilds.org>2012-09-02 03:36:39 -0400
commitfd4743379694f5035393714e59e55b01c3e68864 (patch)
tree3b898e3811528b24113e5e79af215daffaf8a057 /libraries/libgnomecups/libgnomecups.SlackBuild
parent9611ae4bfb7ceae8a3575318dbc3d0e79d970501 (diff)
downloadslackbuilds-fd4743379694f5035393714e59e55b01c3e68864.tar.gz
slackbuilds-fd4743379694f5035393714e59e55b01c3e68864.tar.xz
libraries/libgnomecups: Added patches for glib and cups.
Patches pulled from gentoo to allow building with newer glib and cups. Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
Diffstat (limited to 'libraries/libgnomecups/libgnomecups.SlackBuild')
-rw-r--r--libraries/libgnomecups/libgnomecups.SlackBuild18
1 files changed, 15 insertions, 3 deletions
diff --git a/libraries/libgnomecups/libgnomecups.SlackBuild b/libraries/libgnomecups/libgnomecups.SlackBuild
index 9a4e2ae32a..6cf321fb74 100644
--- a/libraries/libgnomecups/libgnomecups.SlackBuild
+++ b/libraries/libgnomecups/libgnomecups.SlackBuild
@@ -29,12 +29,10 @@ VERSION=0.2.3
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
-# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
i?86) ARCH=i486 ;;
arm*) ARCH=arm ;;
- # Unless $ARCH is already set, use uname -m for all other archs:
*) ARCH=$( uname -m ) ;;
esac
fi
@@ -60,7 +58,7 @@ fi
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP
rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
cd $PRGNAM-$VERSION || exit 1
@@ -71,6 +69,20 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+patch -p0 -i $CWD/patches/enablenet.patch
+
+# Fix .pc file
+patch -p0 -i $CWD/patches/$PRGNAM-$VERSION-pkgconfig.patch
+
+# Upstream fix for g_list_find_custom() argument order
+patch -p1 -i $CWD/patches/$PRGNAM-$VERSION-g_list_find_custom.patch
+
+# >=glib-2.31 compat
+patch -p1 -i $CWD/patches/$PRGNAM-$VERSION-glib.h.patch
+
+# cups-1.6 compat
+patch -p1 -i $CWD/patches/$PRGNAM-$VERSION-cups-1.6.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \