From 5fc3fdb057a38c4c237a09c390871899dcfde24a Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Mon, 22 Dec 2014 15:11:27 +0100
Subject: KDE 4.10.5 for Slackware 14.0 (02jul2013)

---
 ...ywhere-opensource-src-4.8.4-QTBUG-22829.diff.gz | Bin 0 -> 442 bytes
 deps/qt/qt-fix-qvmemetadata-crash.patch.gz         | Bin 0 -> 848 bytes
 deps/qt/qt.SlackBuild                              |  27 +++++++++++++++++----
 deps/qt/slack-desc                                 |   2 +-
 4 files changed, 23 insertions(+), 6 deletions(-)
 create mode 100644 deps/qt/qt-everywhere-opensource-src-4.8.4-QTBUG-22829.diff.gz
 create mode 100644 deps/qt/qt-fix-qvmemetadata-crash.patch.gz

(limited to 'deps/qt')

diff --git a/deps/qt/qt-everywhere-opensource-src-4.8.4-QTBUG-22829.diff.gz b/deps/qt/qt-everywhere-opensource-src-4.8.4-QTBUG-22829.diff.gz
new file mode 100644
index 0000000..7a23632
Binary files /dev/null and b/deps/qt/qt-everywhere-opensource-src-4.8.4-QTBUG-22829.diff.gz differ
diff --git a/deps/qt/qt-fix-qvmemetadata-crash.patch.gz b/deps/qt/qt-fix-qvmemetadata-crash.patch.gz
new file mode 100644
index 0000000..3080cc4
Binary files /dev/null and b/deps/qt/qt-fix-qvmemetadata-crash.patch.gz differ
diff --git a/deps/qt/qt.SlackBuild b/deps/qt/qt.SlackBuild
index a7a4e85..91a1339 100755
--- a/deps/qt/qt.SlackBuild
+++ b/deps/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=$(ls qt-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-5}
 
 NUMJOBS=${NUMJOBS:--j7}
 
@@ -113,6 +113,12 @@ zcat $CWD/qt.ld-gold.patch.gz | patch -p1 --verbose || exit 1
 # Stupid idea - remove it:
 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"
@@ -131,6 +137,7 @@ export OPENSOURCE_CXXFLAGS="$SLKCFLAGS"
   -no-phonon \
   -nomake examples \
   -nomake demos \
+  -nomake docs \
   -no-separate-debug-info \
   -no-pch
   # No-precompiled-headers is ccache-friendly.
@@ -205,6 +212,14 @@ mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig
   done
 )
 
+# Install Qt's private headers - at least Gentoo and Fedora are adding these
+# and some software has (inevitably) started depending on them:
+# We're using `rsync -R` as easy way to preserve relative path names:
+rsync -aR \
+  include/Qt{Core,Declarative,Gui,Script}/private \
+  src/{corelib,declarative,gui,script}/*/*_p.h \
+  ${PKG}/usr/lib${LIBDIRSUFFIX}/qt/
+
 # Add menu entries for all those hidden but great Qt applications:
 # Qt logo:
 convert $PKG/usr/lib$LIBDIRSUFFIX/qt/doc/src/images/qt-logo.png  -resize 48x48 $PKG/usr/share/icons/hicolor/48x48/apps/qt-logo.png
@@ -274,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
diff --git a/deps/qt/slack-desc b/deps/qt/slack-desc
index f511d89..0a42d4a 100644
--- a/deps/qt/slack-desc
+++ b/deps/qt/slack-desc
@@ -11,7 +11,7 @@ qt:
 qt: Qt is a complete and well-developed object-oriented framework for
 qt: developing graphical user interface (GUI) applications using C++.
 qt:
-qt: Homepage:  http://qt.nokia.com
+qt: Homepage:  http://qt-project.org/
 qt:
 qt:
 qt:
-- 
cgit v1.2.3