5 files changed, 292 insertions, 0 deletions
diff --git a/source/x/fontconfig/fontconfig.SlackBuild b/source/x/fontconfig/fontconfig.SlackBuild
new file mode 100755
index 000000000..4714b824f
--- /dev/null
+++ b/source/x/fontconfig/fontconfig.SlackBuild
@@ -0,0 +1,164 @@
+#!/bin/sh
+
+# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+VERSION=2.6.0
+export ARCH=${ARCH:-x86_64}
+NUMJOBS=${NUMJOBS:-" -j7 "}
+BUILD=${BUILD:-2}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-fontconfig
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf fontconfig-$VERSION
+tar xvf $CWD/fontconfig-$VERSION.tar.bz2 || exit 1
+cd fontconfig-$VERSION
+chown -R root:root .
+find . \
+  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+  -exec chmod 755 {} \; -o \
+  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+  -exec chmod 644 {} \;
+
+FCPREFIX=/usr
+
+# The wonderful extended version of the font so generously
+# opened up for free modification and distribution by one
+# for the previously proprietary font founderies, and that
+# Stepan Roh did such a marvelous job on getting the ball
+# rolling with should clearly (IMHO) be the default font:
+zcat $CWD/fontconfig.dejavu.diff.gz | patch -p1 --verbose || exit 1
+
+# Hardcode the default font search path rather than having
+# fontconfig figure it out (and possibly follow symlinks, or
+# index ugly bitmapped fonts):
+zcat $CWD/fontconfig.font.dir.list.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
+
+CFLAGS=$SLKCFLAGS \
+./configure \
+  --prefix=$FCPREFIX \
+  --libdir=$FCPREFIX/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --sysconfdir=/etc \
+  --localstatedir=/var
+
+# Uses a currently non-functional sgml tool, thus '-i':
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# This ought to be easily found here, but it's still safer to move it:
+if [ ! -d $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig ]; then
+  mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig
+  mv ${PKG}${FCPREFIX}/lib${LIBDIRSUFFIX}/pkgconfig/* $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig
+  rmdir ${PKG}${FCPREFIX}/lib${LIBDIRSUFFIX}/pkgconfig
+fi
+
+mkdir -p $PKG/usr/doc/fontconfig-$VERSION
+cp -a \
+  AUTHORS COPYING* INSTALL NEWS README \
+  $PKG/usr/doc/fontconfig-$VERSION
+# You can shop for this kind of stuff in the source tarball.
+rm -rf ${PKG}${FCPREFIX}/share/doc
+rmdir ${PKG}${FCPREFIX}/share
+
+mkdir -p $PKG/var/log/setup
+cat $CWD/setup.05.fontconfig > $PKG/var/log/setup/setup.05.fontconfig
+chmod 755 $PKG/var/log/setup/setup.05.fontconfig
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+# Set up the default options in /etc/fonts/conf.d:
+(  cd $PKG/etc/fonts/conf.d
+   for fontconf in \
+        20-fix-globaladvance.conf \
+        20-unhint-small-vera.conf \
+        30-urw-aliases.conf \
+        30-metric-aliases.conf \
+        40-nonlatin.conf \
+        45-latin.conf \
+        49-sansserif.conf \
+        50-user.conf \
+        51-local.conf \
+        60-latin.conf \
+        65-fonts-persian.conf \
+        65-nonlatin.conf \
+        69-unifont.conf \
+        80-delicious.conf \
+        90-synthetic.conf ; do
+     ln -sf ../conf.avail/$fontconf . || exit 1
+   done
+   if [ ! $? = 0 ]; then
+     exit 1
+   fi
+)
+if [ ! $? = 0 ]; then
+  echo "Missing /etc/fonts/$fontconf default.  Exiting"
+  exit 1
+fi
+
+# Fix manpages:
+if [ -d ${PKG}${FCPREFIX}/man ]; then
+  ( cd ${PKG}${FCPREFIX}/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
+mkdir $PKG/install
+cat << EOF >> $PKG/install/doinst.sh
+#!/bin/sh
+# Update the X font indexes:
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
+# else we'll catch it later with setup.fontconfig :-)
+# make links:
+EOF
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/fontconfig-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/x/fontconfig/fontconfig.dejavu.diff b/source/x/fontconfig/fontconfig.dejavu.diff
new file mode 100644
index 000000000..95f8e71e1
--- /dev/null
+++ b/source/x/fontconfig/fontconfig.dejavu.diff
@@ -0,0 +1,67 @@
+--- ./conf.d/45-latin.conf.orig	2008-05-03 20:02:06.000000000 -0500
++++ ./conf.d/45-latin.conf	2008-09-17 21:57:28.000000000 -0500
+@@ -10,9 +10,9 @@
+   Serif faces
+  -->
+ 	<alias>
+-		<family>Bitstream Vera Serif</family>
+ 		<family>DejaVu Serif</family>
+ 		<family>Liberation Serif</family>
++		<family>Bitstream Vera Serif</family>
+ 		<family>Times New Roman</family>
+ 		<family>Times</family>
+ 		<family>Nimbus Roman No9 L</family>
+@@ -25,9 +25,9 @@
+   Sans-serif faces
+  -->
+ 	<alias>
+-		<family>Bitstream Vera Sans</family>
+ 		<family>DejaVu Sans</family>
+ 		<family>Liberation Sans</family>
++		<family>Bitstream Vera Sans</family>
+ 		<family>Arial</family>
+ 		<family>Helvetica</family>
+ 		<family>Verdana</family>
+@@ -41,9 +41,9 @@
+   Monospace faces
+  -->
+  	<alias>
+-		<family>Bitstream Vera Sans Mono</family>
+ 		<family>DejaVu Sans Mono</family>
+ 		<family>Liberation Mono</family>
++		<family>Bitstream Vera Sans Mono</family>
+ 		<family>Courier New</family>
+ 		<family>Courier</family>
+ 		<family>Andale Mono</family>
+--- ./conf.d/60-latin.conf.orig	2008-05-03 21:17:18.000000000 -0500
++++ ./conf.d/60-latin.conf	2008-09-17 21:56:37.000000000 -0500
+@@ -4,8 +4,8 @@
+ 	<alias>
+ 		<family>serif</family>
+ 		<prefer>
+-			<family>Bitstream Vera Serif</family>
+ 			<family>DejaVu Serif</family>
++			<family>Bitstream Vera Serif</family>
+ 			<family>Times New Roman</family>
+ 			<family>Thorndale AMT</family>
+ 			<family>Luxi Serif</family>
+@@ -16,8 +16,8 @@
+ 	<alias>
+ 		<family>sans-serif</family>
+ 		<prefer>
+-			<family>Bitstream Vera Sans</family>
+ 			<family>DejaVu Sans</family>
++			<family>Bitstream Vera Sans</family>
+ 			<family>Verdana</family>
+ 			<family>Arial</family>
+ 			<family>Albany AMT</family>
+@@ -32,8 +32,8 @@
+ 	<alias>
+ 		<family>monospace</family>
+ 		<prefer>
+-			<family>Bitstream Vera Sans Mono</family>
+ 			<family>DejaVu Sans Mono</family>
++			<family>Bitstream Vera Sans Mono</family>
+ 			<family>Andale Mono</family>
+ 			<family>Courier New</family>
+ 			<family>Cumberland AMT</family>
diff --git a/source/x/fontconfig/fontconfig.font.dir.list.diff b/source/x/fontconfig/fontconfig.font.dir.list.diff
new file mode 100644
index 000000000..a11ef0b6d
--- /dev/null
+++ b/source/x/fontconfig/fontconfig.font.dir.list.diff
@@ -0,0 +1,26 @@
+--- ./fonts.conf.in.orig	2007-10-25 16:14:27.000000000 -0500
++++ ./fonts.conf.in	2008-09-22 15:42:21.000000000 -0500
+@@ -23,10 +23,21 @@
+ 
+ <!-- Font directory list -->
+ 
+-	<dir>@FC_DEFAULT_FONTS@</dir>
+-	@FC_FONTPATH@
++	<dir>/usr/share/fonts/OTF</dir>
++	<dir>/usr/share/fonts/TTF</dir>
++	<dir>/usr/share/fonts/Type1</dir>
++	<dir>/usr/share/fonts/Speedo</dir>
++	<dir>/usr/share/fonts/cyrillic</dir>
++	<dir>/usr/share/fonts/misc</dir>
+ 	<dir>~/.fonts</dir>
+ 
++<!--    Commented out font directories:
++These are not indexed by default, as fontconfig then seems
++to prefer bitmapped fonts in some cases...
++	<dir>/usr/share/fonts/100dpi</dir>
++	<dir>/usr/share/fonts/75dpi</dir>
++-->
++
+ <!--
+   Accept deprecated 'mono' alias, replacing it with 'monospace'
+ -->
diff --git a/source/x/fontconfig/setup.05.fontconfig b/source/x/fontconfig/setup.05.fontconfig
new file mode 100644
index 000000000..55f25bead
--- /dev/null
+++ b/source/x/fontconfig/setup.05.fontconfig
@@ -0,0 +1,16 @@
+#!/bin/sh
+#BLURB="Run fc-cache to locate new fonts for Xft"
+if [ -x usr/bin/fc-cache ]; then
+  if [ "$COLOR" = "on" -o -r $TMP/SeTcolor ]; then
+    dialog --title "FONTCONFIG UPDATE" --infobox \
+  "Please wait while we generate font.cache-1 files with fc-cache.  \
+For best results, fc-cache should be run whenever fonts are \
+added to the system." 5 68
+  else
+    echo "Please wait while we generate font.cache-1 files with fc-cache."
+    echo "For best results, fc-cache should be run whenever fonts are added"
+    echo "to the system."
+  fi
+  chroot . /sbin/ldconfig 1> /dev/null 2> /dev/null
+  chroot . /usr/bin/fc-cache -f 1> /dev/null 2> /dev/null
+fi
diff --git a/source/x/fontconfig/slack-desc b/source/x/fontconfig/slack-desc
new file mode 100644
index 000000000..173ba9467
--- /dev/null
+++ b/source/x/fontconfig/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|' on
+# the right side marks the last column you can put a character in.  You must make
+# exactly 11 lines for the formatting to be correct.  It's also customary to
+# leave one space after the ':'.
+
+          |-----handy-ruler------------------------------------------------------|
+fontconfig: fontconfig (Font library and tools)
+fontconfig:
+fontconfig: Fontconfig is a library and tools designed to provide system-wide
+fontconfig: font configuration, customization, and application access.
+fontconfig:
+fontconfig: Fontconfig is written and maintained by Keith Packard.
+fontconfig:
+fontconfig:
+fontconfig:
+fontconfig:
+fontconfig: