2 files changed, 27 insertions, 2 deletions
diff --git a/source/l/qtscriptgenerator/qtscriptgenerator.SlackBuild b/source/l/qtscriptgenerator/qtscriptgenerator.SlackBuild
index ed66c9bb..9664ddb2 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 00000000..165c97df
--- /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 {
+