From 3d75220e10122e7e9f82c600a0e38d587c9337d5 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Thu, 25 Apr 2013 00:11:48 +0200
Subject: QT: Patched to fix a plasma crash in KDE.

See https://bugreports.qt-project.org/browse/QTBUG-29082
---
 source.local/l/qt/qt-fix-qvmemetadata-crash.patch.gz | Bin 0 -> 848 bytes
 source.local/l/qt/qt.SlackBuild                      |  15 ++++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 source.local/l/qt/qt-fix-qvmemetadata-crash.patch.gz

diff --git a/source.local/l/qt/qt-fix-qvmemetadata-crash.patch.gz b/source.local/l/qt/qt-fix-qvmemetadata-crash.patch.gz
new file mode 100644
index 0000000..3080cc4
Binary files /dev/null and b/source.local/l/qt/qt-fix-qvmemetadata-crash.patch.gz differ
diff --git a/source.local/l/qt/qt.SlackBuild b/source.local/l/qt/qt.SlackBuild
index a35f270..cf1d715 100755
--- a/source.local/l/qt/qt.SlackBuild
+++ b/source.local/l/qt/qt.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -41,7 +41,7 @@
 
 PKGNAM=qt
 VERSION=${VERSION:-4.8.4}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-5}
 
 NUMJOBS=${NUMJOBS:--j7}
 
@@ -116,6 +116,9 @@ zcat $CWD/qt.webkit-no_Werror.patch.gz | patch -p1 --verbose || exit 1
 # Patch for boost-1.53:
 zcat $CWD/qt-everywhere-opensource-src-4.8.4-QTBUG-22829.diff.gz | patch -p1 --verbose || exit 1
 
+# Fix call to QMetaObject::metaCall from updateProperty (QTBUG-29082):
+zcat $CWD/qt-fix-qvmemetadata-crash.patch.gz | patch -p1 --verbose || exit 1
+
 export CFLAGS="$SLKCFLAGS"
 export CXXFLAGS="$SLKCFLAGS"
 export OPENSOURCE_CXXFLAGS="$SLKCFLAGS"
@@ -286,9 +289,11 @@ EOF
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a *GPL_EXCEPTION* FAQ* INSTALL KNOWN* LICENSE* README* changes-* \
   $PKG/usr/doc/$PKGNAM-$VERSION
-( cd $PKG/usr/doc/$PKGNAM-$VERSION
-  ln -sf /usr/lib${LIBDIRSUFFIX}/qt/doc/html .
-)
+if [ -d $PKG/usr/lib${LIBDIRSUFFIX}/qt/doc/html ]; then
+  ( cd $PKG/usr/doc/$PKGNAM-$VERSION
+    ln -sf /usr/lib${LIBDIRSUFFIX}/qt/doc/html .
+  )
+fi
 
 mkdir -p $PKG/install
 zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
-- 
cgit v1.2.3