summaryrefslogtreecommitdiffstats
path: root/fontforge
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2008-12-22 15:53:40 +0000
committer Eric Hameleers <alien@slackware.com>2008-12-22 15:53:40 +0000
commita7091b8ea2a3ef2f4c44832b99894bb467441cb4 (patch)
tree81fbf53285e42bd6461ba973dadef065c280ea76 /fontforge
parent25515105bda53c45cdc0c686cb53601d846d3080 (diff)
downloadasb-a7091b8ea2a3ef2f4c44832b99894bb467441cb4.tar.gz
asb-a7091b8ea2a3ef2f4c44832b99894bb467441cb4.tar.xz
Updated to 20081215, make it build on x86_64
Diffstat (limited to 'fontforge')
-rwxr-xr-xfontforge/build/fontforge.SlackBuild16
1 files changed, 10 insertions, 6 deletions
diff --git a/fontforge/build/fontforge.SlackBuild b/fontforge/build/fontforge.SlackBuild
index cf20642e..402eccd6 100755
--- a/fontforge/build/fontforge.SlackBuild
+++ b/fontforge/build/fontforge.SlackBuild
@@ -44,6 +44,8 @@
# * Update.
# 20081117-1: 08/dec/2008 by Eric Hameleers <alien@slackware.com>
# * Update.
+# 20081215-1: 22/dec/2008 by Eric Hameleers <alien@slackware.com>
+# * Update.
#
# Run 'sh fontforge.SlackBuild --cleanup' to build a Slackware package.
# The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -52,7 +54,7 @@
# -----------------------------------------------------------------------------
PRGNAM=fontforge
-VERSION=${VERSION:-20081117}
+VERSION=${VERSION:-20081215}
ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-alien}
@@ -180,6 +182,8 @@ mkdir ${PRGNAM}-${VERSION}/cidmap
mv *.cidmap ${PRGNAM}-${VERSION}/cidmap/
cd ${PRGNAM}-${VERSION}
+cat $SRCDIR/fontforge_pangocairo.diff | patch -p1 --verbose \
+ 2>&1 | tee $OUTPUT/patch-$PRGNAM.log
chown -R root:root .
chmod -R u+w,go+r-w,a-s .
@@ -209,8 +213,8 @@ CXXFLAGS="$SLKCFLAGS" \
--disable-static \
--with-devicetables \
${FREETYPE_OPTS} \
- --program-prefix="" \
- --program-suffix="" \
+ --program-prefix= \
+ --program-suffix= \
--build=$ARCH-slackware-linux \
2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
# Using this, the man pages go into the root instead of $PKG
@@ -218,15 +222,15 @@ CXXFLAGS="$SLKCFLAGS" \
make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
# Install all the needed stuff to the package dir
-mkdir -p $PKG/usr/{bin,lib,man,share}
+mkdir -p $PKG/usr/{bin,lib${LIBDIRSUFFIX},man,share}
# Use installwatch if available, to produce a logfile of the installation
# process that is more easily readable:
if $(which installwatch > /dev/null 2>&1); then
installwatch -o $OUTPUT/install-${PRGNAM}.log \
- make prefix=$PKG/usr libdir=$PKG/usr/lib install
+ make prefix=$PKG/usr libdir=$PKG/usr/lib${LIBDIRSUFFIX} install
else
- make prefix=$PKG/usr libdir=$PKG/usr/lib install \
+ make prefix=$PKG/usr libdir=$PKG/usr/lib${LIBDIRSUFFIX} install \
2>&1 |tee $OUTPUT/install-${PRGNAM}.log
fi