diff options
Diffstat (limited to 'source/x')
184 files changed, 399 insertions, 413 deletions
diff --git a/source/x/dejavu-fonts-ttf/dejavu-fonts-ttf.SlackBuild b/source/x/dejavu-fonts-ttf/dejavu-fonts-ttf.SlackBuild index 68bac232..6bbaa821 100755 --- a/source/x/dejavu-fonts-ttf/dejavu-fonts-ttf.SlackBuild +++ b/source/x/dejavu-fonts-ttf/dejavu-fonts-ttf.SlackBuild @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=${VERSION:-2.29} +VERSION=${VERSION:-2.30} ARCH=noarch BUILD=1 diff --git a/source/x/fontconfig/doinst.sh b/source/x/fontconfig/doinst.sh new file mode 100644 index 00000000..6a480232 --- /dev/null +++ b/source/x/fontconfig/doinst.sh @@ -0,0 +1,7 @@ +# Update the X font indexes: +if [ -x /usr/bin/fc-cache ]; then + /usr/bin/fc-cache -f +fi +# else we'll catch it later with setup.fontconfig :-) +# make links: + diff --git a/source/x/fontconfig/fontconfig.SlackBuild b/source/x/fontconfig/fontconfig.SlackBuild index 4714b824..5feb6fd9 100755 --- a/source/x/fontconfig/fontconfig.SlackBuild +++ b/source/x/fontconfig/fontconfig.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,10 +21,20 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=2.6.0 -export ARCH=${ARCH:-x86_64} +VERSION=${VERSION:-$(echo fontconfig-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + NUMJOBS=${NUMJOBS:-" -j7 "} -BUILD=${BUILD:-2} CWD=$(pwd) TMP=${TMP:-/tmp} @@ -39,6 +49,9 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi rm -rf $PKG @@ -46,7 +59,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf fontconfig-$VERSION -tar xvf $CWD/fontconfig-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/fontconfig-$VERSION.tar.?z* || exit 1 cd fontconfig-$VERSION chown -R root:root . find . \ @@ -55,8 +68,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -FCPREFIX=/usr - # The wonderful extended version of the font so generously # opened up for free modification and distribution by one # for the previously proprietary font founderies, and that @@ -71,30 +82,32 @@ zcat $CWD/fontconfig.font.dir.list.diff.gz | patch -p1 --verbose --backup --suff CFLAGS=$SLKCFLAGS \ ./configure \ - --prefix=$FCPREFIX \ - --libdir=$FCPREFIX/lib${LIBDIRSUFFIX} \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ --sysconfdir=/etc \ - --localstatedir=/var + --localstatedir=/var \ + --build=$ARCH-slackware-linux # Uses a currently non-functional sgml tool, thus '-i': make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 -# This ought to be easily found here, but it's still safer to move it: -if [ ! -d $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig ]; then - mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig - mv ${PKG}${FCPREFIX}/lib${LIBDIRSUFFIX}/pkgconfig/* $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig - rmdir ${PKG}${FCPREFIX}/lib${LIBDIRSUFFIX}/pkgconfig -fi - mkdir -p $PKG/usr/doc/fontconfig-$VERSION cp -a \ AUTHORS COPYING* INSTALL NEWS README \ $PKG/usr/doc/fontconfig-$VERSION # You can shop for this kind of stuff in the source tarball. -rm -rf ${PKG}${FCPREFIX}/share/doc -rmdir ${PKG}${FCPREFIX}/share +rm -rf $PKG/usr/share/doc +rmdir $PKG/usr/share 2>/dev/null + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi mkdir -p $PKG/var/log/setup cat $CWD/setup.05.fontconfig > $PKG/var/log/setup/setup.05.fontconfig @@ -133,8 +146,8 @@ if [ ! $? = 0 ]; then fi # Fix manpages: -if [ -d ${PKG}${FCPREFIX}/man ]; then - ( cd ${PKG}${FCPREFIX}/man +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man for manpagedir in $(find . -type d -name "man*") ; do ( cd $manpagedir for eachpage in $( find . -type l -maxdepth 1) ; do @@ -148,16 +161,8 @@ if [ -d ${PKG}${FCPREFIX}/man ]; then fi mkdir $PKG/install -cat << EOF >> $PKG/install/doinst.sh -#!/bin/sh -# Update the X font indexes: -if [ -x /usr/bin/fc-cache ]; then - /usr/bin/fc-cache -f -fi -# else we'll catch it later with setup.fontconfig :-) -# make links: -EOF cat $CWD/slack-desc > $PKG/install/slack-desc +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $TMP/fontconfig-$VERSION-$ARCH-$BUILD.txz diff --git a/source/x/fontconfig/fontconfig.dejavu.diff b/source/x/fontconfig/fontconfig.dejavu.diff index 95f8e71e..af71a44b 100644 --- a/source/x/fontconfig/fontconfig.dejavu.diff +++ b/source/x/fontconfig/fontconfig.dejavu.diff @@ -1,5 +1,6 @@ ---- ./conf.d/45-latin.conf.orig 2008-05-03 20:02:06.000000000 -0500 -+++ ./conf.d/45-latin.conf 2008-09-17 21:57:28.000000000 -0500 +diff -Nur fontconfig-2.8.0.orig/conf.d/45-latin.conf fontconfig-2.8.0/conf.d/45-latin.conf +--- fontconfig-2.8.0.orig/conf.d/45-latin.conf 2009-11-16 11:24:52.000000000 -0600 ++++ fontconfig-2.8.0/conf.d/45-latin.conf 2009-12-01 21:45:42.639936724 -0600 @@ -10,9 +10,9 @@ Serif faces --> @@ -30,11 +31,12 @@ <family>DejaVu Sans Mono</family> <family>Liberation Mono</family> + <family>Bitstream Vera Sans Mono</family> + <family>Inconsolata</family> <family>Courier New</family> <family>Courier</family> - <family>Andale Mono</family> ---- ./conf.d/60-latin.conf.orig 2008-05-03 21:17:18.000000000 -0500 -+++ ./conf.d/60-latin.conf 2008-09-17 21:56:37.000000000 -0500 +diff -Nur fontconfig-2.8.0.orig/conf.d/60-latin.conf fontconfig-2.8.0/conf.d/60-latin.conf +--- fontconfig-2.8.0.orig/conf.d/60-latin.conf 2009-11-16 11:24:52.000000000 -0600 ++++ fontconfig-2.8.0/conf.d/60-latin.conf 2009-12-01 21:46:39.925935327 -0600 @@ -4,8 +4,8 @@ <alias> <family>serif</family> @@ -62,6 +64,6 @@ - <family>Bitstream Vera Sans Mono</family> <family>DejaVu Sans Mono</family> + <family>Bitstream Vera Sans Mono</family> + <family>Inconsolata</family> <family>Andale Mono</family> <family>Courier New</family> - <family>Cumberland AMT</family> diff --git a/source/x/fontconfig/fontconfig.font.dir.list.diff b/source/x/fontconfig/fontconfig.font.dir.list.diff index a11ef0b6..1e68b0d1 100644 --- a/source/x/fontconfig/fontconfig.font.dir.list.diff +++ b/source/x/fontconfig/fontconfig.font.dir.list.diff @@ -1,24 +1,25 @@ ---- ./fonts.conf.in.orig 2007-10-25 16:14:27.000000000 -0500 -+++ ./fonts.conf.in 2008-09-22 15:42:21.000000000 -0500 +diff -Nur fontconfig-2.8.0.orig/fonts.conf.in fontconfig-2.8.0/fonts.conf.in +--- fontconfig-2.8.0.orig/fonts.conf.in 2009-06-28 12:48:47.000000000 -0500 ++++ fontconfig-2.8.0/fonts.conf.in 2009-12-01 21:48:48.134935536 -0600 @@ -23,10 +23,21 @@ <!-- Font directory list --> - <dir>@FC_DEFAULT_FONTS@</dir> - @FC_FONTPATH@ -+ <dir>/usr/share/fonts/OTF</dir> -+ <dir>/usr/share/fonts/TTF</dir> -+ <dir>/usr/share/fonts/Type1</dir> -+ <dir>/usr/share/fonts/Speedo</dir> -+ <dir>/usr/share/fonts/cyrillic</dir> -+ <dir>/usr/share/fonts/misc</dir> ++ <dir>/usr/share/fonts/OTF</dir> ++ <dir>/usr/share/fonts/TTF</dir> ++ <dir>/usr/share/fonts/Type1</dir> ++ <dir>/usr/share/fonts/Speedo</dir> ++ <dir>/usr/share/fonts/cyrillic</dir> ++ <dir>/usr/share/fonts/misc</dir> <dir>~/.fonts</dir> +<!-- Commented out font directories: +These are not indexed by default, as fontconfig then seems +to prefer bitmapped fonts in some cases... -+ <dir>/usr/share/fonts/100dpi</dir> -+ <dir>/usr/share/fonts/75dpi</dir> ++ <dir>/usr/share/fonts/100dpi</dir> ++ <dir>/usr/share/fonts/75dpi</dir> +--> + <!-- diff --git a/source/x/libdrm/libdrm.SlackBuild b/source/x/libdrm/libdrm.SlackBuild index 5250cff6..fff398a1 100755 --- a/source/x/libdrm/libdrm.SlackBuild +++ b/source/x/libdrm/libdrm.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2007, 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010 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. PKGNAM=libdrm -VERSION=${VERSION:-2.4.12} -ARCH=${ARCH:-x86_64} -NUMJOBS=${NUMJOBS:-" -j7 "} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} +# Automatically determine architecture for build & packaging: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + +NUMJOBS=${NUMJOBS:-" -j7 "} + CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} @@ -39,15 +48,21 @@ elif [ "$ARCH" = "s390" ]; then 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.xz || exit 1 +tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1 cd ${PKGNAM}-$VERSION +# Fix missing definitions in drm_mode.h: +zcat $CWD/libdrm.uint32_t.diff.gz | patch -p1 --verbose || exit 1 + # Make sure ownerships and permissions are sane: chown -R root:root . find . \ @@ -62,6 +77,8 @@ CFLAGS="$SLKCFLAGS" \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --enable-udev \ + --enable-nouveau-experimental-api \ + --enable-vmwgfx-experimental-api \ --build=$ARCH-slackware-linux # Build and install: diff --git a/source/x/libdrm/libdrm.uint32_t.diff b/source/x/libdrm/libdrm.uint32_t.diff new file mode 100644 index 00000000..571d72ac --- /dev/null +++ b/source/x/libdrm/libdrm.uint32_t.diff @@ -0,0 +1,11 @@ +--- ./include/drm/drm_mode.h.orig 2010-01-21 12:45:40.000000000 -0600 ++++ ./include/drm/drm_mode.h 2010-02-22 13:16:36.000000000 -0600 +@@ -307,6 +307,8 @@ + #define DRM_MODE_PAGE_FLIP_EVENT 0x01 + #define DRM_MODE_PAGE_FLIP_FLAGS DRM_MODE_PAGE_FLIP_EVENT + ++#include <stdint.h> /* needed for uint32_t and uint64_t typedefs */ ++ + struct drm_mode_crtc_page_flip { + uint32_t crtc_id; + uint32_t fb_id; diff --git a/source/x/mesa/mesa.SlackBuild b/source/x/mesa/mesa.SlackBuild index 88696e3f..d4579625 100755 --- a/source/x/mesa/mesa.SlackBuild +++ b/source/x/mesa/mesa.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2007, 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,13 +21,23 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PKGNAM=mesa -VERSION=${VERSION:-7.5} -ARCH=${ARCH:-x86_64} +VERSION=${VERSION:-$(echo MesaLib-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} +PKG_VERSION=${VERSION} + +# 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,nouveau,r128,r200,r300,radeon,s3v,savage,sis,tdfx,trident,unichrome,ffb,swrast" -DRI_DRIVERS="i810,i915,i965,mach64,mga,r128,r200,r300,radeon,s3v,savage,sis,tdfx,trident,unichrome,ffb,swrast" +DRI_DRIVERS="i810,i915,i965,mach64,mga,r128,r200,r300,r600,radeon,savage,sis,tdfx,unichrome,swrast" NUMJOBS=${NUMJOBS:--j8} @@ -50,9 +60,9 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf Mesa-${VERSION} -tar xvf $CWD/MesaLib-$VERSION.tar.xz || exit 1 -tar xvf $CWD/MesaGLUT-$VERSION.tar.xz || exit 1 -tar xvf $CWD/MesaDemos-$VERSION.tar.xz || exit 1 +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 cd Mesa-$VERSION # Make sure ownerships and permissions are sane: @@ -77,17 +87,22 @@ CFLAGS="$SLKCFLAGS" \ # 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 + make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 -# Install gears and glinfo manually, and make symlinks from the names -# of the deprecated similar programs to reduce confusion: +# 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 -( cd $PKG/usr/bin - ln -sf glinfo glxinfo - ln -sf gears glxgears + +# Install some "demos": +( cd progs/xdemos + cp glthreads glxcontexts glxdemo glxgears glxgears_fbconfig glxheads \ + glxinfo glxpbdemo glxpixmap \ + $PKG/usr/bin ) # Strip binaries: @@ -117,14 +132,14 @@ if [ -d $PKG/usr/info ]; then ) fi -mkdir -p $PKG/usr/doc/Mesa-$VERSION/html -cp -a COPYING docs/relnotes-$VERSION.html $PKG/usr/doc/Mesa-$VERSION +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-$VERSION/html +cp -a docs/*.html $PKG/usr/doc/Mesa-$PKG_VERSION/html 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 +/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$PKG_VERSION-$ARCH-$BUILD.txz diff --git a/source/x/mesa/mesa.url b/source/x/mesa/mesa.url new file mode 100644 index 00000000..f4efeae6 --- /dev/null +++ b/source/x/mesa/mesa.url @@ -0,0 +1 @@ +ftp://ftp.freedesktop.org/pub/mesa/ diff --git a/source/x/x11/build/compiz b/source/x/x11/build/compiz deleted file mode 100644 index b8626c4c..00000000 --- a/source/x/x11/build/compiz +++ /dev/null @@ -1 +0,0 @@ -4 diff --git a/source/x/x11/build/font-adobe-100dpi b/source/x/x11/build/font-adobe-100dpi deleted file mode 100644 index 00750edc..00000000 --- a/source/x/x11/build/font-adobe-100dpi +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/source/x/x11/build/font-adobe-75dpi b/source/x/x11/build/font-adobe-75dpi deleted file mode 100644 index 00750edc..00000000 --- a/source/x/x11/build/font-adobe-75dpi +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/source/x/x11/build/font-adobe-utopia-100dpi b/source/x/x11/build/font-adobe-utopia-100dpi deleted file mode 100644 index 00750edc..00000000 --- a/source/x/x11/build/font-adobe-utopia-100dpi +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/source/x/x11/build/font-adobe-utopia-75dpi b/source/x/x11/build/font-adobe-utopia-75dpi deleted file mode 100644 index 00750edc..00000000 --- a/source/x/x11/build/font-adobe-utopia-75dpi +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/source/x/x11/build/font-adobe-utopia-type1 b/source/x/x11/build/font-adobe-utopia-type1 deleted file mode 100644 index 00750edc..00000000 --- a/source/x/x11/build/font-adobe-utopia-type1 +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/source/x/x11/build/font-arabic-misc b/source/x/x11/build/font-arabic-misc deleted file mode 100644 index 00750edc..00000000 --- a/source/x/x11/build/font-arabic-misc +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/source/x/x11/build/font-bh-100dpi b/source/x/x11/build/font-bh-100dpi deleted file mode 100644 index 00750edc..00000000 --- a/source/x/x11/build/font-bh-100dpi +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/source/x/x11/build/font-bh-75dpi b/source/x/x11/build/font-bh-75dpi deleted file mode 100644 index 00750edc..00000000 --- a/source/x/x11/build/font-bh-75dpi +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/source/x/x11/build/font-bh-lucidatypewriter-100dpi b/source/x/x11/build/font-bh-lucidatypewriter-100dpi deleted file mode 100644 index 00750edc..00000000 --- a/source/x/x11/build/font-bh-lucidatypewriter-100dpi +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/source/x/x11/build/font-bh-lucidatypewriter-75dpi b/source/x/x11/build/font-bh-lucidatypewriter-75dpi deleted file mode 100644 index 00750edc..00000000 --- a/source/x/x11/build/font-bh-lucidatypewriter-75dpi +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/source/x/x11/build/font-bh-ttf b/source/x/x11/build/font-bh-ttf deleted file mode 100644 index 00750edc..00000000 --- a/source/x/x11/build/font-bh-ttf +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/source/x/x11/build/font-bh-type1 b/source/x/x11/build/font-bh-type1 deleted file mode 100644 index 00750edc..00000000 --- a/source/x/x11/build/font-bh-type1 +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/source/x/x11/build/font-bitstream-100dpi b/source/x/x11/build/font-bitstream-100dpi deleted file mode 100644 index 00750edc..00000000 --- a/source/x/x11/build/font-bitstream-100dpi +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/source/x/x11/build/font-bitstream-75dpi b/source/x/x11/build/font-bitstream-75dpi deleted file mode 100644 index 00750edc..00000000 --- a/source/x/x11/build/font-bitstream-75dpi +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/source/x/x11/build/font-bitstream-speedo b/source/x/x11/build/font-bitstream-speedo deleted file mode 100644 index 00750edc..00000000 --- a/source/x/x11/build/font-bitstream-speedo +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/source/x/x11/build/font-bitstream-type1 b/source/x/x11/build/font-bitstream-type1 deleted file mode 100644 index 00750edc..00000000 --- a/source/x/x11/build/font-bitstream-type1 +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/source/x/x11/build/font-cronyx-cyrillic b/source/x/x11/build/font-cronyx-cyrillic deleted file mode 100644 index 00750edc..00000000 --- a/source/x/x11/build/font-cronyx-cyrillic +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/source/x/x11/build/font-cursor-misc b/source/x/x11/build/font-cursor-misc deleted file mode 100644 index 00750edc..00000000 --- a/source/x/x11/build/font-cursor-misc +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/source/x/x11/build/font-daewoo-misc b/source/x/x11/build/font-daewoo-misc deleted file mode 100644 index 00750edc..00000000 --- a/source/x/x11/build/font-daewoo-misc +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/source/x/x11/build/font-dec-misc b/source/x/x11/build/font-dec-misc deleted file mode 100644 index 00750edc..00000000 --- a/source/x/x11/build/font-dec-misc +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/source/x/x11/build/font-ibm-type1 b/source/x/x11/build/font-ibm-type1 deleted file mode 100644 index 00750edc..00000000 --- a/source/x/x11/build/font-ibm-type1 +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/source/x/x11/build/font-isas-misc b/source/x/x11/build/font-isas-misc deleted file mode 100644 index 00750edc..00000000 --- a/source/x/x11/build/font-isas-misc +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/source/x/x11/build/font-jis-misc b/source/x/x11/build/font-jis-misc deleted file mode 100644 index 00750edc..00000000 --- a/source/x/x11/build/font-jis-misc +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/source/x/x11/build/font-micro-misc b/source/x/x11/build/font-micro-misc deleted file mode 100644 index 00750edc..00000000 --- a/source/x/x11/build/font-micro-misc +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/source/x/x11/build/font-misc-cyrillic b/source/x/x11/build/font-misc-cyrillic deleted file mode 100644 index 00750edc..00000000 --- a/source/x/x11/build/font-misc-cyrillic +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/source/x/x11/build/font-misc-ethiopic b/source/x/x11/build/font-misc-ethiopic deleted file mode 100644 index 00750edc..00000000 --- a/source/x/x11/build/font-misc-ethiopic +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/source/x/x11/build/font-misc-meltho b/source/x/x11/build/font-misc-meltho deleted file mode 100644 index 00750edc..00000000 --- a/source/x/x11/build/font-misc-meltho +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/source/x/x11/build/font-misc-misc b/source/x/x11/build/font-misc-misc deleted file mode 100644 index b8626c4c..00000000 --- a/source/x/x11/build/font-misc-misc +++ /dev/null @@ -1 +0,0 @@ -4 diff --git a/source/x/x11/build/font-mutt-misc b/source/x/x11/build/font-mutt-misc deleted file mode 100644 index 00750edc..00000000 --- a/source/x/x11/build/font-mutt-misc +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/source/x/x11/build/font-schumacher-misc b/source/x/x11/build/font-schumacher-misc deleted file mode 100644 index 00750edc..00000000 --- a/source/x/x11/build/font-schumacher-misc +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/source/x/x11/build/font-screen-cyrillic b/source/x/x11/build/font-screen-cyrillic deleted file mode 100644 index 00750edc..00000000 --- a/source/x/x11/build/font-screen-cyrillic +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/source/x/x11/build/font-sony-misc b/source/x/x11/build/font-sony-misc deleted file mode 100644 index 00750edc..00000000 --- a/source/x/x11/build/font-sony-misc +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/source/x/x11/build/font-sun-misc b/source/x/x11/build/font-sun-misc deleted file mode 100644 index 00750edc..00000000 --- a/source/x/x11/build/font-sun-misc +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/source/x/x11/build/font-winitzki-cyrillic b/source/x/x11/build/font-winitzki-cyrillic deleted file mode 100644 index 00750edc..00000000 --- a/source/x/x11/build/font-winitzki-cyrillic +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/source/x/x11/build/imake b/source/x/x11/build/imake deleted file mode 100644 index 00750edc..00000000 --- a/source/x/x11/build/imake +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/source/x/x11/build/libXScrnSaver b/source/x/x11/build/libXScrnSaver deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/libXScrnSaver +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/libXau b/source/x/x11/build/libXau deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/libXau +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/libXcomposite b/source/x/x11/build/libXcomposite deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/libXcomposite +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/libXcursor b/source/x/x11/build/libXcursor deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/libXcursor +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/libXdamage b/source/x/x11/build/libXdamage deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/libXdamage +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/libXdmcp b/source/x/x11/build/libXdmcp deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/libXdmcp +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/libXfixes b/source/x/x11/build/libXfixes deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/libXfixes +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/libXfontcache b/source/x/x11/build/libXfontcache deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/libXfontcache +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/libXft b/source/x/x11/build/libXft deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/libXft +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/libXinerama b/source/x/x11/build/libXinerama deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/libXinerama +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/libXmu b/source/x/x11/build/libXmu deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/libXmu +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/libXpm b/source/x/x11/build/libXpm deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/libXpm +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/libXrender b/source/x/x11/build/libXrender deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/libXrender +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/libXres b/source/x/x11/build/libXres deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/libXres +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/libXtst b/source/x/x11/build/libXtst deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/libXtst +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/libXv b/source/x/x11/build/libXv deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/libXv +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/libXvMC b/source/x/x11/build/libXvMC deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/libXvMC +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/libXxf86dga b/source/x/x11/build/libXxf86dga deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/libXxf86dga +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/libXxf86misc b/source/x/x11/build/libXxf86misc deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/libXxf86misc +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/libXxf86vm b/source/x/x11/build/libXxf86vm deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/libXxf86vm +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/libdmx b/source/x/x11/build/libdmx deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/libdmx +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/libfontenc b/source/x/x11/build/libfontenc deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/libfontenc +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/liblbxutil b/source/x/x11/build/liblbxutil deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/liblbxutil +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/libpthread-stubs b/source/x/x11/build/libpthread-stubs deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/libpthread-stubs +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/libxkbfile b/source/x/x11/build/libxkbfile deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/libxkbfile +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/listres b/source/x/x11/build/listres deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/listres +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/luit b/source/x/x11/build/luit deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/luit +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/makedepend b/source/x/x11/build/makedepend deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/makedepend +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/mkcomposecache b/source/x/x11/build/mkcomposecache deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/mkcomposecache +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/mkfontdir b/source/x/x11/build/mkfontdir deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/mkfontdir +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/recordproto b/source/x/x11/build/recordproto deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/recordproto +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/resourceproto b/source/x/x11/build/resourceproto deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/resourceproto +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/scrnsaverproto b/source/x/x11/build/scrnsaverproto deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/scrnsaverproto +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/smproxy b/source/x/x11/build/smproxy deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/smproxy +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/twm b/source/x/x11/build/twm index 0cfbf088..00750edc 100644 --- a/source/x/x11/build/twm +++ b/source/x/x11/build/twm @@ -1 +1 @@ -2 +3 diff --git a/source/x/x11/build/videoproto b/source/x/x11/build/videoproto deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/videoproto +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/viewres b/source/x/x11/build/viewres deleted file mode 100644 index 00750edc..00000000 --- a/source/x/x11/build/viewres +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/source/x/x11/build/x11perf b/source/x/x11/build/x11perf deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/x11perf +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xauth b/source/x/x11/build/xauth deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xauth +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xbacklight b/source/x/x11/build/xbacklight deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xbacklight +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xbiff b/source/x/x11/build/xbiff deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xbiff +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xbitmaps b/source/x/x11/build/xbitmaps deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xbitmaps +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xcalc b/source/x/x11/build/xcalc deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xcalc +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xclipboard b/source/x/x11/build/xclipboard deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xclipboard +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xclock b/source/x/x11/build/xclock deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xclock +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xcmiscproto b/source/x/x11/build/xcmiscproto deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xcmiscproto +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xcmsdb b/source/x/x11/build/xcmsdb deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xcmsdb +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xcompmgr b/source/x/x11/build/xcompmgr deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xcompmgr +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xcursor-themes b/source/x/x11/build/xcursor-themes deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xcursor-themes +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xcursorgen b/source/x/x11/build/xcursorgen deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xcursorgen +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xdriinfo b/source/x/x11/build/xdriinfo deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xdriinfo +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xev b/source/x/x11/build/xev deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xev +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xeyes b/source/x/x11/build/xeyes deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xeyes +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/appres b/source/x/x11/build/xf86-input-vmmouse index 0cfbf088..0cfbf088 100644 --- a/source/x/x11/build/appres +++ b/source/x/x11/build/xf86-input-vmmouse diff --git a/source/x/x11/build/bdftopcf b/source/x/x11/build/xf86-video-apm index 0cfbf088..0cfbf088 100644 --- a/source/x/x11/build/bdftopcf +++ b/source/x/x11/build/xf86-video-apm diff --git a/source/x/x11/build/bigreqsproto b/source/x/x11/build/xf86-video-ast index 0cfbf088..0cfbf088 100644 --- a/source/x/x11/build/bigreqsproto +++ b/source/x/x11/build/xf86-video-ast diff --git a/source/x/x11/build/xf86-video-ati b/source/x/x11/build/xf86-video-ati deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xf86-video-ati +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/bitmap b/source/x/x11/build/xf86-video-cirrus index 0cfbf088..0cfbf088 100644 --- a/source/x/x11/build/bitmap +++ b/source/x/x11/build/xf86-video-cirrus diff --git a/source/x/x11/build/compositeproto b/source/x/x11/build/xf86-video-glint index 0cfbf088..0cfbf088 100644 --- a/source/x/x11/build/compositeproto +++ b/source/x/x11/build/xf86-video-glint diff --git a/source/x/x11/build/damageproto b/source/x/x11/build/xf86-video-i128 index 0cfbf088..0cfbf088 100644 --- a/source/x/x11/build/damageproto +++ b/source/x/x11/build/xf86-video-i128 diff --git a/source/x/x11/build/dmxproto b/source/x/x11/build/xf86-video-i740 index 0cfbf088..0cfbf088 100644 --- a/source/x/x11/build/dmxproto +++ b/source/x/x11/build/xf86-video-i740 diff --git a/source/x/x11/build/editres b/source/x/x11/build/xf86-video-mach64 index 0cfbf088..0cfbf088 100644 --- a/source/x/x11/build/editres +++ b/source/x/x11/build/xf86-video-mach64 diff --git a/source/x/x11/build/encodings b/source/x/x11/build/xf86-video-mga index 0cfbf088..0cfbf088 100644 --- a/source/x/x11/build/encodings +++ b/source/x/x11/build/xf86-video-mga diff --git a/source/x/x11/build/evieext b/source/x/x11/build/xf86-video-neomagic index 0cfbf088..0cfbf088 100644 --- a/source/x/x11/build/evieext +++ b/source/x/x11/build/xf86-video-neomagic diff --git a/source/x/x11/build/xf86-video-nsc b/source/x/x11/build/xf86-video-nsc deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xf86-video-nsc +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xf86-video-openchrome b/source/x/x11/build/xf86-video-openchrome deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xf86-video-openchrome +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/fixesproto b/source/x/x11/build/xf86-video-r128 index 0cfbf088..0cfbf088 100644 --- a/source/x/x11/build/fixesproto +++ b/source/x/x11/build/xf86-video-r128 diff --git a/source/x/x11/build/font-alias b/source/x/x11/build/xf86-video-s3 index 0cfbf088..0cfbf088 100644 --- a/source/x/x11/build/font-alias +++ b/source/x/x11/build/xf86-video-s3 diff --git a/source/x/x11/build/font-util b/source/x/x11/build/xf86-video-s3virge index 0cfbf088..0cfbf088 100644 --- a/source/x/x11/build/font-util +++ b/source/x/x11/build/xf86-video-s3virge diff --git a/source/x/x11/build/font-xfree86-type1 b/source/x/x11/build/xf86-video-savage index 0cfbf088..0cfbf088 100644 --- a/source/x/x11/build/font-xfree86-type1 +++ b/source/x/x11/build/xf86-video-savage diff --git a/source/x/x11/build/fontcacheproto b/source/x/x11/build/xf86-video-sis index 0cfbf088..0cfbf088 100644 --- a/source/x/x11/build/fontcacheproto +++ b/source/x/x11/build/xf86-video-sis diff --git a/source/x/x11/build/fontsproto b/source/x/x11/build/xf86-video-sisusb index 0cfbf088..0cfbf088 100644 --- a/source/x/x11/build/fontsproto +++ b/source/x/x11/build/xf86-video-sisusb diff --git a/source/x/x11/build/iceauth b/source/x/x11/build/xf86-video-tdfx index 0cfbf088..0cfbf088 100644 --- a/source/x/x11/build/iceauth +++ b/source/x/x11/build/xf86-video-tdfx diff --git a/source/x/x11/build/xf86-video-v4l b/source/x/x11/build/xf86-video-v4l index 0cfbf088..00750edc 100644 --- a/source/x/x11/build/xf86-video-v4l +++ b/source/x/x11/build/xf86-video-v4l @@ -1 +1 @@ -2 +3 diff --git a/source/x/x11/build/kbproto b/source/x/x11/build/xf86-video-vesa index 0cfbf088..0cfbf088 100644 --- a/source/x/x11/build/kbproto +++ b/source/x/x11/build/xf86-video-vesa diff --git a/source/x/x11/build/lbxproxy b/source/x/x11/build/xf86-video-vmware index 0cfbf088..0cfbf088 100644 --- a/source/x/x11/build/lbxproxy +++ b/source/x/x11/build/xf86-video-vmware diff --git a/source/x/x11/build/libICE b/source/x/x11/build/xf86-video-voodoo index 0cfbf088..0cfbf088 100644 --- a/source/x/x11/build/libICE +++ b/source/x/x11/build/xf86-video-voodoo diff --git a/source/x/x11/build/xf86bigfontproto b/source/x/x11/build/xf86bigfontproto deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xf86bigfontproto +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xf86dgaproto b/source/x/x11/build/xf86dgaproto deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xf86dgaproto +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xf86driproto b/source/x/x11/build/xf86driproto deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xf86driproto +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xf86miscproto b/source/x/x11/build/xf86miscproto deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xf86miscproto +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xf86vidmodeproto b/source/x/x11/build/xf86vidmodeproto deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xf86vidmodeproto +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xgamma b/source/x/x11/build/xgamma deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xgamma +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xhost b/source/x/x11/build/xhost deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xhost +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xineramaproto b/source/x/x11/build/xineramaproto deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xineramaproto +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xkbevd b/source/x/x11/build/xkbevd deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xkbevd +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xkbprint b/source/x/x11/build/xkbprint deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xkbprint +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xkbutils b/source/x/x11/build/xkbutils deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xkbutils +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xkill b/source/x/x11/build/xkill deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xkill +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xlogo b/source/x/x11/build/xlogo deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xlogo +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xlsatoms b/source/x/x11/build/xlsatoms deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xlsatoms +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xlsclients b/source/x/x11/build/xlsclients deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xlsclients +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xmag b/source/x/x11/build/xmag deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xmag +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xman b/source/x/x11/build/xman deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xman +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xmessage b/source/x/x11/build/xmessage deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xmessage +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xmodmap b/source/x/x11/build/xmodmap deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xmodmap +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xorg-cf-files b/source/x/x11/build/xorg-cf-files deleted file mode 100644 index 00750edc..00000000 --- a/source/x/x11/build/xorg-cf-files +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/source/x/x11/build/xorg-docs b/source/x/x11/build/xorg-docs deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xorg-docs +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xorg-sgml-doctools b/source/x/x11/build/xorg-sgml-doctools deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xorg-sgml-doctools +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xpr b/source/x/x11/build/xpr deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xpr +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xprop b/source/x/x11/build/xprop deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xprop +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xproxymanagementprotocol b/source/x/x11/build/xproxymanagementprotocol deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xproxymanagementprotocol +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xrdb b/source/x/x11/build/xrdb deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xrdb +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xrefresh b/source/x/x11/build/xrefresh deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xrefresh +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xset b/source/x/x11/build/xset deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xset +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xsetroot b/source/x/x11/build/xsetroot deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xsetroot +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xvidtune b/source/x/x11/build/xvidtune deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xvidtune +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xvinfo b/source/x/x11/build/xvinfo deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xvinfo +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/build/xwud b/source/x/x11/build/xwud deleted file mode 100644 index 0cfbf088..00000000 --- a/source/x/x11/build/xwud +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/source/x/x11/configure/font-util b/source/x/x11/configure/font-util new file mode 100644 index 00000000..698241b3 --- /dev/null +++ b/source/x/x11/configure/font-util @@ -0,0 +1,12 @@ +CFLAGS=$SLKCFLAGS \ +CXXFLAGS=$SLKCFLAGS \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --infodir=/usr/info \ + --mandir=/usr/man \ + --with-fontrootdir=/usr/share/fonts \ + --disable-static \ + --build=$ARCH-slackware-linux diff --git a/source/x/x11/configure/xf86-input-vmmouse b/source/x/x11/configure/xf86-input-vmmouse new file mode 100644 index 00000000..1b99250b --- /dev/null +++ b/source/x/x11/configure/xf86-input-vmmouse @@ -0,0 +1,15 @@ +CFLAGS=$SLKCFLAGS \ +CXXFLAGS=$SLKCFLAGS \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --infodir=/usr/info \ + --mandir=/usr/man \ + --disable-static \ + --with-hal-bin-dir=/usr/bin \ + --with-hal-callouts-dir=/usr/libexec \ + --with-hal-fdi-dir=/usr/share/hal/fdi/policy/10osvendor \ + --with-udev-rules-dir=none \ + --build=$ARCH-slackware-linux diff --git a/source/x/x11/configure/xf86-video-ati b/source/x/x11/configure/xf86-video-ati index 6e41b488..ae245884 100644 --- a/source/x/x11/configure/xf86-video-ati +++ b/source/x/x11/configure/xf86-video-ati @@ -1,9 +1,11 @@ -xserver_source="/tmp/x11-build/xorg-server-1.6.2" +xserver_source="/tmp/x11-build/xorg-server-1.7.5" -if [ ! -d "$xserver_source" ]; then - echo "$xserver_source does not exist, and you need it." - exit 1 -fi +# 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" \ diff --git a/source/x/x11/configure/xf86-video-nv b/source/x/x11/configure/xf86-video-nv index 6e41b488..ae245884 100644 --- a/source/x/x11/configure/xf86-video-nv +++ b/source/x/x11/configure/xf86-video-nv @@ -1,9 +1,11 @@ -xserver_source="/tmp/x11-build/xorg-server-1.6.2" +xserver_source="/tmp/x11-build/xorg-server-1.7.5" -if [ ! -d "$xserver_source" ]; then - echo "$xserver_source does not exist, and you need it." - exit 1 -fi +# 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" \ diff --git a/source/x/x11/configure/xorg-server b/source/x/x11/configure/xorg-server index b6660025..943797bf 100644 --- a/source/x/x11/configure/xorg-server +++ b/source/x/x11/configure/xorg-server @@ -7,7 +7,7 @@ BUILD_SERVERS="--enable-xorg \ --enable-xsdl \ --enable-xfbdev" -MESA_VERSION=${MESA_VERSION:-7.5} +MESA_VERSION=${MESA_VERSION:-7.5} # unused in 1.7.x # 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,9 +26,8 @@ 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.0" \ + --with-os-name="Slackware 13.1" \ --with-os-vendor="Slackware Linux Project" \ - --with-mesa-source=/tmp/Mesa-${MESA_VERSION} \ --with-xkb-path=/etc/X11/xkb \ --with-xkb-output=/var/lib/xkb \ $BUILD_SERVERS \ diff --git a/source/x/x11/modularize b/source/x/x11/modularize index fd192efb..d915fd21 100644 --- a/source/x/x11/modularize +++ b/source/x/x11/modularize @@ -67,7 +67,6 @@ imake inputproto intel-gpu-tools kbproto -lbxproxy libAppleWM libFS libICE @@ -107,7 +106,6 @@ libXxf86misc libXxf86vm libdmx libfontenc -liblbxutil libpciaccess libpthread-stubs libxcb @@ -198,6 +196,7 @@ xf86-input-tek4957 xf86-input-ur98 xf86-input-vmmouse xf86-input-void +xf86-input-wacom xf86-video-geode xf86-video-apm xf86-video-ark diff --git a/source/x/x11/patch/compiz.patch b/source/x/x11/patch/compiz.patch deleted file mode 100644 index c2920994..00000000 --- a/source/x/x11/patch/compiz.patch +++ /dev/null @@ -1,3 +0,0 @@ -zcat $CWD/patch/compiz/compiz-0.7.8-kde42-crash.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patch/compiz/compiz-0.7.8-kde42-krunner.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patch/compiz/compiz-0.7.8-kde42.patch.gz | patch -p1 --verbose || exit 1 diff --git a/source/x/x11/patch/compiz/compiz-0.7.8-kde42-crash.patch b/source/x/x11/patch/compiz/compiz-0.7.8-kde42-crash.patch deleted file mode 100644 index 00f89e2c..00000000 --- a/source/x/x11/patch/compiz/compiz-0.7.8-kde42-crash.patch +++ /dev/null @@ -1,66 +0,0 @@ -Implement KDecorationBridge unstable API, needed for KDE 4.2. ---- - -diff --git a/kde/window-decorator-kde4/window.cpp b/kde/window-decorator-kde4/window.cpp -index d2d362b..68c856b 100644 ---- a/kde/window-decorator-kde4/window.cpp -+++ b/kde/window-decorator-kde4/window.cpp -@@ -764,6 +764,31 @@ KWD::Window::grabXServer (bool) - } - - void -+KWD::Window::repaintShadow (void) -+{ -+} -+ -+bool -+KWD::Window::compositingActive (void) const -+{ -+ return true; -+} -+ -+bool -+KWD::Window::shadowsActive (void) const -+{ -+ /* we are drawing the shadows ourselves, no need for the -+ decoration engine to do so */ -+ return false; -+} -+ -+double -+KWD::Window::opacity (void) const -+{ -+ return 1.0; -+} -+ -+void - KWD::Window::createDecoration (void) - { - KDecoration *decor; -diff --git a/kde/window-decorator-kde4/window.h b/kde/window-decorator-kde4/window.h -index bdf2c47..034e6fe 100644 ---- a/kde/window-decorator-kde4/window.h -+++ b/kde/window-decorator-kde4/window.h -@@ -45,7 +45,7 @@ class QMenu; - - namespace KWD - { --class Window:public QWidget, public KDecorationBridge { -+class Window:public QWidget, public KDecorationBridgeUnstable { - Q_OBJECT public: - - enum Type -@@ -104,6 +104,12 @@ class Window:public QWidget, public KDecorationBridge { - virtual Qt::WFlags initialWFlags (void) const; - virtual void grabXServer (bool grab); - -+ /* unstable API */ -+ virtual void repaintShadow (); -+ virtual bool compositingActive () const; -+ virtual bool shadowsActive () const; -+ virtual double opacity () const; -+ - void handleActiveChange (void); - void updateFrame (WId frame); - void updateWindowGeometry (void); - diff --git a/source/x/x11/patch/compiz/compiz-0.7.8-kde42-krunner.patch b/source/x/x11/patch/compiz/compiz-0.7.8-kde42-krunner.patch deleted file mode 100644 index 3de71af8..00000000 --- a/source/x/x11/patch/compiz/compiz-0.7.8-kde42-krunner.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/kde/window-decorator-kde4/decorator.cpp b/kde/window-decorator-kde4/decorator.cpp -index 96b818d..0bf4718 100644 ---- a/kde/window-decorator-kde4/decorator.cpp -+++ b/kde/window-decorator-kde4/decorator.cpp -@@ -649,9 +649,10 @@ KWD::Decorator::x11EventFilter (XEvent *xevent) - } - else if (action == Atoms::toolkitActionRunDialogAtom) - { -- QDBusInterface krunner ("org.kde.krunner", "/Interface", -- "org.kde.krunner.Interface"); -- krunner.call ("display", ""); -+ QDBusInterface krunner ("org.kde.krunner", "/App", -+ "org.kde.krunner.App"); -+ if (krunner.isValid ()) -+ krunner.call ("display"); - } - else if (action == Atoms::toolkitActionForceQuitDialogAtom) - { - diff --git a/source/x/x11/patch/compiz/compiz-0.7.8-kde42.patch b/source/x/x11/patch/compiz/compiz-0.7.8-kde42.patch deleted file mode 100644 index 0f996223..00000000 --- a/source/x/x11/patch/compiz/compiz-0.7.8-kde42.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff -ur compiz-0.7.8/configure compiz-0.7.8-kde42/configure ---- compiz-0.7.8/configure 2008-09-17 13:34:28.000000000 +0200 -+++ compiz-0.7.8-kde42/configure 2008-12-01 19:07:49.000000000 +0100 -@@ -25429,7 +25429,7 @@ - kde4libs=`kde4-config --install lib --expandvars 2>/dev/null` - kde4incs=`kde4-config --install include --expandvars 2>/dev/null` - -- kde4_test_includes="kdecoration.h kcommondecoration.h kdecorationbridge.h plasma/panelsvg.h" -+ kde4_test_includes="kdecoration.h kcommondecoration.h kdecorationbridge.h plasma/framesvg.h" - - { echo "$as_me:$LINENO: checking for KWin headers" >&5 - echo $ECHO_N "checking for KWin headers... $ECHO_C" >&6; } -diff -ur compiz-0.7.8/configure.ac compiz-0.7.8-kde42/configure.ac ---- compiz-0.7.8/configure.ac 2008-09-17 13:33:40.000000000 +0200 -+++ compiz-0.7.8-kde42/configure.ac 2008-12-01 19:07:33.000000000 +0100 -@@ -487,7 +487,7 @@ - kde4libs=`kde4-config --install lib --expandvars 2>/dev/null` - kde4incs=`kde4-config --install include --expandvars 2>/dev/null` - -- kde4_test_includes="kdecoration.h kcommondecoration.h kdecorationbridge.h plasma/panelsvg.h" -+ kde4_test_includes="kdecoration.h kcommondecoration.h kdecorationbridge.h plasma/framesvg.h" - - dnl Check for KWin headers - AC_MSG_CHECKING([for KWin headers]) -diff -ur compiz-0.7.8/kde/window-decorator-kde4/switcher.cpp compiz-0.7.8-kde42/kde/window-decorator-kde4/switcher.cpp ---- compiz-0.7.8/kde/window-decorator-kde4/switcher.cpp 2008-08-08 13:20:31.000000000 +0200 -+++ compiz-0.7.8-kde42/kde/window-decorator-kde4/switcher.cpp 2008-12-01 19:13:18.000000000 +0100 -@@ -30,7 +30,7 @@ - - #include <fixx11h.h> - --#include <KDE/Plasma/PanelSvg> -+#include <KDE/Plasma/FrameSvg> - #include <KDE/Plasma/Theme> - - #include <kwindowsystem.h> -@@ -46,9 +46,9 @@ - QColor color; - color = Plasma::Theme::defaultTheme ()->color (Plasma::Theme::TextColor); - -- mBackground = new Plasma::PanelSvg(); -+ mBackground = new Plasma::FrameSvg(); - mBackground->setImagePath ("dialogs/background"); -- mBackground->setEnabledBorders(Plasma::PanelSvg::AllBorders); -+ mBackground->setEnabledBorders(Plasma::FrameSvg::AllBorders); - - mBorder.left = mBackground->marginSize(Plasma::LeftMargin); - mBorder.right = mBackground->marginSize(Plasma::RightMargin); -@@ -131,8 +131,8 @@ - p.setCompositionMode (QPainter::CompositionMode_Source); - p.setRenderHint (QPainter::SmoothPixmapTransform); - -- mBackground->resizePanel (QSizeF (contentWidth, contentHeight)); -- mBackground->paintPanel (&p, QRect (0, 0, contentWidth, -+ mBackground->resizeFrame (QSizeF (contentWidth, contentHeight)); -+ mBackground->paintFrame (&p, QRect (0, 0, contentWidth, - contentHeight)); - - mBackgroundPixmap = mPixmap.copy (mBorder.left, mBorder.top, -@@ -168,7 +168,7 @@ - p.setCompositionMode (QPainter::CompositionMode_Source); - - -- mBackground->paintPanel (&p, QRect (mBorder.left, mBorder.top + -+ mBackground->paintFrame (&p, QRect (mBorder.left, mBorder.top + - mGeometry.height () + 5, mGeometry.width (), - fm.height ())); - -diff -ur compiz-0.7.8/kde/window-decorator-kde4/switcher.h compiz-0.7.8-kde42/kde/window-decorator-kde4/switcher.h ---- compiz-0.7.8/kde/window-decorator-kde4/switcher.h 2008-08-08 13:20:31.000000000 +0200 -+++ compiz-0.7.8-kde42/kde/window-decorator-kde4/switcher.h 2008-12-01 19:28:37.000000000 +0100 -@@ -30,7 +30,7 @@ - - namespace Plasma - { --class PanelSvg; -+class FrameSvg; - } - - class QSpacerItem; -@@ -70,7 +70,7 @@ - - QRect mGeometry; - -- Plasma::PanelSvg *mBackground; -+ Plasma::FrameSvg *mBackground; - QPixmap mPixmap; - QPixmap mBackgroundPixmap; - diff --git a/source/x/x11/patch/xcursorgen.patch b/source/x/x11/patch/xcursorgen.patch new file mode 100644 index 00000000..5aa46dee --- /dev/null +++ b/source/x/x11/patch/xcursorgen.patch @@ -0,0 +1 @@ +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 new file mode 100644 index 00000000..ad7ae105 --- /dev/null +++ b/source/x/x11/patch/xcursorgen/xcursorgen.png14.configure.kludge.diff @@ -0,0 +1,61 @@ +--- ./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 new file mode 100644 index 00000000..f41034c3 --- /dev/null +++ b/source/x/x11/patch/xf86-input-synaptics.patch @@ -0,0 +1,4 @@ +# 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 new file mode 100644 index 00000000..2fdf4e0d --- /dev/null +++ b/source/x/x11/patch/xf86-input-synaptics/xf86-input-synaptics.tap-to-click.diff @@ -0,0 +1,11 @@ +--- ./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 41aa4270..16cf61e3 100644 --- a/source/x/x11/patch/xorg-server.patch +++ b/source/x/x11/patch/xorg-server.patch @@ -1 +1,2 @@ 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 diff --git a/source/x/x11/patch/xorg-server/xorg-server.fb.fbpict.c.mod.diff b/source/x/x11/patch/xorg-server/xorg-server.fb.fbpict.c.mod.diff new file mode 100644 index 00000000..f8abdccb --- /dev/null +++ b/source/x/x11/patch/xorg-server/xorg-server.fb.fbpict.c.mod.diff @@ -0,0 +1,11 @@ +--- ./fb/fbpict.c.orig 2010-03-11 22:38:21.000000000 -0600 ++++ ./fb/fbpict.c 2010-04-29 14:14:52.000000000 -0500 +@@ -37,7 +37,7 @@ + #include "mipict.h" + #include "fbpict.h" + +-#define mod(a,b) ((b) == 1 ? 0 : (a) >= 0 ? (a) % (b) : (b) - (-a) % (b)) ++#define mod(a,b) ((b) == 1 ? 0 : (a) >= 0 ? (a) % (b) : (b) - (-(a)) % (b)) + + void + fbWalkCompositeRegion (CARD8 op, diff --git a/source/x/x11/patch/xscope.patch b/source/x/x11/patch/xscope.patch deleted file mode 100644 index a41588a0..00000000 --- a/source/x/x11/patch/xscope.patch +++ /dev/null @@ -1 +0,0 @@ -zcat $CWD/patch/xscope/xscope-1.1-scope.c.diff.gz | patch -p1 --verbose || exit 1 diff --git a/source/x/x11/patch/xscope/xscope-1.1-scope.c.diff b/source/x/x11/patch/xscope/xscope-1.1-scope.c.diff deleted file mode 100644 index 2c01dbac..00000000 --- a/source/x/x11/patch/xscope/xscope-1.1-scope.c.diff +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur xscope-1.1.orig/scope.c xscope-1.1/scope.c ---- xscope-1.1.orig/scope.c 2008-09-22 21:18:16.000000000 -0500 -+++ xscope-1.1/scope.c 2009-04-08 23:54:12.230818270 -0500 -@@ -58,6 +58,7 @@ - #include <errno.h> - #include <unistd.h> - #include <netdb.h> -+#include <linux/param.h> - - #ifdef SYSV - #define bzero(s,l) memset(s, 0, l) diff --git a/source/x/x11/post-install/twm/xinitrc.twm b/source/x/x11/post-install/twm/xinitrc.twm index 1bb5185e..fb97e2e2 100644 --- a/source/x/x11/post-install/twm/xinitrc.twm +++ b/source/x/x11/post-install/twm/xinitrc.twm @@ -3,8 +3,8 @@ 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/util-macros.post-install b/source/x/x11/post-install/util-macros.post-install new file mode 100644 index 00000000..b25fb344 --- /dev/null +++ b/source/x/x11/post-install/util-macros.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.post-install b/source/x/x11/post-install/xdm.post-install index 05e37163..83dcf788 100644 --- a/source/x/x11/post-install/xdm.post-install +++ b/source/x/x11/post-install/xdm.post-install @@ -14,3 +14,6 @@ chmod 755 $PKG/etc/X11/xdm/Xsession $PKG/etc/X11/xdm/Xsetup_0 mv Xservers Xservers.new mv Xsession Xsession.new ) +mkdir -p $PKG/var/lib/xdm +chown root:root $PKG/var/lib/xdm +chmod 755 $PKG/var/lib/xdm 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 d7de8a4e..00250982 100644 --- a/source/x/x11/post-install/xf86-input-synaptics.post-install +++ b/source/x/x11/post-install/xf86-input-synaptics.post-install @@ -4,6 +4,6 @@ cat fdi/11-x11-synaptics.fdi > \ mkdir -p $PKG/usr/doc/xf86-input-synaptics-$MODULAR_PACKAGE_VERSION cp -a \ - NEWS README TODO \ + README TODO \ $PKG/usr/doc/xf86-input-synaptics-$MODULAR_PACKAGE_VERSION diff --git a/source/x/x11/post-install/xf86-input-wacom.post-install b/source/x/x11/post-install/xf86-input-wacom.post-install new file mode 100644 index 00000000..226678f4 --- /dev/null +++ b/source/x/x11/post-install/xf86-input-wacom.post-install @@ -0,0 +1,4 @@ +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/slack-desc/xf86-input-wacom b/source/x/x11/slack-desc/xf86-input-wacom new file mode 100644 index 00000000..88f68c1d --- /dev/null +++ b/source/x/x11/slack-desc/xf86-input-wacom @@ -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-input-wacom: xf86-input-wacom +xf86-input-wacom: +xf86-input-wacom: xf86-input-wacom is part of X11. +xf86-input-wacom: +xf86-input-wacom: For more information about the X.Org Foundation (the providers of the +xf86-input-wacom: X.Org implementation of the X Window System), see their website: +xf86-input-wacom: +xf86-input-wacom: http://www.x.org +xf86-input-wacom: +xf86-input-wacom: +xf86-input-wacom: diff --git a/source/x/x11/slack-desc/xf86-video-xgi b/source/x/x11/slack-desc/xf86-video-xgi new file mode 100644 index 00000000..a92ec854 --- /dev/null +++ b/source/x/x11/slack-desc/xf86-video-xgi @@ -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-xgi: xf86-video-xgi +xf86-video-xgi: +xf86-video-xgi: xf86-video-xgi is part of X11. +xf86-video-xgi: +xf86-video-xgi: For more information about the X.Org Foundation (the providers of the +xf86-video-xgi: X.Org implementation of the X Window System), see their website: +xf86-video-xgi: +xf86-video-xgi: http://www.x.org +xf86-video-xgi: +xf86-video-xgi: +xf86-video-xgi: diff --git a/source/x/x11/slack-desc/xf86-video-xgixp b/source/x/x11/slack-desc/xf86-video-xgixp new file mode 100644 index 00000000..32aea9fd --- /dev/null +++ b/source/x/x11/slack-desc/xf86-video-xgixp @@ -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-xgixp: xf86-video-xgixp +xf86-video-xgixp: +xf86-video-xgixp: xf86-video-xgixp is part of X11. +xf86-video-xgixp: +xf86-video-xgixp: For more information about the X.Org Foundation (the providers of the +xf86-video-xgixp: X.Org implementation of the X Window System), see their website: +xf86-video-xgixp: +xf86-video-xgixp: http://www.x.org +xf86-video-xgixp: +xf86-video-xgixp: +xf86-video-xgixp: diff --git a/source/x/x11/x11.SlackBuild b/source/x/x11/x11.SlackBuild index e4753798..ca729708 100755 --- a/source/x/x11/x11.SlackBuild +++ b/source/x/x11/x11.SlackBuild @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright 2007-2009 Patrick Volkerding, Sebeka, MN, USA +# Copyright 2007-2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -51,13 +51,21 @@ pkgbase() { CWD=$(pwd) TMP=${TMP:-/tmp} +# 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 + # A lot of this stuff just controls the package names this time: -VERSION=${VERSION:-7.4} -ARCH=${ARCH:-x86_64} -NUMJOBS=${NUMJOBS:-" -j7 "} +VERSION=${VERSION:-7.5} BUILD=${BUILD:-1} - PKGARCH=$ARCH +NUMJOBS=${NUMJOBS:-" -j7 "} if [ "$ARCH" = "x86_64" ]; then LIBDIRSUFFIX="64" @@ -155,6 +163,10 @@ mkdir -p $SLACK_X_BUILD_DIR else continue fi + else + echo + echo "Building from source ${x_pkg}" + echo fi if grep -wq "^$PKGNAME" ${CWD}/modularize ; then # Set $PKG to a private dir for the modular package build: @@ -194,6 +206,23 @@ mkdir -p $SLACK_X_BUILD_DIR fi make install DESTDIR=$PKG + + mkdir -p $PKG/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} + cp -a \ + AUTHORS* COPYING* INSTALL* README* NEWS* TODO* \ + $PKG/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_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/${PKGNAME}-$MODULAR_PACKAGE_VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog + fi + + # Get rid of zero-length junk files: + find $PKG/usr/doc/${PKGNAME}-$MODULAR_PACKAGE_VERSION -type f -size 0 -exec rm --verbose "{}" \; + rmdir --verbose $PKG/usr/doc/${PKGNAME}-$MODULAR_PACKAGE_VERSION 2> /dev/null # Strip binaries: ( cd $PKG diff --git a/source/x/xdg-utils/xdg-utils.SlackBuild b/source/x/xdg-utils/xdg-utils.SlackBuild index dcf1c5c2..630746e0 100755 --- a/source/x/xdg-utils/xdg-utils.SlackBuild +++ b/source/x/xdg-utils/xdg-utils.SlackBuild @@ -4,7 +4,7 @@ # Written by Erik Hanson erik@slackbuilds.org # Modified for CVS version by Patrick Volkerding <volkerdi@slackware.com> -# 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 @@ -27,9 +27,9 @@ PRGNAM=xdg-utils VERSION=1.0.2 -CVS=20090202cvs +CVS=20100506cvs ARCH=noarch -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} NUMJOBS=${NUMJOBS:-" -j7 "} 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 new file mode 100644 index 00000000..ea6e0e48 --- /dev/null +++ b/source/x/xf86-video-nouveau/this_is_NOT_a_driver.txt @@ -0,0 +1,14 @@ + +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. + diff --git a/source/x/xterm/xterm.SlackBuild b/source/x/xterm/xterm.SlackBuild index 8f1607cb..863ccae4 100755 --- a/source/x/xterm/xterm.SlackBuild +++ b/source/x/xterm/xterm.SlackBuild @@ -1,5 +1,6 @@ #!/bin/sh -# Copyright 2006, 2007, 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA + +# Copyright 2006-2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,12 +22,21 @@ PKGNAM=xterm -VERSION=${VERSION:-243} -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-2} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j7 "} +# 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 + CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} @@ -37,6 +47,8 @@ elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" +else + SLKCFLAGS="-O2" fi rm -rf $PKG |