5 files changed, 66 insertions, 17 deletions
diff --git a/source/l/qt/README b/source/l/qt/README
index c5b4d85a9..bdf9be993 100644
--- a/source/l/qt/README
+++ b/source/l/qt/README
@@ -1,6 +1,8 @@
-qt-rXXXXXX is actually qt-copy (kde's own version that might be
-slightly incompatible with released version) renamed. 
+qt-<version>_<git revision> is actually KDE's version of Qt from git
+that includes important patches not yet present in mainline Qt.
 
-It also contains less documentation -- you can grab the vanilla
-Qt if you need it.
+The recommended version of Qt for KDE may be obtained from the
+repository with this command:
+
+git clone git://gitorious.org/+kde-developers/qt/kde-qt.git
 
diff --git a/source/l/qt/qt.SlackBuild b/source/l/qt/qt.SlackBuild
index 3bd6fe560..c04221c34 100755
--- a/source/l/qt/qt.SlackBuild
+++ b/source/l/qt/qt.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
@@ -23,14 +23,30 @@
 # Merged some ideas from Alex Sarmardzic's script for qt4 at SlackBuilds.org
 # ^^ Modified by Robby Workman <rworkman@slackware.com> for QT4 & KDE4
 
-# We're using qt-copy instead of a released qt version, as this svn release
-# has at least one bugfix strongly recommended by the kde developers
+# We're using qt-copy instead of a released qt version, as this git release
+# has at least one bugfix strongly recommended by the kde developers.
+
+# Obtained from:
+# git clone git://gitorious.org/+kde-developers/qt/kde-qt.git
+# git checkout origin/4.5.3-patched
+# git checkout origin/4.6.0-stable-patched
+# git checkout origin/4.6.1-patched
+# wget http://qt.gitorious.org/qt/kde-qt/archive-tarball/4.6.2-patched
 
 PKGNAM=qt
-VERSION=$(ls qt-r*.tar.?z* | cut -d - -f 2 | cut -f 1 -d . | tail -1)
-ARCH=${ARCH:-x86_64}
+VERSION=$(ls qt-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -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
@@ -42,6 +58,9 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 CWD=$(pwd)
@@ -92,25 +111,28 @@ fi
 # Fix path to mysql header
 zcat $CWD/qt.mysql.h.diff.gz | patch -p1 || exit 1
 
-# The "o" selects the Open Source edition of Qt.
-# The "yes" agrees to the GPL, so don't run this script if you don't agree. :-)
 export CFLAGS="$SLKCFLAGS"
 export CXXFLAGS="$SLKCFLAGS"
 export OPENSOURCE_CXXFLAGS="$SLKCFLAGS"
-echo "o
-yes" | ./configure \
+./configure \
+  -confirm-license \
+  -opensource \
   -prefix /usr/lib${LIBDIRSUFFIX}/qt \
   -qt-gif \
   -fast \
   -system-libpng \
   -system-libjpeg \
   -system-zlib \
+  -system-sqlite \
+  -plugin-sql-sqlite \
   -dbus \
   -webkit \
   -no-phonon \
   -nomake examples \
   -nomake demos \
-  -no-separate-debug-info
+  -no-separate-debug-info \
+  -no-pch
+  # No-precompiled-headers is ccache-friendly.
 
 # Sometimes a failure happens when parallelizing make.  Try again if make fails,
 # but make a failure the second time around (single threaded) a fatal error:
diff --git a/source/l/qt/slack-desc b/source/l/qt/slack-desc
index 8229dd0a8..3f77a7fb4 100644
--- a/source/l/qt/slack-desc
+++ b/source/l/qt/slack-desc
@@ -15,5 +15,5 @@ qt:
 qt:
 qt:
 qt:
-qt:
+qt: Homepage:  http://qt.nokia.com
 qt:
diff --git a/source/l/qtscriptgenerator/qtscriptgenerator.SlackBuild b/source/l/qtscriptgenerator/qtscriptgenerator.SlackBuild
index ed66c9bb5..9664ddb22 100755
--- a/source/l/qtscriptgenerator/qtscriptgenerator.SlackBuild
+++ b/source/l/qtscriptgenerator/qtscriptgenerator.SlackBuild
@@ -25,8 +25,17 @@
 
 PRGNAM=qtscriptgenerator
 VERSION=${VERSION:-0.1.0}
-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
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -50,6 +59,9 @@ elif [ "$ARCH" = "arm" ]; then
 elif [ "$ARCH" = "armel" ]; then
   SLKCFLAGS="-O2 -march=armv4t"
   LIBDIRSUFFIX=""
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 # Avoid a version number in .la files:
@@ -63,6 +75,9 @@ cd $TMP
 rm -rf $PRGNAM-src-$VERSION
 tar xvf $CWD/$PRGNAM-src-$VERSION.tar.?z* || exit 1
 cd $PRGNAM-src-$VERSION || exit 1
+
+zcat $CWD/qtscriptgenerator.gcc44.diff.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/l/qtscriptgenerator/qtscriptgenerator.gcc44.diff b/source/l/qtscriptgenerator/qtscriptgenerator.gcc44.diff
new file mode 100644
index 000000000..165c97df0
--- /dev/null
+++ b/source/l/qtscriptgenerator/qtscriptgenerator.gcc44.diff
@@ -0,0 +1,10 @@
+--- ./generator/parser/rpp/pp-internal.h.orig	2009-02-20 05:42:24.000000000 -0600
++++ ./generator/parser/rpp/pp-internal.h	2010-02-18 19:12:22.000000000 -0600
+@@ -16,6 +16,7 @@
+ #define PP_INTERNAL_H
+ 
+ #include <algorithm>
++#include <cstdio>
+ 
+ namespace rpp {
+