--- qt.SlackBuild 2011-03-26 04:59:18.000000000 +1000
+++ qt.SlackBuild 2011-08-28 11:27:40.797336751 +1000
@@ -37,8 +37,8 @@
# wget http://qt.gitorious.org/qt/kde-qt/archive-tarball/4.6.2-patched
PKGNAM=qt
-VERSION=$(ls qt-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)
-BUILD=${BUILD:-3}
+VERSION=$(ls qt-*.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
@@ -73,23 +73,23 @@
rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
-#rm -rf qt-x11-opensource-src-$VERSION
-#tar xvf $CWD/qt-x11-opensource-src-$VERSION.tar.gz # For qt releases
-#cd qt-x11-opensource-src-$VERSION || exit 1
-
-rm -rf qt-$VERSION
-if [ -r $CWD/qt-$VERSION.tar.gz ]; then
- tar xvf $CWD/qt-$VERSION.tar.gz || exit 1
-elif [ -r $CWD/qt-$VERSION.tar.bz2 ]; then
- tar xvf $CWD/qt-$VERSION.tar.bz2 || exit 1
-elif [ -r $CWD/qt-$VERSION.tar.xz ]; then
- tar xvf $CWD/qt-$VERSION.tar.xz || exit 1
-elif [ -r $CWD/qt-$VERSION.tar.lzma ]; then
- tar xvf $CWD/qt-$VERSION.tar.lzma || exit 1
-else
- exit 1
-fi
-cd qt-$VERSION || exit 1
+rm -rf qt-everywhere-opensource-src-$VERSION
+tar xvf $CWD/qt-everywhere-opensource-src-$VERSION.tar.xz # For qt releases
+cd qt-everywhere-opensource-src-$VERSION || exit 1
+
+#rm -rf qt-$VERSION
+#if [ -r $CWD/qt-$VERSION.tar.gz ]; then
+# tar xvf $CWD/qt-$VERSION.tar.gz || exit 1
+#elif [ -r $CWD/qt-$VERSION.tar.bz2 ]; then
+# tar xvf $CWD/qt-$VERSION.tar.bz2 || exit 1
+#elif [ -r $CWD/qt-$VERSION.tar.xz ]; then
+# tar xvf $CWD/qt-$VERSION.tar.xz || exit 1
+#elif [ -r $CWD/qt-$VERSION.tar.lzma ]; then
+# tar xvf $CWD/qt-$VERSION.tar.lzma || exit 1
+#else
+# exit 1
+#fi
+#cd qt-$VERSION || exit 1
chown -R root:root .
find . \
@@ -100,12 +100,12 @@
# apply_patches looks for a ".svn" directory, which doesn't exist in the used snapshot.
# removing the check from apply_patches to not try to apply already applied patches
-sed -i "s| test -d .svn &&||" apply_patches
+#sed -i "s| test -d .svn &&||" apply_patches
# This is only needed/wanted for qt-copy (the r###### version) that we're
# building right now. It might require manual intervention, so don't walk
# away during the build
-./apply_patches
+#./apply_patches
if [ $ARCH = "i486" ]; then
zcat $CWD/qt.x86.cflags.diff.gz | patch -p1 || exit 1
@@ -115,11 +115,11 @@
zcat $CWD/qt.mysql.h.diff.gz | patch -p1 --verbose || exit 1
# Upstream patch required for upcoming kdepim-4.6.x:
-zcat $CWD/qt.QSortFilterProxyModel.reformatted.diff.gz | patch -p1 --verbose || exit 1
+#zcat $CWD/qt.QSortFilterProxyModel.reformatted.diff.gz | patch -p1 --verbose || exit 1
# Blacklist compromised certificates:
-zcat $CWD/qt.blacklist.bad.certs.diff.gz | patch -p1 --verbose || exit 1
-zcat $CWD/qt.blacklist.bad.certs.patch02.diff.gz | patch -p1 --verbose || exit 1
+#zcat $CWD/qt.blacklist.bad.certs.diff.gz | patch -p1 --verbose || exit 1
+#zcat $CWD/qt.blacklist.bad.certs.patch02.diff.gz | patch -p1 --verbose || exit 1
export CFLAGS="$SLKCFLAGS"
export CXXFLAGS="$SLKCFLAGS"