summaryrefslogtreecommitdiff
path: root/source/x
diff options
context:
space:
mode:
Diffstat (limited to 'source/x')
-rwxr-xr-xsource/x/anthy/anthy.SlackBuild51
-rwxr-xr-xsource/x/dejavu-fonts-ttf/dejavu-fonts-ttf.SlackBuild15
-rwxr-xr-xsource/x/glew/glew.SlackBuild21
-rw-r--r--source/x/glew/glew.url2
-rw-r--r--source/x/liberation-fonts-ttf/60-liberation.conf4
-rwxr-xr-xsource/x/liberation-fonts-ttf/liberation-fonts-ttf.SlackBuild20
-rwxr-xr-xsource/x/libhangul/libhangul.SlackBuild47
-rw-r--r--source/x/m17n-lib/internal-flt.h53
-rw-r--r--source/x/m17n-lib/m17n-docs_makefile.patch31
-rwxr-xr-xsource/x/m17n-lib/m17n-lib.SlackBuild89
-rwxr-xr-x[-rw-r--r--]source/x/mesa/get-mesa.sh20
-rwxr-xr-xsource/x/mesa/mesa.SlackBuild134
-rw-r--r--source/x/mesa/mesa.url1
-rw-r--r--source/x/mesa/patches/i915_fragment_shader_disable.patch26
-rw-r--r--source/x/mesa/patches/mesa-7.9-libdrm-2.4.23-nouveau-api.patch89
-rwxr-xr-xsource/x/radeon_ucode/radeon_ucode.SlackBuild53
-rw-r--r--source/x/radeon_ucode/slack-desc19
-rw-r--r--source/x/radeon_ucode/ucode-20110302/LICENSE.radeon51
-rw-r--r--source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent-application.cpp.patch11
-rw-r--r--source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent-imcontext.cpp.patch48
-rw-r--r--source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent-imcontext.h.patch24
-rw-r--r--source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent.cpp.patch30
-rw-r--r--source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-client-imcontext-gtk.c.patch47
-rw-r--r--source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-client-imcontext-qt.cpp.patch31
-rwxr-xr-xsource/x/scim-bridge/scim-bridge.SlackBuild25
-rw-r--r--source/x/scim/scim-1.4.9-fix-ltdl.cpp.patch11
-rwxr-xr-xsource/x/scim/scim.SlackBuild23
-rwxr-xr-xsource/x/tibmachuni-font-ttf/tibmachuni-font-ttf.SlackBuild3
-rw-r--r--source/x/x11-skel/doinst.sh2
-rwxr-xr-xsource/x/x11-skel/x11-skel.SlackBuild15
-rw-r--r--source/x/x11/build/libX11 (renamed from source/x/x11/build/ico)0
-rw-r--r--source/x/x11/build/lndir1
-rw-r--r--source/x/x11/build/oclock1
-rw-r--r--source/x/x11/build/printproto1
-rw-r--r--source/x/x11/build/proxymngr1
-rw-r--r--source/x/x11/build/rendercheck1
-rw-r--r--source/x/x11/build/scripts1
-rw-r--r--source/x/x11/build/trapproto1
-rw-r--r--source/x/x11/build/twm1
-rw-r--r--source/x/x11/build/xcompmgr (renamed from source/x/x11/build/libXTrap)0
-rw-r--r--source/x/x11/build/xconsole1
-rw-r--r--source/x/x11/build/xdbedizzy1
-rw-r--r--source/x/x11/build/xditview1
-rw-r--r--source/x/x11/build/xf86-input-acecad (renamed from source/x/x11/build/libXevie)0
-rw-r--r--source/x/x11/build/xf86-input-elographics1
-rw-r--r--source/x/x11/build/xf86-input-mutouch1
-rw-r--r--source/x/x11/build/xf86-input-penmount (renamed from source/x/x11/build/libXp)0
-rw-r--r--source/x/x11/build/xf86-input-vmmouse1
-rw-r--r--source/x/x11/build/xf86-video-apm1
-rw-r--r--source/x/x11/build/xf86-video-ast1
-rw-r--r--source/x/x11/build/xf86-video-cirrus2
-rw-r--r--source/x/x11/build/xf86-video-glint1
-rw-r--r--source/x/x11/build/xf86-video-i1281
-rw-r--r--source/x/x11/build/xf86-video-i7402
-rw-r--r--source/x/x11/build/xf86-video-mach642
-rw-r--r--source/x/x11/build/xf86-video-mga1
-rw-r--r--source/x/x11/build/xf86-video-neomagic1
-rw-r--r--source/x/x11/build/xf86-video-openchrome (renamed from source/x/x11/build/libXprintAppUtil)0
-rw-r--r--source/x/x11/build/xf86-video-r1282
-rw-r--r--source/x/x11/build/xf86-video-radeonhd (renamed from source/x/x11/build/libXprintUtil)0
-rw-r--r--source/x/x11/build/xf86-video-s32
-rw-r--r--source/x/x11/build/xf86-video-s3virge2
-rw-r--r--source/x/x11/build/xf86-video-savage1
-rw-r--r--source/x/x11/build/xf86-video-sis1
-rw-r--r--source/x/x11/build/xf86-video-sisusb1
-rw-r--r--source/x/x11/build/xf86-video-tdfx2
-rw-r--r--source/x/x11/build/xf86-video-tga (renamed from source/x/x11/build/libxkbui)0
-rw-r--r--source/x/x11/build/xf86-video-v4l2
-rw-r--r--source/x/x11/build/xf86-video-vesa2
-rw-r--r--source/x/x11/build/xf86-video-vmware1
-rw-r--r--source/x/x11/build/xf86-video-voodoo1
-rw-r--r--source/x/x11/build/xf86dga1
-rw-r--r--source/x/x11/build/xf86rushproto1
-rw-r--r--source/x/x11/build/xfd1
-rw-r--r--source/x/x11/build/xfindproxy1
-rw-r--r--source/x/x11/build/xfontsel1
-rw-r--r--source/x/x11/build/xfwp1
-rw-r--r--source/x/x11/build/xgc1
-rw-r--r--source/x/x11/build/xload1
-rw-r--r--source/x/x11/build/xlsfonts1
-rw-r--r--source/x/x11/build/xmh1
-rw-r--r--source/x/x11/build/xmore1
-rw-r--r--source/x/x11/build/xplsprinters1
-rw-r--r--source/x/x11/build/xprehashprinterlist1
-rw-r--r--source/x/x11/build/xsetmode1
-rw-r--r--source/x/x11/build/xsetpointer1
-rw-r--r--source/x/x11/build/xsm1
-rw-r--r--source/x/x11/build/xstdcmap1
-rw-r--r--source/x/x11/build/xtrap1
-rw-r--r--source/x/x11/configure/compiz1
-rw-r--r--source/x/x11/configure/configure1
-rw-r--r--source/x/x11/configure/font-bh-ttf13
-rw-r--r--source/x/x11/configure/gccmakedep14
-rw-r--r--source/x/x11/configure/libX112
-rw-r--r--source/x/x11/configure/libXp14
-rw-r--r--source/x/x11/configure/xf86-video-ati2
-rw-r--r--source/x/x11/configure/xf86-video-nouveau11
-rw-r--r--source/x/x11/configure/xf86-video-nv21
-rw-r--r--source/x/x11/configure/xorg-docs1
-rw-r--r--source/x/x11/configure/xorg-server10
-rw-r--r--source/x/x11/modularize25
-rw-r--r--source/x/x11/noarch4
-rw-r--r--source/x/x11/patch/README18
-rw-r--r--source/x/x11/patch/xcompmgr.patch2
-rw-r--r--source/x/x11/patch/xcompmgr/xcompmgr-follow-icccm-spec.diff26
-rw-r--r--source/x/x11/patch/xcursorgen.patch1
-rw-r--r--source/x/x11/patch/xcursorgen/xcursorgen.png14.configure.kludge.diff61
-rw-r--r--source/x/x11/patch/xf86-input-synaptics.patch4
-rw-r--r--source/x/x11/patch/xf86-input-synaptics/xf86-input-synaptics.tap-to-click.diff11
-rw-r--r--source/x/x11/patch/xorg-server.patch5
-rw-r--r--source/x/x11/patch/xorg-server/xorg-server.try_nouveau.diff11
-rw-r--r--source/x/x11/post-install/libSM.post-install1
-rw-r--r--source/x/x11/post-install/libX11.post-install2
-rw-r--r--source/x/x11/post-install/libX11/XKeysymDB380
-rw-r--r--source/x/x11/post-install/xbitmaps.post-install2
-rwxr-xr-xsource/x/x11/post-install/xdm/Xsession5
-rw-r--r--source/x/x11/post-install/xf86-input-synaptics.post-install7
-rw-r--r--source/x/x11/post-install/xf86-input-synaptics/50-synaptics.conf15
-rw-r--r--source/x/x11/post-install/xf86-input-wacom.post-install4
-rw-r--r--source/x/x11/post-install/xorg-docs.post-install1
-rw-r--r--source/x/x11/post-install/xorg-server.post-install49
-rw-r--r--source/x/x11/post-install/xorg-sgml-doctools.post-install2
-rw-r--r--source/x/x11/post-install/xproto.post-install2
-rw-r--r--source/x/x11/slack-desc/mkcfm19
-rw-r--r--source/x/x11/slack-desc/xf86-video-nouveau19
-rwxr-xr-xsource/x/x11/src/get-xf86-video-nouveau.sh22
-rw-r--r--source/x/xaw3d/Xaw3d-1.5-debian-fixes.diff647
-rw-r--r--source/x/xaw3d/Xaw3d-1.5E.diff30
-rwxr-xr-xsource/x/xaw3d/pull-xaw3d.sh7
-rwxr-xr-xsource/x/xaw3d/xaw3d.SlackBuild57
-rw-r--r--source/x/xdg-user-dirs/doinst.sh15
-rw-r--r--source/x/xdg-user-dirs/slack-desc19
-rwxr-xr-xsource/x/xdg-user-dirs/xdg-user-dirs.SlackBuild97
-rwxr-xr-xsource/x/xdg-utils/xdg-utils.SlackBuild34
-rw-r--r--source/x/xf86-video-nouveau/this_is_NOT_a_driver.txt14
135 files changed, 1573 insertions, 1192 deletions
diff --git a/source/x/anthy/anthy.SlackBuild b/source/x/anthy/anthy.SlackBuild
index ab402cd0..6436db76 100755
--- a/source/x/anthy/anthy.SlackBuild
+++ b/source/x/anthy/anthy.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN USA
+# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN USA
# Copyright 2008, 2009 Eric Hameleers, Eindhoven, NL
# All rights reserved.
#
@@ -33,12 +33,22 @@
# -----------------------------------------------------------------------------
-PRGNAM=anthy
-VERSION=${VERSION:-9100e}
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
+PKGNAM=anthy
+VERSION=${VERSION:-$(echo $PKGNAM-*.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 "}
+
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
LIBDIRSUFFIX=""
@@ -48,19 +58,22 @@ elif [ "$ARCH" = "s390" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
CWD=$(pwd)
TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
rm -rf $PKG
-mkdir -p $TMP PKG
+mkdir -p $TMP $PKG
cd $TMP
-rm -rf ${PRGNAM}-${VERSION}
-tar -xvf $CWD/${PRGNAM}-${VERSION}.tar.gz || exit 1
-cd ${PRGNAM}-${VERSION} || exit 1
+rm -rf ${PKGNAM}-${VERSION}
+tar xvf $CWD/${PKGNAM}-${VERSION}.tar.?z* || exit 1
+cd ${PKGNAM}-${VERSION} || exit 1
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -76,7 +89,7 @@ CFLAGS="$SLKCFLAGS" \
--localstatedir=/var \
--sysconfdir=/etc \
--mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
+ --docdir=/usr/doc/$PKGNAM-$VERSION \
--disable-static \
--program-prefix= \
--program-suffix= \
@@ -86,12 +99,20 @@ make $NUMJOBS || make || exit 1
make DESTDIR=$PKG install || exit 1
# Add documentation:
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
cp -a \
- AUTHORS COPYING ChangeLog DIARY INSTALL NEWS README* \
- $PKG/usr/doc/$PRGNAM-$VERSION
+ AUTHORS COPYING* DIARY INSTALL NEWS README* \
+ $PKG/usr/doc/$PKGNAM-$VERSION
find $PKG/usr/doc -type f -exec chmod 644 {} \;
+# 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/${PKGNAM}-$VERSION)
+ cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+ touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
# Compress the man page(s):
if [ -d $PKG/usr/man ]; then
find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \;
@@ -111,5 +132,5 @@ fi
# Build the package:
cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
diff --git a/source/x/dejavu-fonts-ttf/dejavu-fonts-ttf.SlackBuild b/source/x/dejavu-fonts-ttf/dejavu-fonts-ttf.SlackBuild
index 6bbaa821..834523bf 100755
--- a/source/x/dejavu-fonts-ttf/dejavu-fonts-ttf.SlackBuild
+++ b/source/x/dejavu-fonts-ttf/dejavu-fonts-ttf.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -21,7 +21,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-VERSION=${VERSION:-2.30}
+PKGNAM=dejavu-fonts-ttf
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
ARCH=noarch
BUILD=1
@@ -33,19 +34,21 @@ PKG=$TMP/package-dejavu-fonts-ttf
# you know the version you want.
if [ ! -e $CWD/dejavu-fonts-ttf-$VERSION.tar.gz ]; then
if [ ! -e $CWD/dejavu-fonts-ttf-$VERSION.tar.bz2 ]; then
- lftpget http://dejavu.sourceforge.net/snapshots/dejavu-fonts-ttf-$VERSION.tar.gz
+ if [ ! -e $CWD/dejavu-fonts-ttf-$VERSION.tar.xz ]; then
+ lftpget http://dejavu.sourceforge.net/snapshots/dejavu-fonts-ttf-$VERSION.tar.gz
+ fi
fi
fi
if [ -e $CWD/dejavu-fonts-ttf-$VERSION.tar.gz ]; then
gzip -d $CWD/dejavu-fonts-ttf-$VERSION.tar.gz
- bzip2 -9 $CWD/dejavu-fonts-ttf-$VERSION.tar
+ xz -9 $CWD/dejavu-fonts-ttf-$VERSION.tar
fi
rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
rm -rf dejavu-fonts-ttf-$VERSION
-tar xvf $CWD/dejavu-fonts-ttf-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/dejavu-fonts-ttf-$VERSION.tar.?z* || exit 1
cd dejavu-fonts-ttf-$VERSION || exit 1
chown -R root:root .
@@ -69,7 +72,7 @@ mkdir -p $PKG/etc/fonts/conf.d
mkdir -p $PKG/usr/doc/dejavu-fonts-ttf-$VERSION
cp -a \
- AUTHORS LICENSE NEWS README* *.txt \
+ AUTHORS BUGS LICENSE NEWS README* *.txt \
$PKG/usr/doc/dejavu-fonts-ttf-$VERSION
mkdir -p $PKG/install
diff --git a/source/x/glew/glew.SlackBuild b/source/x/glew/glew.SlackBuild
index 75b22af6..d210557f 100755
--- a/source/x/glew/glew.SlackBuild
+++ b/source/x/glew/glew.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2009 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,19 @@
# Slackware build script for glew
-VERSION=1.5.1
-ARCH=${ARCH:-x86_64}
+VERSION=1.5.7
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:--j8}
CWD=$(pwd)
@@ -50,8 +59,8 @@ rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP || exit 1
rm -rf glew-$VERSION
-tar xvf $CWD/glew-${VERSION}-src.tar.?z* || exit 1
-cd glew || exit 1
+tar xvf $CWD/glew-${VERSION}.tar.?z* || exit 1
+cd glew-${VERSION} || exit 1
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -76,7 +85,7 @@ make install GLEW_DEST=$PKG/usr || exit 1
mkdir -p $PKG/usr/doc/glew-$VERSION
cp -a \
- LICENSE.txt README.txt doc/* \
+ LICENSE* README* doc/* \
$PKG/usr/doc/glew-$VERSION
mkdir -p $PKG/install
diff --git a/source/x/glew/glew.url b/source/x/glew/glew.url
index 5ef20740..8cc43579 100644
--- a/source/x/glew/glew.url
+++ b/source/x/glew/glew.url
@@ -1,2 +1,2 @@
http://glew.sourceforge.net
-http://downloads.sourceforge.net/glew/glew-1.5.1-src.tgz
+http://downloads.sourceforge.net/glew/glew-1.5.5.tgz
diff --git a/source/x/liberation-fonts-ttf/60-liberation.conf b/source/x/liberation-fonts-ttf/60-liberation.conf
index a15b9f61..1e7212c6 100644
--- a/source/x/liberation-fonts-ttf/60-liberation.conf
+++ b/source/x/liberation-fonts-ttf/60-liberation.conf
@@ -20,6 +20,10 @@
<test qual="any" name="family"><string>Courier</string></test>
<edit name="family" mode="assign"><string>Liberation Mono</string></edit>
</match>
+ <match target="pattern">
+ <test qual="any" name="family"><string>Courier New</string></test>
+ <edit name="family" mode="assign"><string>Liberation Mono</string></edit>
+ </match>
</fontconfig>
diff --git a/source/x/liberation-fonts-ttf/liberation-fonts-ttf.SlackBuild b/source/x/liberation-fonts-ttf/liberation-fonts-ttf.SlackBuild
index 211bbeff..9dcecac1 100755
--- a/source/x/liberation-fonts-ttf/liberation-fonts-ttf.SlackBuild
+++ b/source/x/liberation-fonts-ttf/liberation-fonts-ttf.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,9 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-VERSION=1.04
+VERSION=1.06.0.20100721
ARCH=noarch
-BUILD=1
+BUILD=3
CWD=$(pwd)
TMP=${TMP:-/tmp}
@@ -33,8 +33,8 @@ rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
rm -rf liberation-fonts-ttf-$VERSION
-tar xvf $CWD/liberation-fonts-${VERSION}.tar.* || exit 1
-cd liberation-fonts-${VERSION} || exit 1
+tar xvf $CWD/liberation-fonts-ttf-${VERSION}.tar.* || exit 1
+cd liberation-fonts-ttf-${VERSION} || exit 1
chown -R root:root .
find . \
@@ -48,9 +48,17 @@ cp -a *.ttf $PKG/usr/share/fonts/TTF/
mkdir -p $PKG/usr/doc/liberation-fonts-ttf-$VERSION
cp -a \
- AUTHORS COPYING* ChangeLog License.txt README \
+ AUTHORS COPYING* License.txt README* TODO \
$PKG/usr/doc/liberation-fonts-ttf-$VERSION
+# 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/etc/fonts/conf.{d,avail}
cat $CWD/60-liberation.conf > $PKG/etc/fonts/conf.avail/60-liberation.conf
( cd $PKG/etc/fonts/conf.d && \
diff --git a/source/x/libhangul/libhangul.SlackBuild b/source/x/libhangul/libhangul.SlackBuild
index feeae408..92a9ed16 100755
--- a/source/x/libhangul/libhangul.SlackBuild
+++ b/source/x/libhangul/libhangul.SlackBuild
@@ -1,7 +1,7 @@
#!/bin/sh
# Copyright 2008, 2009 Eric Hameleers , Eindhoven, NL
-# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN USA
+# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN USA
# All rights reserved.
#
# Permission to use, copy, modify, and distribute this software for
@@ -33,12 +33,22 @@
# -----------------------------------------------------------------------------
-PRGNAM=libhangul
-VERSION=${VERSION:-0.0.7}
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
+PKGNAM=libhangul
+VERSION=${VERSION:-0.0.12}
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 "}
+
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
LIBDIRSUFFIX=""
@@ -48,19 +58,22 @@ elif [ "$ARCH" = "s390" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
CWD=$(pwd)
TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
-rm -rf ${PRGNAM}-${VERSION}
-tar -xvf $CWD/${PRGNAM}-${VERSION}.tar.gz || exit 1
-cd ${PRGNAM}-${VERSION} || exit 1
+rm -rf ${PKGNAM}-${VERSION}
+tar -xvf $CWD/${PKGNAM}-${VERSION}.tar.?z* || exit 1
+cd ${PKGNAM}-${VERSION} || exit 1
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -86,12 +99,20 @@ make $NUMJOBS || make || exit 1
make DESTDIR=$PKG install || exit 1
# Add documentation:
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
cp -a \
- AUTHORS COPYING ChangeLog NEWS README \
- $PKG/usr/doc/$PRGNAM-$VERSION
+ AUTHORS COPYING* NEWS README* \
+ $PKG/usr/doc/$PKGNAM-$VERSION
find $PKG/usr/doc -type f -exec chmod 644 {} \;
+# 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/${PKGNAM}-$VERSION)
+ cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+ touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
# Compress the man page(s):
if [ -d $PKG/usr/man ]; then
find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \;
@@ -108,5 +129,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
# Build the package:
cd $PKG
-/sbin/makepkg --linkadd y --chown n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
+/sbin/makepkg --linkadd y --chown n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
diff --git a/source/x/m17n-lib/internal-flt.h b/source/x/m17n-lib/internal-flt.h
deleted file mode 100644
index e47dbb1f..00000000
--- a/source/x/m17n-lib/internal-flt.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* internal-flt.h -- common header file for the internal FLT API.
- Copyright (C) 2007
- National Institute of Advanced Industrial Science and Technology (AIST)
- Registration Number H15PRO112
-
- This file is part of the m17n library.
-
- The m17n library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public License
- as published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- The m17n library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the m17n library; if not, write to the Free
- Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- 02111-1307, USA. */
-
-#ifndef _M_INTERNAL_FLT_H
-#define _M_INTERNAL_FLT_H
-
-#define MAKE_COMBINING_CODE(base_y, base_x, add_y, add_x, off_y, off_x) \
- (((off_y) << 16) \
- | ((off_x) << 8) \
- | ((base_x) << 6) \
- | ((base_y) << 4) \
- | ((add_x) << 2) \
- | (add_y))
-
-#define COMBINING_CODE_OFF_Y(code) ((((code) >> 16) & 0xFF) - 128)
-#define COMBINING_CODE_OFF_X(code) ((((code) >> 8) & 0xFF) - 128)
-#define COMBINING_CODE_BASE_X(code) (((code) >> 6) & 0x3)
-#define COMBINING_CODE_BASE_Y(code) (((code) >> 4) & 0x3)
-#define COMBINING_CODE_ADD_X(code) (((code) >> 2) & 0x3)
-#define COMBINING_CODE_ADD_Y(code) ((code) & 0x3)
-
-#define MAKE_COMBINING_CODE_BY_CLASS(class) (0x1000000 | class)
-
-#define COMBINING_BY_CLASS_P(code) ((code) & 0x1000000)
-
-#define COMBINING_CODE_CLASS(code) ((code) & 0xFFFFFF)
-
-#define MAKE_PRECOMPUTED_COMBINDING_CODE() (0x2000000)
-
-#define COMBINING_PRECOMPUTED_P(code) ((code) & 0x2000000)
-
-extern MSymbol Mcombining;
-
-#endif /* _M_INTERNAL_FLT_H */
diff --git a/source/x/m17n-lib/m17n-docs_makefile.patch b/source/x/m17n-lib/m17n-docs_makefile.patch
deleted file mode 100644
index 11f88ef3..00000000
--- a/source/x/m17n-lib/m17n-docs_makefile.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- Makefile.in.orig 2007-12-28 02:15:49.000000000 +0100
-+++ Makefile.in 2008-01-29 13:43:46.000000000 +0100
-@@ -676,20 +676,20 @@
-
-
- install-pkgdataDATA: $(pkgdata_DATA)
-- $(mkinstalldirs) $(pkgdatadir)/html
-- $(mkinstalldirs) $(mandir)/man1 $(mandir)/man3 $(mandir)/man5
-- $(INSTALL_DATA) usr/latex/m17n-lib.dvi $(pkgdatadir)/m17n-lib.dvi
-- $(INSTALL_DATA) usr/latex/m17n-lib.ps $(pkgdatadir)/m17n-lib.ps
-+ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/html
-+ $(mkinstalldirs) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man3 $(DESTDIR)$(mandir)/man5
-+ $(INSTALL_DATA) usr/latex/m17n-lib.dvi $(DESTDIR)$(pkgdatadir)/m17n-lib.dvi
-+ $(INSTALL_DATA) usr/latex/m17n-lib.ps $(DESTDIR)$(pkgdatadir)/m17n-lib.ps
- cd usr/html; \
- for f in *.html *.png; do \
-- $(INSTALL_DATA) $$f $(pkgdatadir)/html/$$f; \
-+ $(INSTALL_DATA) $$f $(DESTDIR)$(pkgdatadir)/html/$$f; \
- done
- cd man/man1; \
-- for f in *.1; do $(INSTALL_DATA) $$f $(mandir)/man1/$$f; done
-+ for f in *.1; do $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man1/$$f; done
- cd man/man3; \
-- for f in *.3m17n; do $(INSTALL_DATA) $$f $(mandir)/man3/$$f; done
-+ for f in *.3m17n; do $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man3/$$f; done
- cd man/man5; \
-- for f in *.5; do $(INSTALL_DATA) $$f $(mandir)/man5/$$f; done
-+ for f in *.5; do $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man5/$$f; done
-
- @MAINTAINER_MODE_TRUE@usr-html html-usr: ${HTML_USR_TARGET}
- @MAINTAINER_MODE_TRUE@ja-html html-ja: ${HTML_JA_TARGET}
diff --git a/source/x/m17n-lib/m17n-lib.SlackBuild b/source/x/m17n-lib/m17n-lib.SlackBuild
index 02a5d29d..82cc38ad 100755
--- a/source/x/m17n-lib/m17n-lib.SlackBuild
+++ b/source/x/m17n-lib/m17n-lib.SlackBuild
@@ -1,7 +1,7 @@
#!/bin/sh
# Copyright 2008, 2009 Eric Hameleers, Eindhoven, NL
-# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN USA
+# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN USA
# All rights reserved.
#
# Permission to use, copy, modify, and distribute this software for
@@ -33,14 +33,24 @@
# -----------------------------------------------------------------------------
-PRGNAM=m17n-lib
+PKGNAM=m17n-lib
SHORTNAM=m17n
-VERSION=${VERSION:-1.5.4}
-DBVERSION=${DBVERSION:-1.5.4}
-DOCVERSION=${DOCVERSION:-1.5.2}
-ARCH=${ARCH:-x86_64}
+VERSION=${VERSION:-1.6.1}
+DBVERSION=${DBVERSION:-1.6.1}
+# Won't build && are not maintained for current version
+#DOCVERSION=${DOCVERSION:-1.5.5}
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 "}
DOCS="ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README TODO"
@@ -49,11 +59,11 @@ DOCS_DOC="AUTHORS COPYING ChangeLog INSTALL NEWS README"
CWD=$(pwd)
TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
-SOURCE[0]="$CWD/${PRGNAM}-${VERSION}.tar.gz"
-SOURCE[1]="$CWD/${SHORTNAM}-db-${DBVERSION}.tar.gz"
-SOURCE[2]="$CWD/${SHORTNAM}-docs-${DOCVERSION}.tar.gz"
+SOURCE[0]="$CWD/${PKGNAM}-${VERSION}.tar.xz"
+SOURCE[1]="$CWD/${SHORTNAM}-db-${DBVERSION}.tar.xz"
+#SOURCE[2]="$CWD/${SHORTNAM}-docs-${DOCVERSION}.tar.xz"
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -73,19 +83,16 @@ elif [ "$ARCH" = "armel" ]; then
fi
rm -rf $PKG
-mkdir -p $TMP/build-${PRGNAM} $PKG
+mkdir -p $TMP/build-${PKGNAM} $PKG
-cd $TMP/build-${PRGNAM}
+cd $TMP/build-${PKGNAM}
for (( i = 0; i < ${#SOURCE[*]}; i++ )) ; do
- tar -xvf ${SOURCE[$i]} || exit 1
+ tar xvf ${SOURCE[$i]} || exit 1
done
chown -R root:root *
chmod -R u+w,go+r-w,a-s *
-# Patch the docs makefile:
-( cd $SHORTNAM-docs-$DOCVERSION
- cat $CWD/${SHORTNAM}-docs_makefile.patch | patch -p0 --verbose || exit 1
-)
-cd ${PRGNAM}-${VERSION}
+
+cd ${PKGNAM}-${VERSION}
# Add the missing internal-flt.h file:
[ ! -r src/internal-flt.h ] && cp $CWD/internal-flt.h src/
@@ -125,32 +132,32 @@ make $NUMJOBS || make || exit 1
make DESTDIR=$PKG install || exit 1
cd ..
-# Compile and install the m17n user documentation:
-echo "Building the m17n user docs..."
-cd ${SHORTNAM}-docs-${DOCVERSION}
-CXXFLAGS="$SLKCFLAGS" \
-CFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --localstatedir=/var \
- --sysconfdir=/etc \
- --mandir=/usr/man \
- --program-prefix= \
- --program-suffix= \
- --build=$ARCH-slackware-linux
-make $NUMJOBS || make || exit 1
-make DESTDIR=$PKG install || exit 1
-cd ..
+## Compile and install the m17n user documentation:
+#echo "Building the m17n user docs..."
+#cd ${SHORTNAM}-docs-${DOCVERSION}
+#CXXFLAGS="$SLKCFLAGS" \
+#CFLAGS="$SLKCFLAGS" \
+#./configure \
+# --prefix=/usr \
+# --libdir=/usr/lib${LIBDIRSUFFIX} \
+# --localstatedir=/var \
+# --sysconfdir=/etc \
+# --mandir=/usr/man \
+# --program-prefix= \
+# --program-suffix= \
+# --build=$ARCH-slackware-linux
+#make $NUMJOBS || make || exit 1
+#make DESTDIR=$PKG install || exit 1
+#cd ..
# Add package documentation:
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/{db,docs}
-cd ${PRGNAM}-${VERSION}
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/{db,docs}
+cd ${PKGNAM}-${VERSION}
+cp -a $DOCS $PKG/usr/doc/$PKGNAM-$VERSION
cd ../${SHORTNAM}-db-${DBVERSION}
-cp -a $DOCS_DB $PKG/usr/doc/$PRGNAM-$VERSION/db
+cp -a $DOCS_DB $PKG/usr/doc/$PKGNAM-$VERSION/db
cd ../${SHORTNAM}-docs-${DOCVERSION}
-cp -a $DOCS_DOC $PKG/usr/doc/$PRGNAM-$VERSION/docs
+cp -a $DOCS_DOC $PKG/usr/doc/$PKGNAM-$VERSION/docs
cd ..
find $PKG/usr/doc -type f -exec chmod 644 {} \;
@@ -178,5 +185,5 @@ fi
# Build the package:
cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
diff --git a/source/x/mesa/get-mesa.sh b/source/x/mesa/get-mesa.sh
index 710043c6..c014d8a1 100644..100755
--- a/source/x/mesa/get-mesa.sh
+++ b/source/x/mesa/get-mesa.sh
@@ -1,8 +1,20 @@
+# Pull a stable branch + patches
+BRANCH=7.9
+
rm -rf mesa
git clone git://anongit.freedesktop.org/git/mesa/mesa
# package the source archive and clean up:
-( cd mesa ; find . -type d -name .git -exec rm -rf {} \; 2> /dev/null )
+( cd mesa
+ git checkout $BRANCH || exit 1
+)
+HEADISAT="$(cat mesa/.git/packed-refs | grep "refs/remotes/origin/${BRANCH}$" | cut -b1-7)"
+# Cleanup. We're not packing up the whole git repo.
+( cd mesa && find . -type d -name ".git*" -exec rm -rf {} \; 2> /dev/null )
DATE=$(date +%Y%m%d)
-mv mesa mesa-${DATE}_git
-tar cjf mesa-${DATE}_git.tar.bz2 mesa-${DATE}_git
-rm -rf mesa-${DATE}_git
+mv mesa Mesa-${BRANCH}_${HEADISAT}
+tar cf MesaLib-${BRANCH}_${HEADISAT}.tar Mesa-${BRANCH}_${HEADISAT}
+xz -9 MesaLib-${BRANCH}_${HEADISAT}.tar
+rm -rf MesaLib-${BRANCH}_${HEADISAT}
+echo
+echo "Mesa branch $BRANCH with HEAD at $HEADISAT packaged as MesaLib-${BRANCH}_${HEADISAT}.tar.xz"
+echo
diff --git a/source/x/mesa/mesa.SlackBuild b/source/x/mesa/mesa.SlackBuild
index d4579625..7bdc273e 100755
--- a/source/x/mesa/mesa.SlackBuild
+++ b/source/x/mesa/mesa.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2006, 2007, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -21,26 +21,23 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PKGNAM=mesa
-VERSION=${VERSION:-$(echo MesaLib-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=7.9.2
+DEMOVERS=8.0.1
BUILD=${BUILD:-1}
-PKG_VERSION=${VERSION}
+NUMJOBS=${NUMJOBS:--j8}
+
+# Be sure this list is up-to-date:
+DRI_DRIVERS="i810,i915,i965,mach64,mga,nouveau,r128,r200,r300,r600,radeon,savage,sis,tdfx,unichrome,swrast"
-# 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
-# Be sure this list is up-to-date:
-DRI_DRIVERS="i810,i915,i965,mach64,mga,r128,r200,r300,r600,radeon,savage,sis,tdfx,unichrome,swrast"
-
-NUMJOBS=${NUMJOBS:--j8}
-
CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=$TMP/package-mesa
@@ -60,9 +57,13 @@ rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
rm -rf Mesa-${VERSION}
-tar xvf $CWD/MesaLib-${PKG_VERSION}.tar.?z* || exit 1
-tar xvf $CWD/MesaGLUT-${PKG_VERSION}.tar.?z* || exit 1
-tar xvf $CWD/MesaDemos-${PKG_VERSION}.tar.?z* || exit 1
+
+tar xvf $CWD/MesaLib-${VERSION}.tar.?z* || exit 1
+# If MesaLib came from git, we might already have GLUT.
+if [ ! -d Mesa-${VERSION}/src/glut/glx ]; then
+ tar xvf $CWD/MesaGLUT-${VERSION}.tar.?z* || exit 1
+fi
+
cd Mesa-$VERSION
# Make sure ownerships and permissions are sane:
@@ -73,6 +74,27 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# Apply patches from git (and maybe elsewhere):
+# Patches obtained by:
+# git checkout origin/7.9
+# git format-patch 67aeab0b77fb6be864088e69ea74a010b6543fa1..
+if /bin/ls $CWD/patches/*.patch 1> /dev/null 2> /dev/null ; then
+ for patch in $CWD/patches/*.patch ; do
+ patch -p1 < $patch || exit 1 ;
+ done
+fi
+
+# Revert "i915: Enable ARB_fragment_shader by default."
+# https://bugzilla.redhat.com/show_bug.cgi?id=643399
+zcat $CWD/patches/i915_fragment_shader_disable.patch.gz | patch -p1 || exit 1
+
+# Allow to build against libdrm-2.4.23:
+zcat $CWD/patches/mesa-7.9-libdrm-2.4.23-nouveau-api.patch.gz | patch -p1 || exit 1
+
+if [ ! -r configure ]; then
+ autoreconf || exit 1
+fi
+
CFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
@@ -82,64 +104,72 @@ CFLAGS="$SLKCFLAGS" \
--docdir=/usr/doc/mesa-$VERSION \
--with-dri-driverdir=/usr/lib${LIBDIRSUFFIX}/xorg/modules/dri \
--with-dri-drivers="$DRI_DRIVERS" \
+ --enable-xcb \
+ --enable-gallium-nouveau \
--build=$ARCH-slackware-linux
-# Nobody else is enabling this. Seems like it's asking for trouble.
-# --enable-xcb
-
-# This doesn't seem to build - maybe it needs something else...
-# --enable-gallium-nouveau
+# --enable-gallium-llvm \
+# --enable-gallium-swrast \
+# --disable-gallium-svga \
+# --disable-gallium-i915 \
+# --disable-gallium-i965 \
+# --disable-gallium-radeon \
+# --disable-gallium-r600 \
make $NUMJOBS || make || exit 1
make install DESTDIR=$PKG || exit 1
-# Install gears and glinfo:
-mkdir -p $PKG/usr/bin
-cp -a progs/demos/gears $PKG/usr/bin/gears
-cp -a progs/demos/glinfo $PKG/usr/bin/glinfo
-
-# Install some "demos":
-( cd progs/xdemos
- cp glthreads glxcontexts glxdemo glxgears glxgears_fbconfig glxheads \
- glxinfo glxpbdemo glxpixmap \
- $PKG/usr/bin
+# Now install the demos
+( cd $TMP
+ rm -rf mesa-demos-$DEMOVERS
+ tar xvf $CWD/mesa-demos-$DEMOVERS.tar.?z* || exit 1
+ cd mesa-demos-$DEMOVERS
+ 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 {} \;
+ CFLAGS="$SLKCFLAGS" \
+ ./configure \
+ --prefix=/usr \
+ --build=$ARCH-slackware-linux
+ # Build and install gears and glinfo, as well as a few other demos
+ make -C src/demos gears glinfo
+ make -C src/xdemos \
+ glthreads glxcontexts glxdemo glxgears glxgears_fbconfig \
+ glxheads glxinfo glxpbdemo glxpixmap
+ mkdir -p $PKG/usr/bin
+ cp -a src/demos/{gears,glinfo} $PKG/usr/bin
+ for i in glthreads glxcontexts glxdemo glxgears glxgears_fbconfig \
+ glxheads glxinfo glxpbdemo glxpixmap ; do
+ cp -a src/xdemos/$i $PKG/usr/bin ;
+ done
)
-
+
# Strip binaries:
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-# Compress and link manpages, if any:
-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
- ln -s $( readlink $eachpage ).gz $eachpage.gz
- rm $eachpage
- done
- gzip -9 *.?
- )
- done
- )
-fi
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
# Compress info files, if any:
if [ -d $PKG/usr/info ]; then
- ( cd $PKG/usr/info
- rm -f dir
- gzip -9 *
- )
+ rm -f $PKG/usr/info/dir
+ gzip -9 $PKG/usr/info/*
fi
-mkdir -p $PKG/usr/doc/Mesa-$PKG_VERSION/html
-cp -a COPYING docs/relnotes-$VERSION.html $PKG/usr/doc/Mesa-$PKG_VERSION
-rm -f docs/relnotes*.html docs/RELNOTES*
-cp -a docs/*.html $PKG/usr/doc/Mesa-$PKG_VERSION/html
+mkdir -p $PKG/usr/doc/Mesa-$VERSION/html
+cp -a \
+ docs/COPYING* docs/relnotes-${VERSION}*.html docs/README* docs/GL* \
+ $PKG/usr/doc/Mesa-$VERSION
+cp -a docs/*.html $PKG/usr/doc/Mesa-$VERSION/html
+rm -f $PKG/usr/doc/Mesa-$VERSION/html/relnotes*.html
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$PKG_VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/x/mesa/mesa.url b/source/x/mesa/mesa.url
index f4efeae6..3f30cc84 100644
--- a/source/x/mesa/mesa.url
+++ b/source/x/mesa/mesa.url
@@ -1 +1,2 @@
ftp://ftp.freedesktop.org/pub/mesa/
+ftp://ftp.freedesktop.org/pub/mesa/demos/
diff --git a/source/x/mesa/patches/i915_fragment_shader_disable.patch b/source/x/mesa/patches/i915_fragment_shader_disable.patch
new file mode 100644
index 00000000..d2aee8e7
--- /dev/null
+++ b/source/x/mesa/patches/i915_fragment_shader_disable.patch
@@ -0,0 +1,26 @@
+From e5a4106be7c8b87821f6b5d21fec99a402825740 Mon Sep 17 00:00:00 2001
+From: Robert Hooker <sarvatt@ubuntu.com>
+Date: Wed, 8 Sep 2010 12:33:09 -0400
+Subject: [PATCH] Revert "i915: Enable ARB_fragment_shader by default."
+
+This reverts commit a58514cc9c5cc5867f9140700462c5ac5749550d.
+---
+ src/mesa/drivers/dri/intel/intel_screen.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
+index 0a542a7..8ae2cd2 100644
+--- a/src/mesa/drivers/dri/intel/intel_screen.c
++++ b/src/mesa/drivers/dri/intel/intel_screen.c
+@@ -70,7 +70,7 @@ PUBLIC const char __driConfigOptions[] =
+ DRI_CONF_DESC(en, "Enable early Z in classic mode (unstable, 945-only).")
+ DRI_CONF_OPT_END
+
+- DRI_CONF_OPT_BEGIN(fragment_shader, bool, true)
++ DRI_CONF_OPT_BEGIN(fragment_shader, bool, false)
+ DRI_CONF_DESC(en, "Enable limited ARB_fragment_shader support on 915/945.")
+ DRI_CONF_OPT_END
+
+--
+1.7.2
+
diff --git a/source/x/mesa/patches/mesa-7.9-libdrm-2.4.23-nouveau-api.patch b/source/x/mesa/patches/mesa-7.9-libdrm-2.4.23-nouveau-api.patch
new file mode 100644
index 00000000..d0ce04d2
--- /dev/null
+++ b/source/x/mesa/patches/mesa-7.9-libdrm-2.4.23-nouveau-api.patch
@@ -0,0 +1,89 @@
+diff -ur a/src/gallium/drivers/nouveau/nouveau_screen.c b/src/gallium/drivers/nouveau/nouveau_screen.c
+--- a/src/gallium/drivers/nouveau/nouveau_screen.c 2010-10-02 00:51:28.000000000 +0200
++++ b/src/gallium/drivers/nouveau/nouveau_screen.c 2010-12-11 18:18:20.527000045 +0100
+@@ -236,7 +236,7 @@
+ int ret;
+
+ ret = nouveau_channel_alloc(dev, 0xbeef0201, 0xbeef0202,
+- &screen->channel);
++ 512*1024, &screen->channel);
+ if (ret)
+ return ret;
+ screen->device = dev;
+diff -ur a/src/mesa/drivers/dri/nouveau/nouveau_context.c b/src/mesa/drivers/dri/nouveau/nouveau_context.c
+--- a/src/mesa/drivers/dri/nouveau/nouveau_context.c 2010-10-05 03:58:00.000000000 +0200
++++ b/src/mesa/drivers/dri/nouveau/nouveau_context.c 2010-12-11 18:18:20.528000045 +0100
+@@ -129,7 +129,7 @@
+
+ /* Allocate a hardware channel. */
+ ret = nouveau_channel_alloc(context_dev(ctx), 0xbeef0201, 0xbeef0202,
+- &nctx->hw.chan);
++ 512*1024, &nctx->hw.chan);
+ if (ret) {
+ nouveau_error("Error initializing the FIFO.\n");
+ return GL_FALSE;
+Nur in b/src/mesa/drivers/dri/nouveau: nouveau_context.c.orig.
+diff -ur a/src/mesa/drivers/dri/nouveau/nouveau_surface.c b/src/mesa/drivers/dri/nouveau/nouveau_surface.c
+--- a/src/mesa/drivers/dri/nouveau/nouveau_surface.c 2010-04-27 23:41:21.000000000 +0200
++++ b/src/mesa/drivers/dri/nouveau/nouveau_surface.c 2010-12-11 18:09:19.750000046 +0100
+@@ -34,8 +34,8 @@
+ unsigned flags, unsigned format,
+ unsigned width, unsigned height)
+ {
+- unsigned tile_mode, cpp = _mesa_get_format_bytes(format);
+- int ret;
++ unsigned tile_mode = 0, tile_flags = 0;
++ int ret, cpp = _mesa_get_format_bytes(format);
+
+ nouveau_bo_ref(NULL, &s->bo);
+
+@@ -51,13 +51,21 @@
+ if (layout == TILED) {
+ s->pitch = align(s->pitch, 256);
+ tile_mode = s->pitch;
++
++ if (cpp == 4)
++ tile_flags = NOUVEAU_BO_TILE_32BPP;
++ else if (cpp == 2)
++ tile_flags = NOUVEAU_BO_TILE_16BPP;
++
++ if (_mesa_get_format_bits(format, GL_DEPTH_BITS))
++ tile_flags |= NOUVEAU_BO_TILE_ZETA;
++
+ } else {
+ s->pitch = align(s->pitch, 64);
+- tile_mode = 0;
+ }
+
+ ret = nouveau_bo_new_tile(context_dev(ctx), flags, 0, s->pitch * height,
+- tile_mode, 0, &s->bo);
++ tile_mode, tile_flags, &s->bo);
+ assert(!ret);
+ }
+
+diff -ur a/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c b/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c
+--- a/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c 2010-10-05 03:58:00.000000000 +0200
++++ b/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c 2010-12-11 18:18:20.528000045 +0100
+@@ -32,7 +32,7 @@
+
+ /* Arbitrary pushbuf length we can assume we can get with a single
+ * WAIT_RING. */
+-#define PUSHBUF_DWORDS 2048
++#define PUSHBUF_DWORDS 65536
+
+ /* Functions to set up struct nouveau_array_state from something like
+ * a GL array or index buffer. */
+diff -ur a/src/mesa/drivers/dri/nouveau/nv10_state_fb.c b/src/mesa/drivers/dri/nouveau/nv10_state_fb.c
+--- a/src/mesa/drivers/dri/nouveau/nv10_state_fb.c 2010-10-05 03:58:00.000000000 +0200
++++ b/src/mesa/drivers/dri/nouveau/nv10_state_fb.c 2010-12-11 18:15:17.756000046 +0100
+@@ -64,8 +64,8 @@
+
+ if (!nfb->lma_bo || nfb->lma_bo->size != size) {
+ nouveau_bo_ref(NULL, &nfb->lma_bo);
+- nouveau_bo_new(context_dev(ctx), NOUVEAU_BO_VRAM, 0, size,
+- &nfb->lma_bo);
++ nouveau_bo_new_tile(context_dev(ctx), NOUVEAU_BO_VRAM, 0, size,
++ 0, NOUVEAU_BO_TILE_ZETA, &nfb->lma_bo);
+ }
+
+ nouveau_bo_markl(bctx, celsius, NV17TCL_LMA_DEPTH_BUFFER_OFFSET,
diff --git a/source/x/radeon_ucode/radeon_ucode.SlackBuild b/source/x/radeon_ucode/radeon_ucode.SlackBuild
new file mode 100755
index 00000000..7482b4cc
--- /dev/null
+++ b/source/x/radeon_ucode/radeon_ucode.SlackBuild
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+# Slackware build script for radeon_ucode
+
+# Copyright 2010 Robby Workman, Northport, Alabama, USA
+# Copyright 2010, 2011 Patrick Volkerding, Sebeka, MN, 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.
+
+PKGNAM=radeon_ucode
+VERSION=20110302
+BUILD=${BUILD:-1}
+
+ARCH=noarch
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $PKG/lib/firmware/radeon $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a $CWD/ucode-$VERSION/* $PKG/lib/firmware/radeon
+mv $PKG/lib/firmware/radeon/LICENSE.radeon $PKG/usr/doc/$PKGNAM-$VERSION
+
+chown -R root:root $PKG
+find $PKG \
+ \( -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 {} \;
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/x/radeon_ucode/slack-desc b/source/x/radeon_ucode/slack-desc
new file mode 100644
index 00000000..01810b94
--- /dev/null
+++ b/source/x/radeon_ucode/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------------------------------------------------------|
+radeon_ucode: radeon_ucode (microcode/firmware for some Radeon graphics cards)
+radeon_ucode:
+radeon_ucode: radeon_ucode contains the microcode/firmware for some models of
+radeon_ucode: ATI/AMD Radeon graphics cards.
+radeon_ucode:
+radeon_ucode: http://people.freedesktop.org/~agd5f/radeon_ucode/
+radeon_ucode:
+radeon_ucode:
+radeon_ucode:
+radeon_ucode:
+radeon_ucode:
diff --git a/source/x/radeon_ucode/ucode-20110302/LICENSE.radeon b/source/x/radeon_ucode/ucode-20110302/LICENSE.radeon
new file mode 100644
index 00000000..2542d649
--- /dev/null
+++ b/source/x/radeon_ucode/ucode-20110302/LICENSE.radeon
@@ -0,0 +1,51 @@
+Copyright (C) 2009-2011 Advanced Micro Devices, Inc. All rights reserved.
+
+REDISTRIBUTION: Permission is hereby granted, free of any license fees,
+to any person obtaining a copy of this microcode (the "Software"), to
+install, reproduce, copy and distribute copies, in binary form only, of
+the Software and to permit persons to whom the Software is provided to
+do the same, provided that the following conditions are met:
+
+No reverse engineering, decompilation, or disassembly of this Software
+is permitted.
+
+Redistributions must reproduce the above copyright notice, this
+permission notice, and the following disclaimers and notices in the
+Software documentation and/or other materials provided with the
+Software.
+
+DISCLAIMER: THE USE OF THE SOFTWARE IS AT YOUR SOLE RISK. THE SOFTWARE
+IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND AND COPYRIGHT
+HOLDER AND ITS LICENSORS EXPRESSLY DISCLAIM ALL WARRANTIES, EXPRESS AND
+IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+COPYRIGHT HOLDER AND ITS LICENSORS DO NOT WARRANT THAT THE SOFTWARE WILL
+MEET YOUR REQUIREMENTS, OR THAT THE OPERATION OF THE SOFTWARE WILL BE
+UNINTERRUPTED OR ERROR-FREE. THE ENTIRE RISK ASSOCIATED WITH THE USE OF
+THE SOFTWARE IS ASSUMED BY YOU. FURTHERMORE, COPYRIGHT HOLDER AND ITS
+LICENSORS DO NOT WARRANT OR MAKE ANY REPRESENTATIONS REGARDING THE USE
+OR THE RESULTS OF THE USE OF THE SOFTWARE IN TERMS OF ITS CORRECTNESS,
+ACCURACY, RELIABILITY, CURRENTNESS, OR OTHERWISE.
+
+DISCLAIMER: UNDER NO CIRCUMSTANCES INCLUDING NEGLIGENCE, SHALL COPYRIGHT
+HOLDER AND ITS LICENSORS OR ITS DIRECTORS, OFFICERS, EMPLOYEES OR AGENTS
+("AUTHORIZED REPRESENTATIVES") BE LIABLE FOR ANY INCIDENTAL, INDIRECT,
+SPECIAL OR CONSEQUENTIAL DAMAGES (INCLUDING DAMAGES FOR LOSS OF BUSINESS
+PROFITS, BUSINESS INTERRUPTION, LOSS OF BUSINESS INFORMATION, AND THE
+LIKE) ARISING OUT OF THE USE, MISUSE OR INABILITY TO USE THE SOFTWARE,
+BREACH OR DEFAULT, INCLUDING THOSE ARISING FROM INFRINGEMENT OR ALLEGED
+INFRINGEMENT OF ANY PATENT, TRADEMARK, COPYRIGHT OR OTHER INTELLECTUAL
+PROPERTY RIGHT EVEN IF COPYRIGHT HOLDER AND ITS AUTHORIZED
+REPRESENTATIVES HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. IN
+NO EVENT SHALL COPYRIGHT HOLDER OR ITS AUTHORIZED REPRESENTATIVES TOTAL
+LIABILITY FOR ALL DAMAGES, LOSSES, AND CAUSES OF ACTION (WHETHER IN
+CONTRACT, TORT (INCLUDING NEGLIGENCE) OR OTHERWISE) EXCEED THE AMOUNT OF
+US$10.
+
+Notice: The Software is subject to United States export laws and
+regulations. You agree to comply with all domestic and international
+export laws and regulations that apply to the Software, including but
+not limited to the Export Administration Regulations administered by the
+U.S. Department of Commerce and International Traffic in Arm Regulations
+administered by the U.S. Department of State. These laws include
+restrictions on destinations, end users and end use.
diff --git a/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent-application.cpp.patch b/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent-application.cpp.patch
new file mode 100644
index 00000000..f925507a
--- /dev/null
+++ b/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent-application.cpp.patch
@@ -0,0 +1,11 @@
+--- scim-bridge-0.4.16/agent/scim-bridge-agent-application.cpp.bak 2009-01-18 01:04:20.000000000 +0800
++++ scim-bridge-0.4.16/agent/scim-bridge-agent-application.cpp 2010-09-11 22:38:27.196979199 +0800
+@@ -65,7 +65,7 @@
+ unsigned int tmp_uint;
+
+ int option = 0;
+- while (option != EOF) {
++ while (option != -1) {
+ option = getopt_long (argc, argv, short_options, long_options, NULL);
+ switch (option) {
+ case 'v':
diff --git a/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent-imcontext.cpp.patch b/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent-imcontext.cpp.patch
new file mode 100644
index 00000000..85732013
--- /dev/null
+++ b/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent-imcontext.cpp.patch
@@ -0,0 +1,48 @@
+--- scim-bridge-0.4.16/agent/scim-bridge-agent-imcontext.cpp.bak 2009-02-03 22:36:14.000000000 +0800
++++ scim-bridge-0.4.16/agent/scim-bridge-agent-imcontext.cpp 2010-09-11 23:25:00.636978519 +0800
+@@ -60,6 +60,8 @@
+
+ static bool on_the_spot_enabled = true;
+
++static String help_hotkeys = "";
++
+ /* Class definition */
+ class ScimBridgeAgentIMContextImpl: public ScimBridgeAgentIMContext
+ {
+@@ -274,6 +276,12 @@
+ }
+
+
++void ScimBridgeAgentIMContext::set_help_hotkeys (const String &hotkey_str)
++{
++ help_hotkeys = hotkey_str;
++}
++
++
+ ScimBridgeAgentIMContextImpl::ScimBridgeAgentIMContextImpl (ScimBridgeAgentClientListener *new_client_listener):
+ client_listener (new_client_listener), imengine (NULL), enabled (false), focused(false) ,preedit_mode (PREEDIT_ANY),
+ preedit_shown (false), preedit_cursor_position (0)
+@@ -654,6 +662,8 @@
+
+ void ScimBridgeAgentIMContextImpl::focus_out ()
+ {
++ if (!imengine_shared && imengine == NULL) alloc_imengine ();
++
+ ScimBridgeAgentIMContext *focused_imcontext = static_cast<ScimBridgeAgentIMContext*> (get_imengine ()->get_frontend_data ());
+
+ if ( !focused )
+@@ -923,9 +933,11 @@
+
+ void ScimBridgeAgentIMContextImpl::panel_request_help ()
+ {
+- String help = String ("Smart Common Input Method platform ") +
+- String (SCIM_VERSION) +
+- String ("\n(C) 2002-2005 James Su <suzhe@tsinghua.org.cn>\n\n");
++ String help = String ("SCIM Bridge") +
++ String (VERSION) +
++ String ("\n(C) 2006-2008 Ryo Dairiki <ryo-dairiki@users.sourceforge.net>\n") +
++ help_hotkeys +
++ String ("\n\n");
+
+ IMEngineFactoryPointer factory = scim_backend->get_factory (get_imengine ()->get_factory_uuid ());
+ if (factory.null ()) factory = fallback_imengine_factory;
diff --git a/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent-imcontext.h.patch b/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent-imcontext.h.patch
new file mode 100644
index 00000000..f16b34c1
--- /dev/null
+++ b/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent-imcontext.h.patch
@@ -0,0 +1,24 @@
+--- scim-bridge-0.4.16/agent/scim-bridge-agent-imcontext.h.bak 2008-11-02 14:44:49.000000000 +0800
++++ scim-bridge-0.4.16/agent/scim-bridge-agent-imcontext.h 2010-09-11 23:12:18.085979961 +0800
+@@ -130,6 +130,21 @@
+ static void set_enabled_by_default (bool enabled);
+
+ /**
++ * Get the hotkey help messages.
++ *
++ * @return help messages about hotkeys.
++ */
++ static scim::String get_help_hotkeys ();
++
++ /**
++ * Set the hotkey help messages.
++ *
++ * @param hotkey_str Help message about hotkeys.
++ *
++ */
++ static void set_help_hotkeys (const scim::String &hotkey_str);
++
++ /**
+ * Destructor.
+ */
+ virtual ~ScimBridgeAgentIMContext () {}
diff --git a/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent.cpp.patch b/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent.cpp.patch
new file mode 100644
index 00000000..27c5cb73
--- /dev/null
+++ b/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-agent.cpp.patch
@@ -0,0 +1,30 @@
+--- scim-bridge-0.4.16/agent/scim-bridge-agent.cpp.bak 2009-03-08 21:07:29.000000000 +0800
++++ scim-bridge-0.4.16/agent/scim-bridge-agent.cpp 2010-09-11 22:59:34.476979479 +0800
+@@ -542,6 +542,27 @@
+ scim_global_config_flush ();
+
+ scim_keyboard_layout = scim_get_default_keyboard_layout ();
++
++ // Hot key name, hot key config key.
++ // ! Update hotkey_list_length according to updated list length.
++ int hotkey_list_length = 6;
++ String hotkey_list[][2] = {
++ { "Toggle on/off - ", "/Hotkeys/FrontEnd/Trigger" },
++ { "Turn on - ", "/Hotkeys/FrontEnd/On" },
++ { "Turn off - ", "/Hotkeys/FrontEnd/Off" },
++ { "Next input method - ", "/Hotkeys/FrontEnd/NextFactory" },
++ { "Previous input method - ", "/Hotkeys/FrontEnd/PreviousFactory" },
++ { "Show input method menu - ", "/Hotkeys/FrontEnd/ShowFactoryMenu" }
++ };
++
++ // Undefined hot keys are hidden from help window.
++ String help_hotkeys = "\nGlobal Hotkeys:";
++ for ( int i = 0; i < hotkey_list_length; i++ ) {
++ String tmp_hotkeys = scim_config->read (String (hotkey_list[i][1]), String (""));
++ if ( tmp_hotkeys != "" )
++ help_hotkeys += "\n" + hotkey_list[i][0] + "<" + tmp_hotkeys + ">";
++ }
++ ScimBridgeAgentIMContext::set_help_hotkeys (help_hotkeys);
+ }
+
+
diff --git a/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-client-imcontext-gtk.c.patch b/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-client-imcontext-gtk.c.patch
new file mode 100644
index 00000000..21f1f824
--- /dev/null
+++ b/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-client-imcontext-gtk.c.patch
@@ -0,0 +1,47 @@
+--- scim-bridge-0.4.16/client-gtk/scim-bridge-client-imcontext-gtk.c.bak 2008-11-02 14:44:23.000000000 +0800
++++ scim-bridge-0.4.16/client-gtk/scim-bridge-client-imcontext-gtk.c 2010-09-11 23:19:10.556978680 +0800
+@@ -35,6 +35,8 @@
+ #include "scim-bridge-output.h"
+ #include "scim-bridge-string.h"
+
++#define SEND_EVENT_MASK 0x02
++
+ /* Typedef */
+ struct _ScimBridgeClientIMContext
+ {
+@@ -200,7 +202,7 @@
+ {
+ scim_bridge_pdebugln (7, "key_snooper ()");
+
+- if (!event->send_event && scim_bridge_client_is_messenger_opened () && focused_imcontext != NULL) {
++ if (!(event->send_event & SEND_EVENT_MASK) && scim_bridge_client_is_messenger_opened () && focused_imcontext != NULL) {
+ if (focused_imcontext->client_window != NULL) {
+ int new_window_x;
+ int new_window_y;
+@@ -556,7 +558,7 @@
+ {
+ GdkEventKey gdk_event;
+ scim_bridge_key_event_bridge_to_gdk (&gdk_event, imcontext->client_window, key_event);
+- gdk_event.send_event = TRUE;
++ gdk_event.send_event |= SEND_EVENT_MASK;
+ if (imcontext == focused_imcontext && focused_widget != NULL) {
+ const char *signal_name = NULL;
+ if (scim_bridge_key_event_is_pressed (key_event)) {
+@@ -762,7 +764,7 @@
+
+ ScimBridgeClientIMContext *imcontext = SCIM_BRIDGE_CLIENT_IMCONTEXT (context);
+
+- if (!event->send_event && scim_bridge_client_is_messenger_opened () && imcontext != NULL && !key_snooper_used) {
++ if (!(event->send_event & SEND_EVENT_MASK) && scim_bridge_client_is_messenger_opened () && imcontext != NULL && !key_snooper_used) {
+
+ if (imcontext->client_window != NULL) {
+ int new_window_x;
+@@ -875,7 +877,7 @@
+ scim_bridge_client_open_messenger ();
+ }
+
+- if (is_key_snooper_enabled ()) {
++ if (!key_snooper_used && is_key_snooper_enabled ()) {
+ key_snooper_id = gtk_key_snooper_install ((GtkKeySnoopFunc) &key_snooper, NULL);
+ key_snooper_used = TRUE;
+ }
diff --git a/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-client-imcontext-qt.cpp.patch b/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-client-imcontext-qt.cpp.patch
new file mode 100644
index 00000000..74a3252e
--- /dev/null
+++ b/source/x/scim-bridge/patches/scim-bridge-0.4.16-scim-bridge-client-imcontext-qt.cpp.patch
@@ -0,0 +1,31 @@
+--- scim-bridge-0.4.16/client-qt/scim-bridge-client-imcontext-qt.cpp.bak 2008-11-02 14:44:46.000000000 +0800
++++ scim-bridge-0.4.16/client-qt/scim-bridge-client-imcontext-qt.cpp 2010-09-11 22:46:10.396979441 +0800
+@@ -220,7 +220,12 @@
+ {
+ scim_bridge_pdebugln (4, "ScimBridgeClientIMContextImpl::setFocusWidget ()");
+ QInputContext::setFocusWidget (widget);
+- focus_in ();
++ if (widget == NULL) {
++ focus_out ();
++ }
++ else {
++ focus_in ();
++ }
+ update ();
+ }
+
+@@ -442,9 +447,11 @@
+ }
+ }
+
+- set_preedit_shown (false);
+- update_preedit ();
+-
++ if (preedit_shown) {
++ set_preedit_shown (false);
++ update_preedit ();
++ }
++
+ focused_imcontext = NULL;
+ }
+
diff --git a/source/x/scim-bridge/scim-bridge.SlackBuild b/source/x/scim-bridge/scim-bridge.SlackBuild
index 90354fd7..c3494c8b 100755
--- a/source/x/scim-bridge/scim-bridge.SlackBuild
+++ b/source/x/scim-bridge/scim-bridge.SlackBuild
@@ -1,7 +1,7 @@
#!/bin/sh
# Copyright 2008, 2009 Eric Hameleers, Eindhoven, NL
-# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN USA
+# Copyright 2008, 2009, 2011 Patrick J. Volkerding, Sebeka, MN USA
# All rights reserved.
#
# Permission to use, copy, modify, and distribute this software for
@@ -35,8 +35,17 @@
PRGNAM=scim-bridge
VERSION=${VERSION:-0.4.16}
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-5}
+
+# 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 "}
@@ -68,6 +77,14 @@ rm -rf ${PRGNAM}-${VERSION}
tar -xvf $CWD/${PRGNAM}-${VERSION}.tar.gz || exit 1
cd ${PRGNAM}-${VERSION} || exit 1
#sed -i -e "s/ -doxygen / doxygen /" $( grep -lr ' -doxygen ' * )
+
+zcat $CWD/patches/scim-bridge-0.4.16-scim-bridge-agent-application.cpp.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/patches/scim-bridge-0.4.16-scim-bridge-agent-imcontext.cpp.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/patches/scim-bridge-0.4.16-scim-bridge-agent-imcontext.h.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/patches/scim-bridge-0.4.16-scim-bridge-agent.cpp.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/patches/scim-bridge-0.4.16-scim-bridge-client-imcontext-gtk.c.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/patches/scim-bridge-0.4.16-scim-bridge-client-imcontext-qt.cpp.patch.gz | patch -p1 --verbose || exit 1
+
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -114,7 +131,7 @@ EOINS
# Add documentation:
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a \
- AUTHORS COPYING ChangeLog INSTALL NEWS README doc/LICENSE.* \
+ AUTHORS COPYING* ChangeLog INSTALL NEWS README* doc/LICENSE.* \
$PKG/usr/doc/$PRGNAM-$VERSION
find $PKG/usr/doc -type f -exec chmod 644 {} \;
diff --git a/source/x/scim/scim-1.4.9-fix-ltdl.cpp.patch b/source/x/scim/scim-1.4.9-fix-ltdl.cpp.patch
new file mode 100644
index 00000000..1d9590fd
--- /dev/null
+++ b/source/x/scim/scim-1.4.9-fix-ltdl.cpp.patch
@@ -0,0 +1,11 @@
+--- scim-1.4.9/src/ltdl.cpp.bak 2008-11-02 14:42:40.000000000 +0800
++++ scim-1.4.9/src/ltdl.cpp 2010-09-12 00:23:24.085978400 +0800
+@@ -3361,7 +3361,7 @@
+ {
+ lt_dlhandle handle = 0;
+ char * tmp = 0;
+- char * ext = 0;
++ const char * ext = 0;
+ size_t len;
+ int errors = 0;
+
diff --git a/source/x/scim/scim.SlackBuild b/source/x/scim/scim.SlackBuild
index 168ae991..c0c50fb4 100755
--- a/source/x/scim/scim.SlackBuild
+++ b/source/x/scim/scim.SlackBuild
@@ -1,7 +1,7 @@
#!/bin/sh
# Copyright 2006,2007,2008 Eric Hameleers, Eindhoven, NL
-# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN USA
+# Copyright 2008, 2009, 2011 Patrick J. Volkerding, Sebeka, MN USA
# All rights reserved.
#
# Permission to use, copy, modify, and distribute this software for
@@ -35,9 +35,17 @@
PRGNAM=scim
VERSION=${VERSION:-1.4.9}
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-5}
+
+# 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
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -56,6 +64,8 @@ elif [ "$ARCH" = "armel" ]; then
LIBDIRSUFFIX=""
fi
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PRGNAM
@@ -65,8 +75,11 @@ mkdir -p $TMP $PKG
cd $TMP
rm -rf ${PRGNAM}-${VERSION}
-tar -xvf $CWD/${PRGNAM}-${VERSION}.tar.gz
+tar xvf $CWD/${PRGNAM}-${VERSION}.tar.?z* || exit 1
cd ${PRGNAM}-${VERSION} || exit 1
+
+zcat $CWD/scim-1.4.9-fix-ltdl.cpp.patch.gz | patch -p1 --verbose || exit 1
+
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/source/x/tibmachuni-font-ttf/tibmachuni-font-ttf.SlackBuild b/source/x/tibmachuni-font-ttf/tibmachuni-font-ttf.SlackBuild
index e553bdcf..8b31393f 100755
--- a/source/x/tibmachuni-font-ttf/tibmachuni-font-ttf.SlackBuild
+++ b/source/x/tibmachuni-font-ttf/tibmachuni-font-ttf.SlackBuild
@@ -34,7 +34,7 @@
PRGNAM=tibmachuni-font-ttf
-VERSION=${VERSION:-1.901}
+VERSION=${VERSION:-1.901b}
ARCH=noarch
BUILD=${BUILD:-1}
@@ -68,6 +68,7 @@ find . \
-exec chmod 755 {} \; -o \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+cd TibetanMachineUnicodeFont
# Install font:
if [ ! -r TibMachUni-${VERSION}.ttf ]; then
diff --git a/source/x/x11-skel/doinst.sh b/source/x/x11-skel/doinst.sh
index 05e7fb0f..a2d2d8c6 100644
--- a/source/x/x11-skel/doinst.sh
+++ b/source/x/x11-skel/doinst.sh
@@ -15,7 +15,7 @@
# your /usr/X11R6 directory will be moved to /usr/X11R6.bak.
# Anything you really want want to keep will need to be merged back
# by hand.
-if [ ! -L /usr/X11R6/bin ]; then
+if [ ! -L usr/X11R6/bin ]; then
if [ -d usr/X11R6 ]; then
mv usr/X11R6 usr/X11R6.bak
fi
diff --git a/source/x/x11-skel/x11-skel.SlackBuild b/source/x/x11-skel/x11-skel.SlackBuild
index b21b325c..cd8559b7 100755
--- a/source/x/x11-skel/x11-skel.SlackBuild
+++ b/source/x/x11-skel/x11-skel.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2011 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -22,8 +22,17 @@
VERSION=7.4
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
+
+# 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
if [ "$ARCH" = "x86_64" ]; then
LIBDIRSUFFIX="64"
diff --git a/source/x/x11/build/ico b/source/x/x11/build/libX11
index 0cfbf088..0cfbf088 100644
--- a/source/x/x11/build/ico
+++ b/source/x/x11/build/libX11
diff --git a/source/x/x11/build/lndir b/source/x/x11/build/lndir
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/lndir
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/oclock b/source/x/x11/build/oclock
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/oclock
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/printproto b/source/x/x11/build/printproto
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/printproto
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/proxymngr b/source/x/x11/build/proxymngr
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/proxymngr
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/rendercheck b/source/x/x11/build/rendercheck
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/rendercheck
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/scripts b/source/x/x11/build/scripts
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/scripts
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/trapproto b/source/x/x11/build/trapproto
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/trapproto
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/twm b/source/x/x11/build/twm
deleted file mode 100644
index 00750edc..00000000
--- a/source/x/x11/build/twm
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/x/x11/build/libXTrap b/source/x/x11/build/xcompmgr
index 0cfbf088..0cfbf088 100644
--- a/source/x/x11/build/libXTrap
+++ b/source/x/x11/build/xcompmgr
diff --git a/source/x/x11/build/xconsole b/source/x/x11/build/xconsole
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xconsole
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xdbedizzy b/source/x/x11/build/xdbedizzy
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xdbedizzy
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xditview b/source/x/x11/build/xditview
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xditview
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/libXevie b/source/x/x11/build/xf86-input-acecad
index 0cfbf088..0cfbf088 100644
--- a/source/x/x11/build/libXevie
+++ b/source/x/x11/build/xf86-input-acecad
diff --git a/source/x/x11/build/xf86-input-elographics b/source/x/x11/build/xf86-input-elographics
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xf86-input-elographics
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xf86-input-mutouch b/source/x/x11/build/xf86-input-mutouch
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xf86-input-mutouch
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/libXp b/source/x/x11/build/xf86-input-penmount
index 0cfbf088..0cfbf088 100644
--- a/source/x/x11/build/libXp
+++ b/source/x/x11/build/xf86-input-penmount
diff --git a/source/x/x11/build/xf86-input-vmmouse b/source/x/x11/build/xf86-input-vmmouse
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xf86-input-vmmouse
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xf86-video-apm b/source/x/x11/build/xf86-video-apm
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xf86-video-apm
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xf86-video-ast b/source/x/x11/build/xf86-video-ast
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xf86-video-ast
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xf86-video-cirrus b/source/x/x11/build/xf86-video-cirrus
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/xf86-video-cirrus
+++ b/source/x/x11/build/xf86-video-cirrus
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xf86-video-glint b/source/x/x11/build/xf86-video-glint
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xf86-video-glint
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xf86-video-i128 b/source/x/x11/build/xf86-video-i128
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xf86-video-i128
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xf86-video-i740 b/source/x/x11/build/xf86-video-i740
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/xf86-video-i740
+++ b/source/x/x11/build/xf86-video-i740
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xf86-video-mach64 b/source/x/x11/build/xf86-video-mach64
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/xf86-video-mach64
+++ b/source/x/x11/build/xf86-video-mach64
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xf86-video-mga b/source/x/x11/build/xf86-video-mga
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xf86-video-mga
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xf86-video-neomagic b/source/x/x11/build/xf86-video-neomagic
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xf86-video-neomagic
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/libXprintAppUtil b/source/x/x11/build/xf86-video-openchrome
index 0cfbf088..0cfbf088 100644
--- a/source/x/x11/build/libXprintAppUtil
+++ b/source/x/x11/build/xf86-video-openchrome
diff --git a/source/x/x11/build/xf86-video-r128 b/source/x/x11/build/xf86-video-r128
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/xf86-video-r128
+++ b/source/x/x11/build/xf86-video-r128
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/libXprintUtil b/source/x/x11/build/xf86-video-radeonhd
index 0cfbf088..0cfbf088 100644
--- a/source/x/x11/build/libXprintUtil
+++ b/source/x/x11/build/xf86-video-radeonhd
diff --git a/source/x/x11/build/xf86-video-s3 b/source/x/x11/build/xf86-video-s3
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/xf86-video-s3
+++ b/source/x/x11/build/xf86-video-s3
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xf86-video-s3virge b/source/x/x11/build/xf86-video-s3virge
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/xf86-video-s3virge
+++ b/source/x/x11/build/xf86-video-s3virge
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xf86-video-savage b/source/x/x11/build/xf86-video-savage
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xf86-video-savage
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xf86-video-sis b/source/x/x11/build/xf86-video-sis
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xf86-video-sis
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xf86-video-sisusb b/source/x/x11/build/xf86-video-sisusb
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xf86-video-sisusb
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xf86-video-tdfx b/source/x/x11/build/xf86-video-tdfx
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/xf86-video-tdfx
+++ b/source/x/x11/build/xf86-video-tdfx
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/libxkbui b/source/x/x11/build/xf86-video-tga
index 0cfbf088..0cfbf088 100644
--- a/source/x/x11/build/libxkbui
+++ b/source/x/x11/build/xf86-video-tga
diff --git a/source/x/x11/build/xf86-video-v4l b/source/x/x11/build/xf86-video-v4l
index 00750edc..b8626c4c 100644
--- a/source/x/x11/build/xf86-video-v4l
+++ b/source/x/x11/build/xf86-video-v4l
@@ -1 +1 @@
-3
+4
diff --git a/source/x/x11/build/xf86-video-vesa b/source/x/x11/build/xf86-video-vesa
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/xf86-video-vesa
+++ b/source/x/x11/build/xf86-video-vesa
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xf86-video-vmware b/source/x/x11/build/xf86-video-vmware
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xf86-video-vmware
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xf86-video-voodoo b/source/x/x11/build/xf86-video-voodoo
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xf86-video-voodoo
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xf86dga b/source/x/x11/build/xf86dga
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xf86dga
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xf86rushproto b/source/x/x11/build/xf86rushproto
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xf86rushproto
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xfd b/source/x/x11/build/xfd
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xfd
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xfindproxy b/source/x/x11/build/xfindproxy
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xfindproxy
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xfontsel b/source/x/x11/build/xfontsel
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xfontsel
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xfwp b/source/x/x11/build/xfwp
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xfwp
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xgc b/source/x/x11/build/xgc
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xgc
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xload b/source/x/x11/build/xload
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xload
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xlsfonts b/source/x/x11/build/xlsfonts
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xlsfonts
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xmh b/source/x/x11/build/xmh
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xmh
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xmore b/source/x/x11/build/xmore
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xmore
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xplsprinters b/source/x/x11/build/xplsprinters
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xplsprinters
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xprehashprinterlist b/source/x/x11/build/xprehashprinterlist
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xprehashprinterlist
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xsetmode b/source/x/x11/build/xsetmode
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xsetmode
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xsetpointer b/source/x/x11/build/xsetpointer
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xsetpointer
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xsm b/source/x/x11/build/xsm
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xsm
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xstdcmap b/source/x/x11/build/xstdcmap
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xstdcmap
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/build/xtrap b/source/x/x11/build/xtrap
deleted file mode 100644
index 0cfbf088..00000000
--- a/source/x/x11/build/xtrap
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/x/x11/configure/compiz b/source/x/x11/configure/compiz
index 21d8270d..aebd49a2 100644
--- a/source/x/x11/configure/compiz
+++ b/source/x/x11/configure/compiz
@@ -1,3 +1,4 @@
+# Use ./autogen.sh for git, or ./configure for releases:
CFLAGS=$SLKCFLAGS \
CXXFLAGS=$SLKCFLAGS \
./configure \
diff --git a/source/x/x11/configure/configure b/source/x/x11/configure/configure
index eb3fd59c..0f3bccf2 100644
--- a/source/x/x11/configure/configure
+++ b/source/x/x11/configure/configure
@@ -7,5 +7,6 @@ CXXFLAGS=$SLKCFLAGS \
--localstatedir=/var \
--infodir=/usr/info \
--mandir=/usr/man \
+ --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \
--disable-static \
--build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/font-bh-ttf b/source/x/x11/configure/font-bh-ttf
new file mode 100644
index 00000000..9e498859
--- /dev/null
+++ b/source/x/x11/configure/font-bh-ttf
@@ -0,0 +1,13 @@
+FC_CONFDIR=/etc/fonts \
+CFLAGS=$SLKCFLAGS \
+CXXFLAGS=$SLKCFLAGS \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --infodir=/usr/info \
+ --mandir=/usr/man \
+ --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \
+ --disable-static \
+ --build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/gccmakedep b/source/x/x11/configure/gccmakedep
new file mode 100644
index 00000000..181ae81e
--- /dev/null
+++ b/source/x/x11/configure/gccmakedep
@@ -0,0 +1,14 @@
+CFLAGS=$SLKCFLAGS \
+CXXFLAGS=$SLKCFLAGS \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --infodir=/usr/info \
+ --mandir=/usr/man \
+ --disable-static \
+ --build=$ARCH-slackware-linux
+#
+# --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION}
+#
diff --git a/source/x/x11/configure/libX11 b/source/x/x11/configure/libX11
index 093c6044..cf85e58d 100644
--- a/source/x/x11/configure/libX11
+++ b/source/x/x11/configure/libX11
@@ -3,10 +3,10 @@ CXXFLAGS=$SLKCFLAGS \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
+ --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \
--sysconfdir=/etc \
--localstatedir=/var \
--infodir=/usr/info \
--mandir=/usr/man \
--disable-static \
- --with-xcb=yes \
--build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/libXp b/source/x/x11/configure/libXp
new file mode 100644
index 00000000..181ae81e
--- /dev/null
+++ b/source/x/x11/configure/libXp
@@ -0,0 +1,14 @@
+CFLAGS=$SLKCFLAGS \
+CXXFLAGS=$SLKCFLAGS \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --infodir=/usr/info \
+ --mandir=/usr/man \
+ --disable-static \
+ --build=$ARCH-slackware-linux
+#
+# --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION}
+#
diff --git a/source/x/x11/configure/xf86-video-ati b/source/x/x11/configure/xf86-video-ati
index ae245884..0eacb0c3 100644
--- a/source/x/x11/configure/xf86-video-ati
+++ b/source/x/x11/configure/xf86-video-ati
@@ -1,4 +1,4 @@
-xserver_source="/tmp/x11-build/xorg-server-1.7.5"
+xserver_source="/tmp/x11-build/xorg-server-1.9.3"
# Let these just fail to build. In any case, an "exit 1"
# here is just plain wrong.
diff --git a/source/x/x11/configure/xf86-video-nouveau b/source/x/x11/configure/xf86-video-nouveau
new file mode 100644
index 00000000..e050771b
--- /dev/null
+++ b/source/x/x11/configure/xf86-video-nouveau
@@ -0,0 +1,11 @@
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./autogen.sh \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --infodir=/usr/info \
+ --mandir=/usr/man \
+ --disable-static \
+ --build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/xf86-video-nv b/source/x/x11/configure/xf86-video-nv
deleted file mode 100644
index ae245884..00000000
--- a/source/x/x11/configure/xf86-video-nv
+++ /dev/null
@@ -1,21 +0,0 @@
-xserver_source="/tmp/x11-build/xorg-server-1.7.5"
-
-# Let these just fail to build. In any case, an "exit 1"
-# here is just plain wrong.
-#if [ ! -d "$xserver_source" ]; then
-# echo "$xserver_source does not exist, and you need it."
-# exit 1
-#fi
-
-CFLAGS="$SLKCFLAGS -I${xserver_source}/hw/xfree86/ramdac" \
-CXXFLAGS="$SLKCFLAGS -I${xserver_source}/hw/xfree86/ramdac" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --infodir=/usr/info \
- --mandir=/usr/man \
- --disable-static \
- --with-xserver-source=${xserver_source} \
- --build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/xorg-docs b/source/x/x11/configure/xorg-docs
index 77bb98d8..ff88ae97 100644
--- a/source/x/x11/configure/xorg-docs
+++ b/source/x/x11/configure/xorg-docs
@@ -7,6 +7,7 @@ CXXFLAGS=$SLKCFLAGS \
--localstatedir=/var \
--infodir=/usr/info \
--mandir=/usr/man \
+ --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \
--disable-static \
--enable-pdf=no \
--enable-ps=no \
diff --git a/source/x/x11/configure/xorg-server b/source/x/x11/configure/xorg-server
index 943797bf..cf9bd843 100644
--- a/source/x/x11/configure/xorg-server
+++ b/source/x/x11/configure/xorg-server
@@ -1,13 +1,15 @@
# Servers to build:
BUILD_SERVERS="--enable-xorg \
+ --enable-dmx \
--enable-xvfb \
--enable-xnest \
--enable-kdrive \
--enable-xephyr \
- --enable-xsdl \
- --enable-xfbdev"
+ --enable-xfbdev \
+ --enable-config-udev \
+ --disable-config-hal"
-MESA_VERSION=${MESA_VERSION:-7.5} # unused in 1.7.x
+MESA_VERSION=${MESA_VERSION:-7.5} # unused in 1.7+
# Default font paths to be used by the X server
DEF_FONTPATH="/usr/share/fonts/local,/usr/share/fonts/TTF,/usr/share/fonts/OTF,/usr/share/fonts/Type1,/usr/share/fonts/misc,/usr/share/fonts/CID,/usr/share/fonts/75dpi/:unscaled,/usr/share/fonts/100dpi/:unscaled,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/cyrillic"
@@ -26,7 +28,7 @@ CFLAGS="$SLKCFLAGS" \
--with-default-font-path="${DEF_FONTPATH}" \
--with-module-dir=/usr/lib${LIBDIRSUFFIX}/xorg/modules \
--with-dri-driver-path=/usr/lib${LIBDIRSUFFIX}/xorg/modules/dri \
- --with-os-name="Slackware 13.1" \
+ --with-os-name="Slackware 13.37" \
--with-os-vendor="Slackware Linux Project" \
--with-xkb-path=/etc/X11/xkb \
--with-xkb-output=/var/lib/xkb \
diff --git a/source/x/x11/modularize b/source/x/x11/modularize
index d915fd21..47da583f 100644
--- a/source/x/x11/modularize
+++ b/source/x/x11/modularize
@@ -169,31 +169,13 @@ xextproto
xeyes
xf86-input-acecad
xf86-input-aiptek
-xf86-input-calcomp
xf86-input-citron
-xf86-input-digitaledge
-xf86-input-dmc
-xf86-input-dynapro
-xf86-input-elo2300
-xf86-input-elographics
xf86-input-evdev
-xf86-input-fpit
-xf86-input-hyperpen
-xf86-input-jamstudio
xf86-input-joystick
xf86-input-keyboard
-xf86-input-magellan
-xf86-input-magictouch
-xf86-input-microtouch
xf86-input-mouse
-xf86-input-mutouch
-xf86-input-palmax
xf86-input-penmount
-xf86-input-spaceorb
-xf86-input-summa
xf86-input-synaptics
-xf86-input-tek4957
-xf86-input-ur98
xf86-input-vmmouse
xf86-input-void
xf86-input-wacom
@@ -204,24 +186,20 @@ xf86-video-ast
xf86-video-ati
xf86-video-chips
xf86-video-cirrus
-xf86-video-cyrix
xf86-video-dummy
xf86-video-fbdev
xf86-video-glint
xf86-video-i128
xf86-video-i740
xf86-video-i810
-xf86-video-impact
-xf86-video-imstt
xf86-video-intel
xf86-video-mach64
xf86-video-mga
xf86-video-neomagic
-xf86-video-newport
+xf86-video-nouveau
xf86-video-nsc
xf86-video-nv
xf86-video-openchrome
-xf86-video-radeonhd
xf86-video-r128
xf86-video-rendition
xf86-video-s3
@@ -243,7 +221,6 @@ xf86-video-trident
xf86-video-tseng
xf86-video-v4l
xf86-video-vesa
-xf86-video-vga
xf86-video-vmware
xf86-video-voodoo
xf86-video-wsfb
diff --git a/source/x/x11/noarch b/source/x/x11/noarch
index 2a07c677..79eb0e56 100644
--- a/source/x/x11/noarch
+++ b/source/x/x11/noarch
@@ -7,7 +7,6 @@ dejavu-ttf
dmxproto
encodings
evieext
-fixesproto
font-adobe-100dpi
font-adobe-75dpi
font-adobe-utopia-100dpi
@@ -64,11 +63,9 @@ ttf-indic-fonts
util-macros
videoproto
x11-skel
-xbitmaps
xcb-proto
xcmiscproto
xcursor-themes
-xextproto
xf86bigfontproto
xf86dgaproto
xf86driproto
@@ -79,7 +76,6 @@ xineramaproto
xkeyboard-config
xorg-cf-files
xorg-docs
-xorg-sgml-doctools
xproto
xproxymanagementprotocol
xtrans
diff --git a/source/x/x11/patch/README b/source/x/x11/patch/README
new file mode 100644
index 00000000..c5af64b3
--- /dev/null
+++ b/source/x/x11/patch/README
@@ -0,0 +1,18 @@
+
+IMPORTANT!
+
+To fail/exit a script, use this:
+
+[command that fails] || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
+DO NOT USE THIS:
+
+[command that fails] || exit 1
+
+as it will cause the parent script to exit in the wrong location and possibly
+silently skip building some packages.
+
+Thanks,
+
+The Management
+
diff --git a/source/x/x11/patch/xcompmgr.patch b/source/x/x11/patch/xcompmgr.patch
new file mode 100644
index 00000000..6097b12a
--- /dev/null
+++ b/source/x/x11/patch/xcompmgr.patch
@@ -0,0 +1,2 @@
+zcat $CWD/patch/xcompmgr/xcompmgr-follow-icccm-spec.diff.gz | patch -p1 --verbose \
+ || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/x/x11/patch/xcompmgr/xcompmgr-follow-icccm-spec.diff b/source/x/x11/patch/xcompmgr/xcompmgr-follow-icccm-spec.diff
new file mode 100644
index 00000000..a69b0704
--- /dev/null
+++ b/source/x/x11/patch/xcompmgr/xcompmgr-follow-icccm-spec.diff
@@ -0,0 +1,26 @@
+# Bug 26090 - xcompmgr and ICCCM manager spec
+https://bugs.freedesktop.org/show_bug.cgi?id=26090
+https://bugs.freedesktop.org/attachment.cgi?id=32702
+
+diff -u xcompmgr-1.1.5/xcompmgr.c xcompmgr.new/xcompmgr.c
+--- xcompmgr-1.1.5/xcompmgr.c 2009-10-20 00:44:23.000000000 +0200
++++ xcompmgr.new/xcompmgr.c 2010-01-17 22:44:31.261276441 +0100
+@@ -1924,6 +1924,18 @@
+
+ XSetSelectionOwner (dpy, a, w, 0);
+
++ XClientMessageEvent ev;
++ ev.type = ClientMessage;
++ ev.window = RootWindow (dpy, scr);
++ ev.message_type = a;
++ ev.format = 32;
++ ev.data.l[0] = CurrentTime;
++ ev.data.l[1] = a;
++ ev.data.l[2] = w;
++ ev.data.l[3] = 0;
++ ev.data.l[4] = 0;
++ XSendEvent(dpy, RootWindow (dpy, scr), False, StructureNotifyMask, (XEvent*)&ev);
++
+ return True;
+ }
+
diff --git a/source/x/x11/patch/xcursorgen.patch b/source/x/x11/patch/xcursorgen.patch
deleted file mode 100644
index 5aa46dee..00000000
--- a/source/x/x11/patch/xcursorgen.patch
+++ /dev/null
@@ -1 +0,0 @@
-zcat $CWD/patch/xcursorgen/xcursorgen.png14.configure.kludge.diff.gz | patch -p1 --verbose || exit 1
diff --git a/source/x/x11/patch/xcursorgen/xcursorgen.png14.configure.kludge.diff b/source/x/x11/patch/xcursorgen/xcursorgen.png14.configure.kludge.diff
deleted file mode 100644
index ad7ae105..00000000
--- a/source/x/x11/patch/xcursorgen/xcursorgen.png14.configure.kludge.diff
+++ /dev/null
@@ -1,61 +0,0 @@
---- ./configure.orig 2009-10-16 19:42:25.000000000 -0500
-+++ ./configure 2010-02-21 13:57:53.000000000 -0600
-@@ -5043,12 +5043,12 @@
- pkg_cv_XCURSORGEN_CFLAGS="$XCURSORGEN_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xcursor libpng12\"") >&5
-- ($PKG_CONFIG --exists --print-errors "x11 xcursor libpng12") 2>&5
-+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xcursor libpng14\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "x11 xcursor libpng14") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- pkg_cv_XCURSORGEN_CFLAGS=`$PKG_CONFIG --cflags "x11 xcursor libpng12" 2>/dev/null`
-+ pkg_cv_XCURSORGEN_CFLAGS=`$PKG_CONFIG --cflags "x11 xcursor libpng14" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-@@ -5059,12 +5059,12 @@
- pkg_cv_XCURSORGEN_LIBS="$XCURSORGEN_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xcursor libpng12\"") >&5
-- ($PKG_CONFIG --exists --print-errors "x11 xcursor libpng12") 2>&5
-+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xcursor libpng14\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "x11 xcursor libpng14") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- pkg_cv_XCURSORGEN_LIBS=`$PKG_CONFIG --libs "x11 xcursor libpng12" 2>/dev/null`
-+ pkg_cv_XCURSORGEN_LIBS=`$PKG_CONFIG --libs "x11 xcursor libpng14" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-@@ -5082,14 +5082,14 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- XCURSORGEN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11 xcursor libpng12" 2>&1`
-+ XCURSORGEN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11 xcursor libpng14" 2>&1`
- else
-- XCURSORGEN_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11 xcursor libpng12" 2>&1`
-+ XCURSORGEN_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11 xcursor libpng14" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$XCURSORGEN_PKG_ERRORS" >&5
-
-- { { $as_echo "$as_me:$LINENO: error: Package requirements (x11 xcursor libpng12) were not met:
-+ { { $as_echo "$as_me:$LINENO: error: Package requirements (x11 xcursor libpng14) were not met:
-
- $XCURSORGEN_PKG_ERRORS
-
-@@ -5100,7 +5100,7 @@
- and XCURSORGEN_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&5
--$as_echo "$as_me: error: Package requirements (x11 xcursor libpng12) were not met:
-+$as_echo "$as_me: error: Package requirements (x11 xcursor libpng14) were not met:
-
- $XCURSORGEN_PKG_ERRORS
-
diff --git a/source/x/x11/patch/xf86-input-synaptics.patch b/source/x/x11/patch/xf86-input-synaptics.patch
deleted file mode 100644
index f41034c3..00000000
--- a/source/x/x11/patch/xf86-input-synaptics.patch
+++ /dev/null
@@ -1,4 +0,0 @@
-# Enable tap-to-click out of the box, closing one of the
-# most reported bugs of the last 2 years or so.
-# Thanks to Piter Punk for figuring out the proper fix!
-zcat $CWD/patch/xf86-input-synaptics/xf86-input-synaptics.tap-to-click.diff.gz | patch -p1 --verbose || exit 1
diff --git a/source/x/x11/patch/xf86-input-synaptics/xf86-input-synaptics.tap-to-click.diff b/source/x/x11/patch/xf86-input-synaptics/xf86-input-synaptics.tap-to-click.diff
deleted file mode 100644
index 2fdf4e0d..00000000
--- a/source/x/x11/patch/xf86-input-synaptics/xf86-input-synaptics.tap-to-click.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./fdi/11-x11-synaptics.fdi.orig 2009-10-11 18:11:21.000000000 -0500
-+++ ./fdi/11-x11-synaptics.fdi 2010-04-24 12:59:37.000000000 -0500
-@@ -3,6 +3,8 @@
- <device>
- <match key="info.capabilities" contains="input.touchpad">
- <merge key="input.x11_driver" type="string">synaptics</merge>
-+ <!-- Enable tap click by default: -->
-+ <merge key="input.x11_options.TapButton1" type="string">1</merge>
- <!-- Arbitrary options can be passed to the driver using
- the input.x11_options property since xorg-server-1.5. -->
- <!-- EXAMPLES:
diff --git a/source/x/x11/patch/xorg-server.patch b/source/x/x11/patch/xorg-server.patch
index 16cf61e3..e3218a03 100644
--- a/source/x/x11/patch/xorg-server.patch
+++ b/source/x/x11/patch/xorg-server.patch
@@ -1,2 +1,3 @@
-zcat $CWD/patch/xorg-server/x11.startwithblackscreen.diff.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patch/xorg-server/xorg-server.fb.fbpict.c.mod.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/patch/xorg-server/x11.startwithblackscreen.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+zcat $CWD/patch/xorg-server/xorg-server.fb.fbpict.c.mod.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+zcat $CWD/patch/xorg-server/xorg-server.try_nouveau.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/x/x11/patch/xorg-server/xorg-server.try_nouveau.diff b/source/x/x11/patch/xorg-server/xorg-server.try_nouveau.diff
new file mode 100644
index 00000000..74f799a1
--- /dev/null
+++ b/source/x/x11/patch/xorg-server/xorg-server.try_nouveau.diff
@@ -0,0 +1,11 @@
+--- ./hw/xfree86/common/xf86pciBus.c.orig 2010-07-01 12:17:35.000000000 -0500
++++ ./hw/xfree86/common/xf86pciBus.c 2010-11-18 16:56:57.633003654 -0600
+@@ -1118,7 +1118,7 @@
+ break;
+ case 0x102b: driverList[0] = "mga"; break;
+ case 0x10c8: driverList[0] = "neomagic"; break;
+- case 0x10de: case 0x12d2: driverList[0] = "nv"; break;
++ case 0x10de: case 0x12d2: driverList[0] = "nouveau" ; driverList[1] = "nv"; break;
+ case 0x1106: driverList[0] = "openchrome"; break;
+ case 0x1b36: driverList[0] = "qxl"; break;
+ case 0x1163: driverList[0] = "rendition"; break;
diff --git a/source/x/x11/post-install/libSM.post-install b/source/x/x11/post-install/libSM.post-install
new file mode 100644
index 00000000..6cc5edc0
--- /dev/null
+++ b/source/x/x11/post-install/libSM.post-install
@@ -0,0 +1 @@
+rm -f $PKG/usr/doc/libSM-${MODULAR_PACKAGE_VERSION}/*.xml
diff --git a/source/x/x11/post-install/libX11.post-install b/source/x/x11/post-install/libX11.post-install
new file mode 100644
index 00000000..7232b680
--- /dev/null
+++ b/source/x/x11/post-install/libX11.post-install
@@ -0,0 +1,2 @@
+mkdir -p $PKG/usr/share/X11
+zcat $CWD/post-install/libX11/XKeysymDB.gz > $PKG/usr/share/X11/XKeysymDB
diff --git a/source/x/x11/post-install/libX11/XKeysymDB b/source/x/x11/post-install/libX11/XKeysymDB
new file mode 100644
index 00000000..45d89297
--- /dev/null
+++ b/source/x/x11/post-install/libX11/XKeysymDB
@@ -0,0 +1,380 @@
+! Copyright 1993 Massachusetts Institute of Technology
+!
+! Permission to use, copy, modify, distribute, and sell this software and
+! its documentation for any purpose is hereby granted without fee, provided
+! that the above copyright notice appear in all copies and that both that
+! copyright notice and this permission notice appear in supporting
+! documentation, and that the name of M.I.T. not be used in advertising or
+! publicity pertaining to distribution of the software without specific,
+! written prior permission. M.I.T. makes no representations about the
+! suitability of this software for any purpose. It is provided "as is"
+! without express or implied warranty.
+!
+
+hpmute_acute :100000A8
+hpmute_grave :100000A9
+hpmute_asciicircum :100000AA
+hpmute_diaeresis :100000AB
+hpmute_asciitilde :100000AC
+hplira :100000AF
+hpguilder :100000BE
+hpYdiaeresis :100000EE
+hpIO :100000EE
+hplongminus :100000F6
+hpblock :100000FC
+apLineDel :1000FF00
+apCharDel :1000FF01
+apCopy :1000FF02
+apCut :1000FF03
+apPaste :1000FF04
+apMove :1000FF05
+apGrow :1000FF06
+apCmd :1000FF07
+apShell :1000FF08
+apLeftBar :1000FF09
+apRightBar :1000FF0A
+apLeftBox :1000FF0B
+apRightBox :1000FF0C
+apUpBox :1000FF0D
+apDownBox :1000FF0E
+apPop :1000FF0F
+apRead :1000FF10
+apEdit :1000FF11
+apSave :1000FF12
+apExit :1000FF13
+apRepeat :1000FF14
+hpModelock1 :1000FF48
+hpModelock2 :1000FF49
+hpReset :1000FF6C
+hpSystem :1000FF6D
+hpUser :1000FF6E
+hpClearLine :1000FF6F
+hpInsertLine :1000FF70
+hpDeleteLine :1000FF71
+hpInsertChar :1000FF72
+hpDeleteChar :1000FF73
+hpBackTab :1000FF74
+hpKP_BackTab :1000FF75
+apKP_parenleft :1000FFA8
+apKP_parenright :1000FFA9
+
+I2ND_FUNC_L :10004001
+I2ND_FUNC_R :10004002
+IREMOVE :10004003
+IREPEAT :10004004
+IA1 :10004101
+IA2 :10004102
+IA3 :10004103
+IA4 :10004104
+IA5 :10004105
+IA6 :10004106
+IA7 :10004107
+IA8 :10004108
+IA9 :10004109
+IA10 :1000410A
+IA11 :1000410B
+IA12 :1000410C
+IA13 :1000410D
+IA14 :1000410E
+IA15 :1000410F
+IB1 :10004201
+IB2 :10004202
+IB3 :10004203
+IB4 :10004204
+IB5 :10004205
+IB6 :10004206
+IB7 :10004207
+IB8 :10004208
+IB9 :10004209
+IB10 :1000420A
+IB11 :1000420B
+IB12 :1000420C
+IB13 :1000420D
+IB14 :1000420E
+IB15 :1000420F
+IB16 :10004210
+
+DRemove :1000FF00
+Dring_accent :1000FEB0
+Dcircumflex_accent :1000FE5E
+Dcedilla_accent :1000FE2C
+Dacute_accent :1000FE27
+Dgrave_accent :1000FE60
+Dtilde :1000FE7E
+Ddiaeresis :1000FE22
+
+osfCopy :1004FF02
+osfCut :1004FF03
+osfPaste :1004FF04
+osfBackTab :1004FF07
+osfBackSpace :1004FF08
+osfClear :1004FF0B
+osfEscape :1004FF1B
+osfAddMode :1004FF31
+osfPrimaryPaste :1004FF32
+osfQuickPaste :1004FF33
+osfPageLeft :1004FF40
+osfPageUp :1004FF41
+osfPageDown :1004FF42
+osfPageRight :1004FF43
+osfActivate :1004FF44
+osfMenuBar :1004FF45
+osfLeft :1004FF51
+osfUp :1004FF52
+osfRight :1004FF53
+osfDown :1004FF54
+osfPrior :1004FF55
+osfNext :1004FF56
+osfEndLine :1004FF57
+osfBeginLine :1004FF58
+osfEndData :1004FF59
+osfBeginData :1004FF5A
+osfPrevMenu :1004FF5B
+osfNextMenu :1004FF5C
+osfPrevField :1004FF5D
+osfNextField :1004FF5E
+osfSelect :1004FF60
+osfInsert :1004FF63
+osfUndo :1004FF65
+osfMenu :1004FF67
+osfCancel :1004FF69
+osfHelp :1004FF6A
+osfSelectAll :1004FF71
+osfDeselectAll :1004FF72
+osfReselect :1004FF73
+osfExtend :1004FF74
+osfRestore :1004FF78
+osfSwitchDirection :1004FF7E
+osfPriorMinor :1004FFF5
+osfNextMinor :1004FFF6
+osfRightLine :1004FFF7
+osfLeftLine :1004FFF8
+osfDelete :1004FFFF
+
+SunFA_Grave :1005FF00
+SunFA_Circum :1005FF01
+SunFA_Tilde :1005FF02
+SunFA_Acute :1005FF03
+SunFA_Diaeresis :1005FF04
+SunFA_Cedilla :1005FF05
+SunF36 :1005FF10
+SunF37 :1005FF11
+SunSys_Req :1005FF60
+SunProps :1005FF70
+SunFront :1005FF71
+SunCopy :1005FF72
+SunOpen :1005FF73
+SunPaste :1005FF74
+SunCut :1005FF75
+SunPowerSwitch :1005FF76
+SunAudioLowerVolume :1005FF77
+SunAudioMute :1005FF78
+SunAudioRaiseVolume :1005FF79
+SunVideoDegauss :1005FF7A
+SunVideoLowerBrightness :1005FF7B
+SunVideoRaiseBrightness :1005FF7C
+SunPowerSwitchShift :1005FF7D
+
+SunCompose :FF20
+SunPageUp :FF55
+SunPageDown :FF56
+SunPrint_Screen :FF61
+SunUndo :FF65
+SunAgain :FF66
+SunFind :FF68
+SunStop :FF69
+SunAltGraph :FF7E
+
+WYSetup :1006FF00
+
+ncdSetup :1006FF00
+
+XeroxPointerButton1 :10070001
+XeroxPointerButton2 :10070002
+XeroxPointerButton3 :10070003
+XeroxPointerButton4 :10070004
+XeroxPointerButton5 :10070005
+
+! The definitions here should match <X11/XF86keysym.h>
+XF86ModeLock :1008FF01
+XF86MonBrightnessUp :1008FF02
+XF86MonBrightnessDown :1008FF03
+XF86KbdLightOnOff :1008FF04
+XF86KbdBrightnessUp :1008FF05
+XF86KbdBrightnessDown :1008FF06
+XF86Standby :1008FF10
+XF86AudioLowerVolume :1008FF11
+XF86AudioMute :1008FF12
+XF86AudioRaiseVolume :1008FF13
+XF86AudioPlay :1008FF14
+XF86AudioStop :1008FF15
+XF86AudioPrev :1008FF16
+XF86AudioNext :1008FF17
+XF86HomePage :1008FF18
+XF86Mail :1008FF19
+XF86Start :1008FF1A
+XF86Search :1008FF1B
+XF86AudioRecord :1008FF1C
+XF86Calculator :1008FF1D
+XF86Memo :1008FF1E
+XF86ToDoList :1008FF1F
+XF86Calendar :1008FF20
+XF86PowerDown :1008FF21
+XF86ContrastAdjust :1008FF22
+XF86RockerUp :1008FF23
+XF86RockerDown :1008FF24
+XF86RockerEnter :1008FF25
+XF86Back :1008FF26
+XF86Forward :1008FF27
+XF86Stop :1008FF28
+XF86Refresh :1008FF29
+XF86PowerOff :1008FF2A
+XF86WakeUp :1008FF2B
+XF86Eject :1008FF2C
+XF86ScreenSaver :1008FF2D
+XF86WWW :1008FF2E
+XF86Sleep :1008FF2F
+XF86Favorites :1008FF30
+XF86AudioPause :1008FF31
+XF86AudioMedia :1008FF32
+XF86MyComputer :1008FF33
+XF86VendorHome :1008FF34
+XF86LightBulb :1008FF35
+XF86Shop :1008FF36
+XF86History :1008FF37
+XF86OpenURL :1008FF38
+XF86AddFavorite :1008FF39
+XF86HotLinks :1008FF3A
+XF86BrightnessAdjust :1008FF3B
+XF86Finance :1008FF3C
+XF86Community :1008FF3D
+XF86AudioRewind :1008FF3E
+XF86BackForward :1008FF3F
+XF86Launch0 :1008FF40
+XF86Launch1 :1008FF41
+XF86Launch2 :1008FF42
+XF86Launch3 :1008FF43
+XF86Launch4 :1008FF44
+XF86Launch5 :1008FF45
+XF86Launch6 :1008FF46
+XF86Launch7 :1008FF47
+XF86Launch8 :1008FF48
+XF86Launch9 :1008FF49
+XF86LaunchA :1008FF4A
+XF86LaunchB :1008FF4B
+XF86LaunchC :1008FF4C
+XF86LaunchD :1008FF4D
+XF86LaunchE :1008FF4E
+XF86LaunchF :1008FF4F
+XF86ApplicationLeft :1008FF50
+XF86ApplicationRight :1008FF51
+XF86Book :1008FF52
+XF86CD :1008FF53
+XF86Calculater :1008FF54
+XF86Clear :1008FF55
+XF86Close :1008FF56
+XF86Copy :1008FF57
+XF86Cut :1008FF58
+XF86Display :1008FF59
+XF86DOS :1008FF5A
+XF86Documents :1008FF5B
+XF86Excel :1008FF5C
+XF86Explorer :1008FF5D
+XF86Game :1008FF5E
+XF86Go :1008FF5F
+XF86iTouch :1008FF60
+XF86LogOff :1008FF61
+XF86Market :1008FF62
+XF86Meeting :1008FF63
+XF86MenuKB :1008FF65
+XF86MenuPB :1008FF66
+XF86MySites :1008FF67
+XF86New :1008FF68
+XF86News :1008FF69
+XF86OfficeHome :1008FF6A
+XF86Open :1008FF6B
+XF86Option :1008FF6C
+XF86Paste :1008FF6D
+XF86Phone :1008FF6E
+XF86Q :1008FF70
+XF86Reply :1008FF72
+XF86Reload :1008FF73
+XF86RotateWindows :1008FF74
+XF86RotationPB :1008FF75
+XF86RotationKB :1008FF76
+XF86Save :1008FF77
+XF86ScrollUp :1008FF78
+XF86ScrollDown :1008FF79
+XF86ScrollClick :1008FF7A
+XF86Send :1008FF7B
+XF86Spell :1008FF7C
+XF86SplitScreen :1008FF7D
+XF86Support :1008FF7E
+XF86TaskPane :1008FF7F
+XF86Terminal :1008FF80
+XF86Tools :1008FF81
+XF86Travel :1008FF82
+XF86UserPB :1008FF84
+XF86User1KB :1008FF85
+XF86User2KB :1008FF86
+XF86Video :1008FF87
+XF86WheelButton :1008FF88
+XF86Word :1008FF89
+XF86Xfer :1008FF8A
+XF86ZoomIn :1008FF8B
+XF86ZoomOut :1008FF8C
+XF86Away :1008FF8D
+XF86Messenger :1008FF8E
+XF86WebCam :1008FF8F
+XF86MailForward :1008FF90
+XF86Pictures :1008FF91
+XF86Music :1008FF92
+XF86Battery :1008FF93
+XF86Bluetooth :1008FF94
+XF86WLAN :1008FF95
+XF86UWB :1008FF96
+XF86AudioForward :1008FF97
+XF86AudioRepeat :1008FF98
+XF86AudioRandomPlay :1008FF99
+XF86Subtitle :1008FF9A
+XF86AudioCycleTrack :1008FF9B
+XF86CycleAngle :1008FF9C
+XF86FrameBack :1008FF9D
+XF86FrameForward :1008FF9E
+XF86Time :1008FF9F
+XF86Select :1008FFA0
+XF86View :1008FFA1
+XF86TopMenu :1008FFA2
+XF86Red :1008FFA3
+XF86Green :1008FFA4
+XF86Yellow :1008FFA5
+XF86Blue :1008FFA6
+XF86Suspend :1008FFA7
+XF86Hibernate :1008FFA8
+XF86TouchpadToggle :1008FFA9
+
+! XFree86 special action keys
+XF86_Switch_VT_1 :1008FE01
+XF86_Switch_VT_2 :1008FE02
+XF86_Switch_VT_3 :1008FE03
+XF86_Switch_VT_4 :1008FE04
+XF86_Switch_VT_5 :1008FE05
+XF86_Switch_VT_6 :1008FE06
+XF86_Switch_VT_7 :1008FE07
+XF86_Switch_VT_8 :1008FE08
+XF86_Switch_VT_9 :1008FE09
+XF86_Switch_VT_10 :1008FE0A
+XF86_Switch_VT_11 :1008FE0B
+XF86_Switch_VT_12 :1008FE0C
+XF86_Ungrab :1008FE20
+XF86_ClearGrab :1008FE21
+XF86_Next_VMode :1008FE22
+XF86_Prev_VMode :1008FE23
+
+usldead_acute :100000A8
+usldead_grave :100000A9
+usldead_diaeresis :100000AB
+usldead_asciicircum :100000AA
+usldead_asciitilde :100000AC
+usldead_cedilla :1000FE2C
+usldead_ring :1000FEB0
diff --git a/source/x/x11/post-install/xbitmaps.post-install b/source/x/x11/post-install/xbitmaps.post-install
new file mode 100644
index 00000000..b25fb344
--- /dev/null
+++ b/source/x/x11/post-install/xbitmaps.post-install
@@ -0,0 +1,2 @@
+mkdir -p $PKG/usr/lib
+mv $PKG/usr/share/pkgconfig $PKG/usr/lib
diff --git a/source/x/x11/post-install/xdm/Xsession b/source/x/x11/post-install/xdm/Xsession
index 6484b096..22fcde8f 100755
--- a/source/x/x11/post-install/xdm/Xsession
+++ b/source/x/x11/post-install/xdm/Xsession
@@ -10,6 +10,7 @@
# Fixes for $PATH (from Jim Diamond), GDM/KDM/XDM, 2003-02-07 volkerdi
# Use absolute paths until $PATH is set, 2006-01-11 (Al's 100th :-) volkerdi
# merged changes from # $Xorg: Xsession,v 1.4 2000/08/17 19:54:17 cpqbld Exp $, 2007-02-13 volkerdi
+# Changed /usr/lib/X11/xinit/ paths to /etc/X11/xinit/ 2011-01-23 rworkman
# redirect errors to a file in user's home directory if we can
errfile="$HOME/.xsession-errors"
@@ -32,8 +33,8 @@ fi
userresources=$HOME/.Xresources
usermodmap=$HOME/.Xmodmap
-sysresources=/usr/lib/X11/xinit/.Xresources
-sysmodmap=/usr/lib/X11/xinit/.Xmodmap
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
# merge in defaults and keymaps
diff --git a/source/x/x11/post-install/xf86-input-synaptics.post-install b/source/x/x11/post-install/xf86-input-synaptics.post-install
index 00250982..e6352cb4 100644
--- a/source/x/x11/post-install/xf86-input-synaptics.post-install
+++ b/source/x/x11/post-install/xf86-input-synaptics.post-install
@@ -1,6 +1,7 @@
-mkdir -p $PKG/usr/share/hal/fdi/policy/10osvendor
-cat fdi/11-x11-synaptics.fdi > \
- $PKG/usr/share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi
+# Overwrite the default 50-syaptics.conf with our slightly enhanced and
+# better-commented version
+cat $CWD/post-install/xf86-input-synaptics/50-synaptics.conf > \
+ $PKG/usr/share/X11/xorg.conf.d/50-synaptics.conf
mkdir -p $PKG/usr/doc/xf86-input-synaptics-$MODULAR_PACKAGE_VERSION
cp -a \
diff --git a/source/x/x11/post-install/xf86-input-synaptics/50-synaptics.conf b/source/x/x11/post-install/xf86-input-synaptics/50-synaptics.conf
new file mode 100644
index 00000000..09c37642
--- /dev/null
+++ b/source/x/x11/post-install/xf86-input-synaptics/50-synaptics.conf
@@ -0,0 +1,15 @@
+# DO NOT EDIT THIS FILE - IT WILL BE OVERWRITTEN ON UPGRADES
+# Copy this file to /etc/X11/xorg.conf.d/ and edit the copy
+#
+# Use "synclient -l" to see all available options
+# Use "man synaptics" for details about what the options do
+#
+Section "InputClass"
+ Identifier "touchpad"
+ Driver "synaptics"
+ MatchDevicePath "/dev/input/event*"
+ MatchIsTouchpad "on"
+ Option "TapButton1" "1"
+ Option "TapButton2" "2"
+ Option "TapButton3" "3"
+EndSection
diff --git a/source/x/x11/post-install/xf86-input-wacom.post-install b/source/x/x11/post-install/xf86-input-wacom.post-install
deleted file mode 100644
index 226678f4..00000000
--- a/source/x/x11/post-install/xf86-input-wacom.post-install
+++ /dev/null
@@ -1,4 +0,0 @@
-mv $PKG/usr/share/hal/fdi/policy/20thirdparty \
- $PKG/usr/share/hal/fdi/policy/10osvendor
-mv $PKG/usr/share/hal/fdi/policy/10osvendor/wacom.fdi \
- $PKG/usr/share/hal/fdi/policy/10osvendor/11-x11-wacom.fdi
diff --git a/source/x/x11/post-install/xorg-docs.post-install b/source/x/x11/post-install/xorg-docs.post-install
deleted file mode 100644
index 9857acaf..00000000
--- a/source/x/x11/post-install/xorg-docs.post-install
+++ /dev/null
@@ -1 +0,0 @@
-rm $PKG/usr/man/man7/Xprint.7
diff --git a/source/x/x11/post-install/xorg-server.post-install b/source/x/x11/post-install/xorg-server.post-install
index 0185cb70..e21a0f03 100644
--- a/source/x/x11/post-install/xorg-server.post-install
+++ b/source/x/x11/post-install/xorg-server.post-install
@@ -1,3 +1,52 @@
+# Create the configuration directories for xorg-server 1.9.x
+mkdir -p $PKG/etc/X11/xorg.conf.d $PKG/usr/share/X11/xorg.conf.d
+
+# Create a sample keyboard layout
+# Enable zapping by default
+cat << EOF > $PKG/usr/share/X11/xorg.conf.d/90-keyboard-layout.conf
+Section "InputClass"
+ Identifier "keyboard-all"
+ MatchIsKeyboard "on"
+ MatchDevicePath "/dev/input/event*"
+ Driver "evdev"
+ Option "XkbLayout" "us"
+ #Option "XkbVariant" ""
+ Option "XkbOptions" "terminate:ctrl_alt_bksp"
+EndSection
+
+# READ THIS FOR CUSTOM KEYBOARD INFORMATION
+#
+# If you want to add a custom model/layout/variant to X, you will need to COPY
+# this file to /etc/X11/xorg.conf.d/ and edit that copy. After editing it to
+# suit, you will need to restart X.
+#
+# Here's an example of the lines from above:
+#
+# Section "InputClass"
+# Identifier "keyboard-all"
+# MatchIsKeyboard "on"
+# MatchDevicePath "/dev/input/event*"
+# Driver "evdev"
+# Option "XkbLayout" "us"
+# Option "XkbVariant" "intl"
+# Option "XkbOptions" "compose:rwin,terminate:ctrl_alt_bksp"
+# EndSection
+#
+# Many desktop environments, including KDE and Xfce, have their own methods to
+# configure keyboard layouts and such if you'd like to use them.
+#
+# If you prefer to use the "old" way of configuring keyboards (without input
+# device hotplugging), then you'll need to add the following lines to the
+# ServerFlags section of /etc/X11/xorg.conf:
+# Option "AllowEmptyInput" "false"
+# Option "AutoAddDevices" "false"
+# Option "AutoEnableDevices" "false"
+# Alternatively, you can break this up into separate "stubs" in the xorg.conf.d/
+# directory, but that's your call. Assuming you elect to keep a monolithic
+# /etc/X11/xorg.conf file, you can now edit the Keyboard section as usual.
+
+EOF
+
# Add COPYING file:
mkdir -p $PKG/usr/doc/xorg-server-$MODULAR_PACKAGE_VERSION
cp -a COPYING $PKG/usr/doc/xorg-server-$MODULAR_PACKAGE_VERSION
diff --git a/source/x/x11/post-install/xorg-sgml-doctools.post-install b/source/x/x11/post-install/xorg-sgml-doctools.post-install
new file mode 100644
index 00000000..b25fb344
--- /dev/null
+++ b/source/x/x11/post-install/xorg-sgml-doctools.post-install
@@ -0,0 +1,2 @@
+mkdir -p $PKG/usr/lib
+mv $PKG/usr/share/pkgconfig $PKG/usr/lib
diff --git a/source/x/x11/post-install/xproto.post-install b/source/x/x11/post-install/xproto.post-install
new file mode 100644
index 00000000..5a3b79b3
--- /dev/null
+++ b/source/x/x11/post-install/xproto.post-install
@@ -0,0 +1,2 @@
+# bloat
+rm -rf $PKG/usr/doc/xproto
diff --git a/source/x/x11/slack-desc/mkcfm b/source/x/x11/slack-desc/mkcfm
deleted file mode 100644
index fa3a212c..00000000
--- a/source/x/x11/slack-desc/mkcfm
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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------------------------------------------------------|
-mkcfm: mkcfm
-mkcfm:
-mkcfm: mkcfm is part of X11.
-mkcfm:
-mkcfm: For more information about the X.Org Foundation (the providers of the
-mkcfm: X.Org implementation of the X Window System), see their website:
-mkcfm:
-mkcfm: http://www.x.org
-mkcfm:
-mkcfm:
-mkcfm:
diff --git a/source/x/x11/slack-desc/xf86-video-nouveau b/source/x/x11/slack-desc/xf86-video-nouveau
new file mode 100644
index 00000000..8697a60e
--- /dev/null
+++ b/source/x/x11/slack-desc/xf86-video-nouveau
@@ -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------------------------------------------------------|
+xf86-video-nouveau: xf86-video-nouveau
+xf86-video-nouveau:
+xf86-video-nouveau: xf86-video-nouveau is part of X11.
+xf86-video-nouveau:
+xf86-video-nouveau: For more information about the X.Org Foundation (the providers of the
+xf86-video-nouveau: X.Org implementation of the X Window System), see their website:
+xf86-video-nouveau:
+xf86-video-nouveau: http://www.x.org
+xf86-video-nouveau:
+xf86-video-nouveau:
+xf86-video-nouveau:
diff --git a/source/x/x11/src/get-xf86-video-nouveau.sh b/source/x/x11/src/get-xf86-video-nouveau.sh
new file mode 100755
index 00000000..72d3efd3
--- /dev/null
+++ b/source/x/x11/src/get-xf86-video-nouveau.sh
@@ -0,0 +1,22 @@
+# Pull a stable branch + patches
+BRANCH=master
+
+rm -rf xf86-video-nouveau
+git clone git://anongit.freedesktop.org/git/nouveau/xf86-video-nouveau/
+
+# use master branch
+#( cd xf86-video-nouveau
+# git checkout $BRANCH || exit 1
+#)
+
+HEADISAT="$(cat xf86-video-nouveau/.git/packed-refs | grep refs/remotes/origin/$BRANCH | cut -b1-7)"
+# Cleanup. We're not packing up the whole git repo.
+( cd xf86-video-nouveau && find . -type d -name ".git*" -exec rm -rf {} \; 2> /dev/null )
+DATE=$(date +%Y%m%d)
+mv xf86-video-nouveau xf86-video-nouveau-git_${DATE}_${HEADISAT}
+tar cf xf86-video-nouveau-git_${DATE}_${HEADISAT}.tar xf86-video-nouveau-git_${DATE}_${HEADISAT}
+xz -9 xf86-video-nouveau-git_${DATE}_${HEADISAT}.tar
+rm -rf xf86-video-nouveau-git_${DATE}_${HEADISAT}
+echo
+echo "xf86-video-nouveau branch $BRANCH with HEAD at $HEADISAT packaged as xf86-video-nouveau-git_${DATE}_${HEADISAT}.tar.xz"
+echo
diff --git a/source/x/xaw3d/Xaw3d-1.5-debian-fixes.diff b/source/x/xaw3d/Xaw3d-1.5-debian-fixes.diff
deleted file mode 100644
index 5593f249..00000000
--- a/source/x/xaw3d/Xaw3d-1.5-debian-fixes.diff
+++ /dev/null
@@ -1,647 +0,0 @@
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/AsciiSrc.c.debian Xaw3d-1.5E/xc/lib/Xaw3d/AsciiSrc.c
---- Xaw3d-1.5E/xc/lib/Xaw3d/AsciiSrc.c.debian 2000-11-27 14:19:36.000000000 +0100
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/AsciiSrc.c 2008-10-06 11:42:13.000000000 +0200
-@@ -51,11 +51,17 @@ in this Software without prior written a
- #include <X11/Xaw3d/MultiSrcP.h>
- #endif
-
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <fcntl.h>
-
- #if (defined(ASCII_STRING) || defined(ASCII_DISK))
- # include <X11/Xaw3d/AsciiText.h> /* for Widget Classes. */
- #endif
-
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <fcntl.h>
-
- /****************************************************************
- *
-@@ -1007,7 +1013,9 @@ InitStringOrFile(src, newString)
- AsciiSrcObject src;
- Boolean newString;
- {
-- char * open_mode = NULL;
-+ mode_t open_mode = 0;
-+ const char *fdopen_mode = NULL;
-+ int fd;
- FILE * file;
- char fileName[TMPSIZ];
-
-@@ -1049,7 +1057,8 @@ Boolean newString;
- XtErrorMsg("NoFile", "asciiSourceCreate", "XawError",
- "Creating a read only disk widget and no file specified.",
- NULL, 0);
-- open_mode = "r";
-+ open_mode = O_RDONLY;
-+ fdopen_mode = "r";
- break;
- case XawtextAppend:
- case XawtextEdit:
-@@ -1057,9 +1066,17 @@ Boolean newString;
- src->ascii_src.string = fileName;
- (void) tmpnam(src->ascii_src.string);
- src->ascii_src.is_tempfile = TRUE;
-- open_mode = "w";
-- } else
-- open_mode = "r+";
-+ open_mode = O_WRONLY | O_CREAT | O_EXCL;
-+ fdopen_mode = "w";
-+ } else {
-+/* O_NOFOLLOW is a BSD & Linux extension */
-+#ifdef O_NOFOLLOW
-+ open_mode = O_RDWR | O_NOFOLLOW;
-+#else
-+ open_mode = O_RDWR; /* unsafe; subject to race conditions */
-+#endif
-+ fdopen_mode = "r+";
-+ }
- break;
- default:
- XtErrorMsg("badMode", "asciiSourceCreate", "XawError",
-@@ -1078,11 +1095,14 @@ Boolean newString;
- }
-
- if (!src->ascii_src.is_tempfile) {
-- if ((file = fopen(src->ascii_src.string, open_mode)) != 0) {
-- (void) fseek(file, (Off_t)0, 2);
-- src->ascii_src.length = (XawTextPosition) ftell(file);
-- return file;
-- } else {
-+ if ((fd = open(src->ascii_src.string, open_mode, 0666))) {
-+ if ((file = fdopen(fd, fdopen_mode)) != NULL) {
-+ (void)fseek(file, 0, SEEK_END);
-+ src->ascii_src.length = (XawTextPosition)ftell(file);
-+ return (file);
-+ }
-+ }
-+ {
- String params[2];
- Cardinal num_params = 2;
-
-@@ -1094,7 +1114,7 @@ Boolean newString;
- }
- }
- src->ascii_src.length = 0;
-- return((FILE *)NULL);
-+ return(NULL);
- }
-
- static void
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/AsciiSrcP.h.debian Xaw3d-1.5E/xc/lib/Xaw3d/AsciiSrcP.h
---- Xaw3d-1.5E/xc/lib/Xaw3d/AsciiSrcP.h.debian 1996-10-15 16:41:18.000000000 +0200
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/AsciiSrcP.h 2008-10-06 11:42:13.000000000 +0200
-@@ -85,7 +85,11 @@ SOFTWARE.
- #ifdef L_tmpnam
- #define TMPSIZ L_tmpnam
- #else
--#define TMPSIZ 32 /* bytes to allocate for tmpnam */
-+#ifdef PATH_MAX
-+#define TMPSIZ PATH_MAX
-+#else
-+#define TMPSIZ 1024 /* bytes to allocate for tmpnam */
-+#endif
- #endif
-
- #define MAGIC_VALUE ((XawTextPosition) -1) /* Magic value. */
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/MenuButton.c.debian Xaw3d-1.5E/xc/lib/Xaw3d/MenuButton.c
---- Xaw3d-1.5E/xc/lib/Xaw3d/MenuButton.c.debian 1996-10-15 16:41:20.000000000 +0200
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/MenuButton.c 2008-10-06 11:42:13.000000000 +0200
-@@ -53,6 +53,8 @@ in this Software without prior written a
- #include <X11/Xaw3d/XawInit.h>
- #include <X11/Xaw3d/MenuButtoP.h>
-
-+#include "XawAlloc.h"
-+
- static void ClassInitialize();
- static void PopupMenu();
-
-@@ -179,9 +181,16 @@ Cardinal * num_params;
-
- if (menu == NULL) {
- char error_buf[BUFSIZ];
-- (void) sprintf(error_buf, "MenuButton: %s %s.",
-- "Could not find menu widget named", mbw->menu_button.menu_name);
-- XtAppWarning(XtWidgetToApplicationContext(w), error_buf);
-+ char *err1 = "MenuButton: Could not find menu widget named ";
-+ char *perr;
-+ int len;
-+
-+ len = strlen(err1) + strlen(mbw->menu_button.menu_name) + 1 + 1;
-+ perr = XtStackAlloc(len, error_buf);
-+ if (perr == NULL) return;
-+ sprintf(perr, "%s%s.", err1, mbw->menu_button.menu_name);
-+ XtAppWarning(XtWidgetToApplicationContext(w), perr);
-+ XtStackFree(perr, error_buf);
- return;
- }
- if (!XtIsRealized(menu))
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/MultiSrc.c.debian Xaw3d-1.5E/xc/lib/Xaw3d/MultiSrc.c
---- Xaw3d-1.5E/xc/lib/Xaw3d/MultiSrc.c.debian 2008-10-06 11:42:13.000000000 +0200
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/MultiSrc.c 2008-10-06 11:42:13.000000000 +0200
-@@ -74,6 +74,9 @@ in this Software without prior written a
- #include <stdio.h>
- #include <ctype.h>
- #include <errno.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <fcntl.h>
-
- /****************************************************************
- *
-@@ -1077,7 +1080,9 @@ InitStringOrFile(src, newString)
- MultiSrcObject src;
- Boolean newString;
- {
-- char * open_mode = NULL;
-+ mode_t open_mode = 0;
-+ const char *fdopen_mode = NULL;
-+ int fd;
- FILE * file;
- char fileName[TMPSIZ];
- Display *d = XtDisplayOfObject((Widget)src);
-@@ -1128,7 +1133,8 @@ InitStringOrFile(src, newString)
- XtErrorMsg("NoFile", "multiSourceCreate", "XawError",
- "Creating a read only disk widget and no file specified.",
- NULL, 0);
-- open_mode = "r";
-+ open_mode = O_RDONLY;
-+ fdopen_mode = "r";
- break;
- case XawtextAppend:
- case XawtextEdit:
-@@ -1141,9 +1147,17 @@ InitStringOrFile(src, newString)
-
- (void) tmpnam(src->multi_src.string);
- src->multi_src.is_tempfile = TRUE;
-- open_mode = "w";
-- } else
-- open_mode = "r+";
-+ open_mode = O_WRONLY | O_CREAT | O_EXCL;
-+ fdopen_mode = "w";
-+ } else {
-+/* O_NOFOLLOW is a BSD & Linux extension */
-+#ifdef O_NOFOLLOW
-+ open_mode = O_RDWR | O_NOFOLLOW;
-+#else
-+ open_mode = O_RDWR; /* unsafe; subject to race conditions */
-+#endif
-+ fdopen_mode = "r+";
-+ }
- break;
- default:
- XtErrorMsg("badMode", "multiSourceCreate", "XawError",
-@@ -1162,11 +1176,14 @@ InitStringOrFile(src, newString)
- }
-
- if (!src->multi_src.is_tempfile) {
-- if ((file = fopen(src->multi_src.string, open_mode)) != 0) {
-- (void) fseek(file, (Off_t)0, 2);
-- src->multi_src.length = ftell (file);
-- return file;
-- } else {
-+ if ((fd = open(src->multi_src.string, open_mode, 0666))) {
-+ if ((file = fdopen(fd, fdopen_mode)) != NULL) {
-+ (void)fseek(file, 0, SEEK_END);
-+ src->multi_src.length = (XawTextPosition)ftell(file);
-+ return (file);
-+ }
-+ }
-+ {
- String params[2];
- Cardinal num_params = 2;
-
-@@ -1178,7 +1195,7 @@ InitStringOrFile(src, newString)
- }
- }
- src->multi_src.length = 0;
-- return((FILE *)NULL);
-+ return(NULL);
- #undef StrLen
- }
-
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/MultiSrcP.h.debian Xaw3d-1.5E/xc/lib/Xaw3d/MultiSrcP.h
---- Xaw3d-1.5E/xc/lib/Xaw3d/MultiSrcP.h.debian 1996-10-15 16:41:21.000000000 +0200
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/MultiSrcP.h 2008-10-06 11:42:13.000000000 +0200
-@@ -113,7 +113,11 @@ SOFTWARE.
- #ifdef L_tmpnam
- #define TMPSIZ L_tmpnam
- #else
--#define TMPSIZ 32 /* bytes to allocate for tmpnam */
-+#ifdef PATH_MAX
-+#define TMPSIZ PATH_MAX
-+#else
-+#define TMPSIZ 1024 /* bytes to allocate for tmpnam */
-+#endif
- #endif
-
- #define MAGIC_VALUE ((XawTextPosition) -1) /* Magic value. */
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/Simple.c.debian Xaw3d-1.5E/xc/lib/Xaw3d/Simple.c
---- Xaw3d-1.5E/xc/lib/Xaw3d/Simple.c.debian 2000-11-27 14:19:36.000000000 +0100
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/Simple.c 2008-10-06 11:42:13.000000000 +0200
-@@ -56,6 +56,8 @@ SOFTWARE.
- #include <X11/Xaw3d/SimpleP.h>
- #include <X11/Xmu/Drawing.h>
-
-+#include "XawAlloc.h"
-+
- #define offset(field) XtOffsetOf(SimpleRec, simple.field)
-
- static XtResource resources[] = {
-@@ -148,11 +150,17 @@ static void ClassPartInitialize(class)
-
- if (c->simple_class.change_sensitive == NULL) {
- char buf[BUFSIZ];
--
-- (void) sprintf(buf,
-- "%s Widget: The Simple Widget class method 'change_sensitive' is undefined.\nA function must be defined or inherited.",
-- c->core_class.class_name);
-- XtWarning(buf);
-+ char *pbuf;
-+ char *msg1 = " Widget: The Simple Widget class method 'change_sensitive' is undefined.\nA function must be defined or inherited.";
-+ int len;
-+
-+ len = strlen(msg1) + strlen(c->core_class.class_name) + 1;
-+ pbuf = XtStackAlloc(len, buf);
-+ if (pbuf != NULL) {
-+ sprintf(pbuf, "%s%s", c->core_class.class_name, msg1);
-+ XtWarning(pbuf);
-+ XtStackFree(pbuf, buf);
-+ }
- c->simple_class.change_sensitive = ChangeSensitive;
- }
-
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/SimpleMenu.c.debian Xaw3d-1.5E/xc/lib/Xaw3d/SimpleMenu.c
---- Xaw3d-1.5E/xc/lib/Xaw3d/SimpleMenu.c.debian 2003-02-17 07:45:07.000000000 +0100
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/SimpleMenu.c 2008-10-06 11:42:13.000000000 +0200
-@@ -51,6 +51,8 @@ in this Software without prior written a
- #include <X11/Xmu/Initer.h>
- #include <X11/Xmu/CharSet.h>
-
-+#include "XawAlloc.h"
-+
- #define streq(a, b) ( strcmp((a), (b)) == 0 )
-
- #define offset(field) XtOffsetOf(SimpleMenuRec, simple_menu.field)
-@@ -755,9 +757,17 @@ Cardinal * num_params;
-
- if ( (menu = FindMenu(w, params[0])) == NULL) {
- char error_buf[BUFSIZ];
-- (void) sprintf(error_buf, "%s '%s'",
-- "Xaw - SimpleMenuWidget: could not find menu named: ", params[0]);
-- XtAppWarning(XtWidgetToApplicationContext(w), error_buf);
-+ char *err1 = "Xaw - SimpleMenuWidget: could not find menu named: ";
-+ char *perr;
-+ int len;
-+
-+ len = strlen(err1) + strlen(params[0]) + 2 + 1;
-+ perr = XtStackAlloc(len, error_buf);
-+ if (perr == NULL)
-+ return;
-+ sprintf(perr, "%s'%s'", err1, params[0]);
-+ XtAppWarning(XtWidgetToApplicationContext(w), perr);
-+ XtStackFree(perr, error_buf);
- return;
- }
-
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/StripChart.c.debian Xaw3d-1.5E/xc/lib/Xaw3d/StripChart.c
---- Xaw3d-1.5E/xc/lib/Xaw3d/StripChart.c.debian 2003-02-10 18:18:00.000000000 +0100
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/StripChart.c 2008-10-06 11:42:13.000000000 +0200
-@@ -315,7 +315,15 @@ XtIntervalId *id; /* unused */
- if (w->strip_chart.points != NULL) {
- w->strip_chart.points[0].x = w->strip_chart.interval + s;
- XDrawPoints(XtDisplay(w), XtWindow(w), w->strip_chart.hiGC,
-- w->strip_chart.points, w->strip_chart.scale,
-+ /*
-+ * patch:
-+ *
-+ * w->strip_chart.points, w->strip_chart.scale,
-+ *
-+ * this to avoid a subdle bug of extra spurios scan
-+ * line in this widget.
-+ */
-+ w->strip_chart.points, w->strip_chart.scale - 1,
- CoordModePrevious);
- }
-
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/Text.c.debian Xaw3d-1.5E/xc/lib/Xaw3d/Text.c
---- Xaw3d-1.5E/xc/lib/Xaw3d/Text.c.debian 2008-10-06 11:42:13.000000000 +0200
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/Text.c 2008-10-06 11:43:16.000000000 +0200
-@@ -76,6 +76,8 @@ SOFTWARE.
- #include <ctype.h> /* for isprint() */
- #include <stdlib.h>
-
-+#include "XawAlloc.h"
-+
- #ifndef MAX_LEN_CT
- #define MAX_LEN_CT 6 /* for sequence: ESC $ ( A \xx \xx */
- #endif
-@@ -521,6 +523,8 @@ Cardinal *num_args; /* unused */
- TextWidget ctx = (TextWidget) new;
- char error_buf[BUFSIZ];
- int s;
-+ char *perr; /* frankie */
-+ size_t len; /* frankie */
-
- ctx->text.threeD = XtVaCreateWidget("threeD", threeDWidgetClass, new,
- XtNx, 0, XtNy, 0,
-@@ -569,10 +573,17 @@ Cardinal *num_args; /* unused */
- if (ctx->text.scroll_vert != XawtextScrollNever)
- if ( (ctx->text.resize == XawtextResizeHeight) ||
- (ctx->text.resize == XawtextResizeBoth) ) {
-- (void) sprintf(error_buf, "Xaw Text Widget %s:\n %s %s.", ctx->core.name,
-- "Vertical scrolling not allowed with height resize.\n",
-- "Vertical scrolling has been DEACTIVATED.");
-- XtAppWarning(XtWidgetToApplicationContext(new), error_buf);
-+ char *err1 = "Xaw Text Widget ";
-+ char *err2 = ":\nVertical scrolling not allowed with height resize.\n";
-+ char *err3 = "Vertical scrolling has been DEACTIVATED.";
-+ len = strlen(err1) + strlen(err2) + strlen(err3) +
-+ strlen(ctx->core.name) + 1;
-+ perr = XtStackAlloc(len, error_buf);
-+ if (perr != NULL) {
-+ (void) sprintf(perr, "%s%s%s%s", err1, ctx->core.name, err2, err3);
-+ XtAppWarning(XtWidgetToApplicationContext(new), perr);
-+ XtStackFree(perr, error_buf);
-+ }
- ctx->text.scroll_vert = XawtextScrollNever;
- }
- else if (ctx->text.scroll_vert == XawtextScrollAlways)
-@@ -580,18 +591,32 @@ Cardinal *num_args; /* unused */
-
- if (ctx->text.scroll_horiz != XawtextScrollNever)
- if (ctx->text.wrap != XawtextWrapNever) {
-- (void) sprintf(error_buf, "Xaw Text Widget %s:\n %s %s.", ctx->core.name,
-- "Horizontal scrolling not allowed with wrapping active.\n",
-- "Horizontal scrolling has been DEACTIVATED.");
-- XtAppWarning(XtWidgetToApplicationContext(new), error_buf);
-+ char *err1 = "Xaw Text Widget ";
-+ char *err2 = ":\nHorizontal scrolling not allowed with wrapping active.";
-+ char *err3 = "\nHorizontal scrolling has been DEACTIVATED.";
-+ len = strlen(err1) + strlen(err2) + strlen(err3) +
-+ strlen(ctx->core.name) + 1;
-+ perr = XtStackAlloc(len, error_buf);
-+ if (perr != NULL) {
-+ (void) sprintf(perr, "%s%s%s%s", err1, ctx->core.name, err2, err3);
-+ XtAppWarning(XtWidgetToApplicationContext(new), perr);
-+ XtStackFree(perr, error_buf);
-+ }
- ctx->text.scroll_horiz = XawtextScrollNever;
- }
- else if ( (ctx->text.resize == XawtextResizeWidth) ||
- (ctx->text.resize == XawtextResizeBoth) ) {
-- (void) sprintf(error_buf, "Xaw Text Widget %s:\n %s %s.", ctx->core.name,
-- "Horizontal scrolling not allowed with width resize.\n",
-- "Horizontal scrolling has been DEACTIVATED.");
-- XtAppWarning(XtWidgetToApplicationContext(new), error_buf);
-+ char *err1 = "Xaw Text Widget ";
-+ char *err2 = ":\nHorizontal scrolling not allowed with width resize.\n";
-+ char *err3 = "Horizontal scrolling has been DEACTIVATED.";
-+ len = strlen(err1) + strlen(err2) + strlen(err3) +
-+ strlen(ctx->core.name) + 1;
-+ perr = XtStackAlloc(len, error_buf);
-+ if (perr != NULL) {
-+ (void) sprintf(perr, "%s%s%s%s", err1, ctx->core.name, err2, err3);
-+ XtAppWarning(XtWidgetToApplicationContext(new), perr);
-+ XtStackFree(perr, error_buf);
-+ }
- ctx->text.scroll_horiz = XawtextScrollNever;
- }
- else if (ctx->text.scroll_horiz == XawtextScrollAlways)
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/TextPop.c.debian Xaw3d-1.5E/xc/lib/Xaw3d/TextPop.c
---- Xaw3d-1.5E/xc/lib/Xaw3d/TextPop.c.debian 2000-11-27 14:19:36.000000000 +0100
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/TextPop.c 2008-10-06 11:42:13.000000000 +0200
-@@ -66,6 +66,8 @@ in this Software without prior written a
- #include <X11/Xos.h> /* for O_RDONLY */
- #include <errno.h>
-
-+#include "XawAlloc.h"
-+
- #ifdef X_NOT_STDC_ENV
- extern int errno;
- #endif
-@@ -809,6 +811,8 @@ DoSearch(search)
- struct SearchAndReplace * search;
- {
- char msg[BUFSIZ];
-+ char *pmsg;
-+ int len;
- Widget tw = XtParent(search->search_popup);
- XawTextPosition pos;
- XawTextScanDirection dir;
-@@ -835,9 +839,20 @@ struct SearchAndReplace * search;
- /* The Raw string in find.ptr may be WC I can't use here, so I re - call
- GetString to get a tame version. */
-
-- if (pos == XawTextSearchError)
-- (void) sprintf( msg, "Could not find string ``%s''.", GetString( search->search_text ) );
-- else {
-+ if (pos == XawTextSearchError) {
-+ char *msg1 = "Could not find string ``";
-+ char *msg2 = "''.";
-+ len = strlen(msg1) + strlen(msg2) +
-+ strlen(GetString( search->search_text )) + 1;
-+ pmsg = XtStackAlloc(len, msg);
-+ if (pmsg != NULL) {
-+ (void) sprintf( pmsg, "%s%s%s", msg1, GetString( search->search_text ),
-+ msg2);
-+ } else {
-+ pmsg = msg;
-+ (void) sprintf( pmsg, "Could not find string");
-+ }
-+ } else {
- if (dir == XawsdRight)
- XawTextSetInsertionPoint( tw, pos + text.length);
- else
-@@ -849,7 +864,8 @@ struct SearchAndReplace * search;
- }
-
- XawTextUnsetSelection(tw);
-- SetSearchLabels(search, msg, "", TRUE);
-+ SetSearchLabels(search, pmsg, "", TRUE);
-+ XtStackFree(pmsg, msg);
- return(FALSE);
- }
-
-@@ -982,13 +998,26 @@ Boolean once_only, show_current;
- if ( (new_pos == XawTextSearchError) ) {
- if (count == 0) {
- char msg[BUFSIZ];
-+ char *pmsg;
-+ int len;
-+ char *msg1 = "*** Error: Could not find string ``";
-+ char *msg2 = "''. ***";
-
- /* The Raw string in find.ptr may be WC I can't use here,
- so I call GetString to get a tame version.*/
-
-- (void) sprintf( msg, "%s %s %s", "*** Error: Could not find string ``",
-- GetString( search->search_text ), "''. ***");
-- SetSearchLabels(search, msg, "", TRUE);
-+ len = strlen(msg1) + strlen(msg2) +
-+ strlen(GetString( search->search_text )) + 1;
-+ pmsg = XtStackAlloc(len, msg);
-+ if (pmsg != NULL) {
-+ (void) sprintf( pmsg, "%s%s%s", msg1,
-+ GetString( search->search_text ), msg2);
-+ } else {
-+ pmsg = msg;
-+ (void) sprintf(pmsg, "*** Error: Could not find string ***");
-+ }
-+ SetSearchLabels(search, pmsg, "", TRUE);
-+ XtStackFree(pmsg, msg);
- return(FALSE);
- }
- else
-@@ -1011,9 +1040,22 @@ Boolean once_only, show_current;
-
- if (XawTextReplace(tw, pos, end_pos, &replace) != XawEditDone) {
- char msg[BUFSIZ];
--
-- (void) sprintf( msg, "'%s' with '%s'. ***", find.ptr, replace.ptr);
-+ char *pmsg;
-+ int len;
-+ char *msg1 = "' with '";
-+ char *msg2 = "'. ***";
-+
-+ len = 1 + strlen(msg1) + strlen(msg2) + strlen(find.ptr) +
-+ strlen(replace.ptr) + 1;
-+ pmsg = XtStackAlloc(len, msg);
-+ if (pmsg != NULL) {
-+ (void) sprintf( pmsg, "`%s%s%s%s", find.ptr, msg1, replace.ptr, msg2);
-+ } else {
-+ pmsg = msg;
-+ (void) sprintf(pmsg, "string ***");
-+ }
- SetSearchLabels(search, "*** Error while replacing", msg, TRUE);
-+ XtStackFree(pmsg, msg);
- return(FALSE);
- }
-
-@@ -1164,13 +1206,20 @@ XtArgVal value;
- {
- Widget temp_widget;
- char buf[BUFSIZ];
-+ char *pbuf;
-+ int len;
-
-- (void) sprintf(buf, "%s.%s", FORM_NAME, name);
-+ len = strlen(FORM_NAME) + strlen(name) + 2;
-+ pbuf = XtStackAlloc(len, buf);
-+ if (pbuf == NULL) return FALSE;
-+ (void) sprintf(pbuf, "%s.%s", FORM_NAME, name);
-
-- if ( (temp_widget = XtNameToWidget(shell, buf)) != NULL) {
-+ if ( (temp_widget = XtNameToWidget(shell, pbuf)) != NULL) {
- SetResource(temp_widget, res_name, value);
-+ XtStackFree(pbuf, buf);
- return(TRUE);
- }
-+ XtStackFree(pbuf, buf);
- return(FALSE);
- }
-
-diff -up /dev/null Xaw3d-1.5E/xc/lib/Xaw3d/XawAlloc.h
---- /dev/null 2008-10-06 08:37:32.418005377 +0200
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/XawAlloc.h 2008-10-06 11:42:13.000000000 +0200
-@@ -0,0 +1,10 @@
-+/* $XFree86: xc/lib/Xaw/XawAlloc.h,v 1.1.2.1 1998/05/16 09:05:23 dawes Exp $ */
-+
-+#define XtStackAlloc(size, stack_cache_array) \
-+ ((size) <= sizeof(stack_cache_array) \
-+ ? (XtPointer)(stack_cache_array) \
-+ : XtMalloc((unsigned)(size)))
-+
-+#define XtStackFree(pointer, stack_cache_array) \
-+ if ((pointer) != ((XtPointer)(stack_cache_array))) XtFree(pointer); else
-+
---- xaw3d-1.5e/xc/lib/Xaw3d/SmeBSB.c 2003-08-04 17:27:58.000000000 +0200
-+++ xaw3d-1.5e/xc/lib/Xaw3d/SmeBSB.c 2003-08-07 15:02:39.000000000 +0200
-@@ -52,6 +52,8 @@
- #include <X11/Xaw3d/Cardinals.h>
- #include <stdio.h>
-
-+#include "XawAlloc.h"
-+
- /* needed for abs() */
- #ifndef X_NOT_STDC_ENV
- #include <stdlib.h>
-@@ -712,6 +714,8 @@
- int x, y;
- unsigned int width, height, bw;
- char buf[BUFSIZ];
-+ char *pbuf;
-+ int len;
-
- if (is_left) {
- width = height = 0;
-@@ -720,18 +724,24 @@
- if (!XGetGeometry(XtDisplayOfObject(w),
- entry->sme_bsb.left_bitmap, &root, &x, &y,
- &width, &height, &bw, &entry->sme_bsb.left_depth)) {
-- (void) sprintf(buf, "Xaw SmeBSB Object: %s %s \"%s\".",
-- "Could not get Left Bitmap",
-- "geometry information for menu entry",
-- XtName(w));
-- XtAppError(XtWidgetToApplicationContext(w), buf);
-+ char *err1 = "Xaw SmeBSB Object: Could not get Left Bitmap geometry information for menu entry ";
-+ len = strlen(err1) + strlen(XtName(w)) + 3 + 1;
-+ pbuf = XtStackAlloc(len, buf);
-+ if (pbuf == NULL) return;
-+ sprintf(pbuf, "%s\"%s\".", err1, XtName(w));
-+ XtAppError(XtWidgetToApplicationContext(w), pbuf);
-+ XtStackFree(pbuf, buf);
- }
- #ifdef NEVER
- if (entry->sme_bsb.left_depth != 1) {
-- (void) sprintf(buf, "Xaw SmeBSB Object: %s \"%s\" %s.",
-- "Left Bitmap of entry", XtName(w),
-- "is not one bit deep");
-- XtAppError(XtWidgetToApplicationContext(w), buf);
-+ char *err1 = "Xaw SmeBSB Object: Left Bitmap of entry ";
-+ char *err2 = " is not one bit deep.";
-+ len = strlen(err1) + strlen(err2) + strlen(XtName(w)) + 2 + 1;
-+ pbuf = XtStackAlloc(len, buf);
-+ if (pbuf == NULL) return;
-+ sprintf(pbuf, "%s\"%s\"%s", err1, XtName(w), err2);
-+ XtAppError(XtWidgetToApplicationContext(w), pbuf);
-+ XtStackFree(pbuf, buf);
- }
- #endif
- }
-@@ -745,18 +755,24 @@
- if (!XGetGeometry(XtDisplayOfObject(w),
- entry->sme_bsb.right_bitmap, &root, &x, &y,
- &width, &height, &bw, &entry->sme_bsb.right_depth)) {
-- (void) sprintf(buf, "Xaw SmeBSB Object: %s %s \"%s\".",
-- "Could not get Right Bitmap",
-- "geometry information for menu entry",
-- XtName(w));
-- XtAppError(XtWidgetToApplicationContext(w), buf);
-+ char *err1 = "Xaw SmeBSB Object: Could not get Right Bitmap geometry information for menu entry ";
-+ len = strlen(err1) + strlen(XtName(w)) + 3 + 1;
-+ pbuf = XtStackAlloc(len, buf);
-+ if (pbuf == NULL) return;
-+ sprintf(pbuf, "%s\"%s\".", err1, XtName(w));
-+ XtAppError(XtWidgetToApplicationContext(w), pbuf);
-+ XtStackFree(pbuf, buf);
- }
- #ifdef NEVER
- if (entry->sme_bsb.right_depth != 1) {
-- (void) sprintf(buf, "Xaw SmeBSB Object: %s \"%s\" %s.",
-- "Right Bitmap of entry", XtName(w),
-- "is not one bit deep");
-- XtAppError(XtWidgetToApplicationContext(w), buf);
-+ char *err1 = "Xaw SmeBSB Object: Right Bitmap of entry ";
-+ char *err2 = " is not one bit deep.";
-+ len = strlen(err1) + strlen(err2) + strlen(XtName(w)) + 2 + 1;
-+ pbuf = XtStackAlloc(len, buf);
-+ if (pbuf == NULL) return;
-+ sprintf(pbuf, "%s\"%s\"%s", err1, XtName(w), err2);
-+ XtAppError(XtWidgetToApplicationContext(w), pbuf);
-+ XtStackFree(pbuf, buf);
- }
- #endif
- }
diff --git a/source/x/xaw3d/Xaw3d-1.5E.diff b/source/x/xaw3d/Xaw3d-1.5E.diff
deleted file mode 100644
index e476b5c4..00000000
--- a/source/x/xaw3d/Xaw3d-1.5E.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -up Xaw3d-1.5E/xc/lib/Xaw3d/Scrollbar.c.orig Xaw3d-1.5E/xc/lib/Xaw3d/Scrollbar.c
---- Xaw3d-1.5E/xc/lib/Xaw3d/Scrollbar.c.orig 2003-02-10 18:22:26.000000000 +0100
-+++ Xaw3d-1.5E/xc/lib/Xaw3d/Scrollbar.c 2008-10-06 10:07:46.000000000 +0200
-@@ -1087,7 +1087,11 @@ static void NotifyThumb (w, event, param
- Cardinal *num_params; /* unused */
- {
- register ScrollbarWidget sbw = (ScrollbarWidget) w;
-- float top = sbw->scrollbar.top;
-+ union {
-+ XtPointer pt;
-+ float top;
-+ } foo;
-+ foo.top = sbw->scrollbar.top;
-
- #ifndef XAW_ARROW_SCROLLBARS
- if (sbw->scrollbar.direction == 0) return; /* if no StartScroll */
-@@ -1116,10 +1120,10 @@ static void NotifyThumb (w, event, param
- /* Removed the dependancy on scrollbar arrows. Xterm as distributed in
- X11R6.6 by The XFree86 Project wants this correction, with or without
- the arrows. */
-- top += 0.0001;
-+ foo.top += 0.0001;
- /* #endif */
-- XtCallCallbacks (w, XtNthumbProc, *(XtPointer*)&top);
-- XtCallCallbacks (w, XtNjumpProc, (XtPointer)&top);
-+ XtCallCallbacks (w, XtNthumbProc, foo.pt);
-+ XtCallCallbacks (w, XtNjumpProc, (XtPointer)&sbw->scrollbar.top);
- }
-
-
diff --git a/source/x/xaw3d/pull-xaw3d.sh b/source/x/xaw3d/pull-xaw3d.sh
new file mode 100755
index 00000000..96141a6d
--- /dev/null
+++ b/source/x/xaw3d/pull-xaw3d.sh
@@ -0,0 +1,7 @@
+rm -rf xaw3d
+git clone git://gitorious.org/xaw3d/xaw3d.git
+( cd xaw3d && rm -rf .git* )
+mv xaw3d xaw3d-$(date +%Y%m%d)git
+tar cf xaw3d-$(date +%Y%m%d)git.tar xaw3d-$(date +%Y%m%d)git
+xz -9 xaw3d-$(date +%Y%m%d)git.tar
+
diff --git a/source/x/xaw3d/xaw3d.SlackBuild b/source/x/xaw3d/xaw3d.SlackBuild
index 2991fe7a..1574d7f3 100755
--- a/source/x/xaw3d/xaw3d.SlackBuild
+++ b/source/x/xaw3d/xaw3d.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2011 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -21,11 +21,20 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-VERSION=${VERSION:-1.5E}
-ARCH=${ARCH:-x86_64}
-NUMJOBS=${NUMJOBS:-" -j7 "}
+PKGNAM=xaw3d
+VERSION=${VERSION:-20110415git}
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
+
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
LIBDIRSUFFIX=""
@@ -37,6 +46,8 @@ elif [ "$ARCH" = "x86_64" ]; then
LIBDIRSUFFIX="64"
fi
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=$TMP/package-xaw3d
@@ -44,11 +55,9 @@ rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
-rm -rf $TMP/xc
-tar xvf $CWD/Xaw3d-$VERSION.tar.gz || exit 1
-( cd xc ; zcat $CWD/Xaw3d-$VERSION.diff.gz | patch -p2 --verbose --backup --suffix=.orig )
-( cd xc ; zcat $CWD/Xaw3d-1.5-debian-fixes.diff.gz | patch -p2 --verbose --backup --suffix=.orig )
-cd xc
+rm -rf $TMP/xaw3d-$VERSION
+tar xvf $CWD/xaw3d-$VERSION.tar.?z* || exit 1
+cd xaw3d-$VERSION/xc || exit 1
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -60,35 +69,19 @@ cd lib/Xaw3d
ln -s .. X11
xmkmf
make CCOPTIONS="$SLKCFLAGS -I." || exit 1
-strip --strip-unneeded libXaw3d.so.8.0
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}
-cat libXaw3d.so.8.0 > $PKG/usr/lib${LIBDIRSUFFIX}/libXaw3d.so.8.0
-chmod 755 $PKG/usr/lib${LIBDIRSUFFIX}/libXaw3d.so.8.0
-# Make compat symlinks:
+make install DESTDIR=$PKG
+
+strip --strip-unneeded $PKG/usr/lib${LIBDIRSUFFIX}/libXaw3d.so.*
+# Make compat symlinks. For whatever reason, Xaw3d has had more random
+# numbers assigned to it over the years than about anything, so we need
+# to make links that work for at least .6 and .8 in addition to .7.
( cd $PKG/usr/lib${LIBDIRSUFFIX}
- ln -sf libXaw3d.so.8.0 libXaw3d.so.8
- ln -sf libXaw3d.so.8 libXaw3d.so
- ln -sf libXaw3d.so.8 libXaw3d.so.7
+ ln -sf libXaw3d.so.7 libXaw3d.so.8
ln -sf libXaw3d.so.7 libXaw3d.so.6
)
mkdir -p $PKG/usr/doc/Xaw3d-$VERSION
cp -a README.XAW3D $PKG/usr/doc/Xaw3d-$VERSION
chmod 644 $PKG/usr/doc/Xaw3d-$VERSION/README.XAW3D
-mkdir -p $PKG/usr/include/X11/Xaw3d
-for header in AllWidgets.h AsciiSink.h AsciiSinkP.h AsciiSrc.h AsciiSrcP.h \
-AsciiText.h AsciiTextP.h Box.h BoxP.h Cardinals.h Command.h CommandP.h \
-Dialog.h DialogP.h Form.h FormP.h Grip.h GripP.h Label.h LabelP.h Layout.h \
-LayoutP.h List.h ListP.h MenuButton.h MenuButtoP.h MultiSrc.h MultiSrcP.h \
-MultiSink.h MultiSinkP.h Paned.h PanedP.h Panner.h PannerP.h Porthole.h \
-PortholeP.h Repeater.h RepeaterP.h Reports.h Scrollbar.h ScrollbarP.h \
-Simple.h SimpleP.h SimpleMenu.h SimpleMenP.h Sme.h SmeP.h SmeBSB.h SmeBSBP.h \
-SmeLine.h SmeLineP.h SmeThreeD.h SmeThreeDP.h StripChart.h StripCharP.h \
-Template.c Template.h TemplateP.h Text.h TextP.h TextSink.h TextSinkP.h \
-TextSrc.h TextSrcP.h ThreeD.h ThreeDP.h Tip.h TipP.h Toggle.h ToggleP.h Tree.h \
-TreeP.h VendorEP.h Viewport.h ViewportP.h Xaw3dP.h XawImP.h XawInit.h ; do
- cp -a $header $PKG/usr/include/X11/Xaw3d/$header
- chmod 644 $PKG/usr/include/X11/Xaw3d/$header
-done
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/source/x/xdg-user-dirs/doinst.sh b/source/x/xdg-user-dirs/doinst.sh
new file mode 100644
index 00000000..de72d567
--- /dev/null
+++ b/source/x/xdg-user-dirs/doinst.sh
@@ -0,0 +1,15 @@
+config() {
+ NEW="$1"
+ OLD="$(dirname $NEW)/$(basename $NEW .new)"
+ # If there's no config file by that name, mv it over:
+ if [ ! -r $OLD ]; then
+ mv $NEW $OLD
+ elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+ # toss the redundant copy
+ rm $NEW
+ fi
+ # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/xdg/user-dirs.conf.new
+config etc/xdg/user-dirs.defaults.new
diff --git a/source/x/xdg-user-dirs/slack-desc b/source/x/xdg-user-dirs/slack-desc
new file mode 100644
index 00000000..543415cb
--- /dev/null
+++ b/source/x/xdg-user-dirs/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------------------------------------------------------|
+xdg-user-dirs: xdg-user-dirs (manage XDG user directories)
+xdg-user-dirs:
+xdg-user-dirs: xdg-user-dirs is a tool used by various XDG compliant desktop
+xdg-user-dirs: environments to locate user well-known user directories such as
+xdg-user-dirs: the Desktop folder. It also handles localization/translation of the
+xdg-user-dirs: filenames.
+xdg-user-dirs:
+xdg-user-dirs: Homepage: http://freedesktop.org/wiki/Software/xdg-user-dirs
+xdg-user-dirs:
+xdg-user-dirs:
+xdg-user-dirs:
diff --git a/source/x/xdg-user-dirs/xdg-user-dirs.SlackBuild b/source/x/xdg-user-dirs/xdg-user-dirs.SlackBuild
new file mode 100755
index 00000000..d3b96542
--- /dev/null
+++ b/source/x/xdg-user-dirs/xdg-user-dirs.SlackBuild
@@ -0,0 +1,97 @@
+#!/bin/sh
+
+# Slackware build script for xdg-user-dirs
+
+# Copyright 2010 Robby Workman, Northport, Alabama, 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.
+
+PKGNAM=xdg-user-dirs
+VERSION=${VERSION:-0.13}
+BUILD=${BUILD:-1}
+
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i486 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+if [ "$ARCH" = "i486" ]; then
+ SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION || exit 1
+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 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --mandir=/usr/man \
+ --docdir=/usr/doc/$PKGNAM-$VERSION \
+ --build=$ARCH-slackware-linux
+
+make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mv $PKG/etc/xdg/user-dirs.conf $PKG/etc/xdg/user-dirs.conf.new
+mv $PKG/etc/xdg/user-dirs.defaults $PKG/etc/xdg/user-dirs.defaults.new
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+ AUTHORS COPYING* INSTALL NEWS README* TODO \
+ $PKG/usr/doc/$PKGNAM-$VERSION
+
+mkdir -p $PKG/install
+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/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/x/xdg-utils/xdg-utils.SlackBuild b/source/x/xdg-utils/xdg-utils.SlackBuild
index 630746e0..ad05d704 100755
--- a/source/x/xdg-utils/xdg-utils.SlackBuild
+++ b/source/x/xdg-utils/xdg-utils.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for xdg-utils
# Written by Erik Hanson erik@slackbuilds.org
-# Modified for CVS version by Patrick Volkerding <volkerdi@slackware.com>
+# Modified for VERSION version by Patrick Volkerding <volkerdi@slackware.com>
# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
@@ -25,26 +25,28 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-PRGNAM=xdg-utils
-VERSION=1.0.2
-CVS=20100506cvs
+PKGNAM=xdg-utils
+VERSION=1.1.0-rc1
ARCH=noarch
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-1}
+
+PKG_VERSION=${VERSION/-/_}
NUMJOBS=${NUMJOBS:-" -j7 "}
CWD=$(pwd)
TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP || exit 1
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$CVS.tar.bz2 || exit 1
-cd $PRGNAM || exit 1
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1
+cd $PKGNAM-$VERSION || exit 1
+
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -63,15 +65,23 @@ make install DESTDIR=$PKG || exit 1
gzip -9 $PKG/usr/man/man1/*
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
cp -a \
LICENSE README RELEASE_NOTES TODO \
- $PKG/usr/doc/$PRGNAM-$VERSION
+ $PKG/usr/doc/$PKGNAM-$VERSION
+
+# 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/${PKGNAM}-$VERSION)
+ cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+ touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
mkdir -p $PKG/install
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/$PRGNAM-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$PKG_VERSION-$ARCH-$BUILD.txz
diff --git a/source/x/xf86-video-nouveau/this_is_NOT_a_driver.txt b/source/x/xf86-video-nouveau/this_is_NOT_a_driver.txt
deleted file mode 100644
index ea6e0e48..00000000
--- a/source/x/xf86-video-nouveau/this_is_NOT_a_driver.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-
-This is not the experimental nouveau driver for nVidia cards.
-
-It is a stub package that installs /etc/modprobe.d/nouveau-blacklist.conf,
-to prevent the nouveau dri module shipped with our kernel from preventing
-the nv driver and/or the binary nVidia driver from working.
-
-If you want to use nouveau, remove this package.
-
-Sorry if it interferes with anyone's xf86-video-nouveau package that they
-didn't get from us, but this seems like the best default. When a real
-xf86-video-nouveau package appears someday, installing it will remove
-the module blacklist file.
-