Slackware 13.1slackware-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!

4 files changed, 61 insertions, 46 deletions

diff --git a/source/x/fontconfig/doinst.sh b/source/x/fontconfig/doinst.sh
new file mode 100644
index 00000000..6a480232
--- /dev/null
+++ b/source/x/fontconfig/doinst.sh
@@ -0,0 +1,7 @@
+# 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:
+
diff --git a/source/x/fontconfig/fontconfig.SlackBuild b/source/x/fontconfig/fontconfig.SlackBuild
index 4714b824..5feb6fd9 100755
--- a/source/x/fontconfig/fontconfig.SlackBuild
+++ b/source/x/fontconfig/fontconfig.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,10 +21,20 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=2.6.0
-export ARCH=${ARCH:-x86_64}
+VERSION=${VERSION:-$(echo fontconfig-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+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 "}
-BUILD=${BUILD:-2}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -39,6 +49,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 rm -rf $PKG
@@ -46,7 +59,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf fontconfig-$VERSION
-tar xvf $CWD/fontconfig-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/fontconfig-$VERSION.tar.?z* || exit 1
 cd fontconfig-$VERSION
 chown -R root:root .
 find . \
@@ -55,8 +68,6 @@ find . \
   \( -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
@@ -71,30 +82,32 @@ zcat $CWD/fontconfig.font.dir.list.diff.gz | patch -p1 --verbose --backup --suff
 
 CFLAGS=$SLKCFLAGS \
 ./configure \
-  --prefix=$FCPREFIX \
-  --libdir=$FCPREFIX/lib${LIBDIRSUFFIX} \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
   --sysconfdir=/etc \
-  --localstatedir=/var
+  --localstatedir=/var \
+  --build=$ARCH-slackware-linux
 
 # 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
+rm -rf $PKG/usr/share/doc
+rmdir $PKG/usr/share 2>/dev/null
+
+# 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/*-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
 
 mkdir -p $PKG/var/log/setup
 cat $CWD/setup.05.fontconfig > $PKG/var/log/setup/setup.05.fontconfig
@@ -133,8 +146,8 @@ if [ ! $? = 0 ]; then
 fi
 
 # Fix manpages:
-if [ -d ${PKG}${FCPREFIX}/man ]; then
-  ( cd ${PKG}${FCPREFIX}/man
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
     for manpagedir in $(find . -type d -name "man*") ; do
       ( cd $manpagedir
         for eachpage in $( find . -type l -maxdepth 1) ; do
@@ -148,16 +161,8 @@ if [ -d ${PKG}${FCPREFIX}/man ]; then
 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
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 
 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
index 95f8e71e..af71a44b 100644
--- a/source/x/fontconfig/fontconfig.dejavu.diff
+++ b/source/x/fontconfig/fontconfig.dejavu.diff
@@ -1,5 +1,6 @@
---- ./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
+diff -Nur fontconfig-2.8.0.orig/conf.d/45-latin.conf fontconfig-2.8.0/conf.d/45-latin.conf
+--- fontconfig-2.8.0.orig/conf.d/45-latin.conf	2009-11-16 11:24:52.000000000 -0600
++++ fontconfig-2.8.0/conf.d/45-latin.conf	2009-12-01 21:45:42.639936724 -0600
 @@ -10,9 +10,9 @@
    Serif faces
   -->
@@ -30,11 +31,12 @@
  		<family>DejaVu Sans Mono</family>
  		<family>Liberation Mono</family>
 +		<family>Bitstream Vera Sans Mono</family>
+ 		<family>Inconsolata</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
+diff -Nur fontconfig-2.8.0.orig/conf.d/60-latin.conf fontconfig-2.8.0/conf.d/60-latin.conf
+--- fontconfig-2.8.0.orig/conf.d/60-latin.conf	2009-11-16 11:24:52.000000000 -0600
++++ fontconfig-2.8.0/conf.d/60-latin.conf	2009-12-01 21:46:39.925935327 -0600
 @@ -4,8 +4,8 @@
  	<alias>
  		<family>serif</family>
@@ -62,6 +64,6 @@
 -			<family>Bitstream Vera Sans Mono</family>
  			<family>DejaVu Sans Mono</family>
 +			<family>Bitstream Vera Sans Mono</family>
+ 			<family>Inconsolata</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
index a11ef0b6..1e68b0d1 100644
--- a/source/x/fontconfig/fontconfig.font.dir.list.diff
+++ b/source/x/fontconfig/fontconfig.font.dir.list.diff
@@ -1,24 +1,25 @@
---- ./fonts.conf.in.orig	2007-10-25 16:14:27.000000000 -0500
-+++ ./fonts.conf.in	2008-09-22 15:42:21.000000000 -0500
+diff -Nur fontconfig-2.8.0.orig/fonts.conf.in fontconfig-2.8.0/fonts.conf.in
+--- fontconfig-2.8.0.orig/fonts.conf.in	2009-06-28 12:48:47.000000000 -0500
++++ fontconfig-2.8.0/fonts.conf.in	2009-12-01 21:48:48.134935536 -0600
 @@ -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>/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>
++       <dir>/usr/share/fonts/100dpi</dir>
++       <dir>/usr/share/fonts/75dpi</dir>
 +-->
 +
  <!--