From b01ad35c28ad635ba8709781510427006e9dcc6c Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Wed, 2 Sep 2015 09:41:04 +0200 Subject: Updated deps for KDE-5_15.09 Added: ConsoleKit2 LoginKit lmdb Removed (use the Slackware version): PyQt libepoxy sip Removed (no longer used); akonadi-qt5 grantlee-qt5 --- deps/qca-qt5/qca-qt5.SlackBuild | 6 +++++- deps/qca-qt5/qca_qiodevice.patch | 23 +++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 deps/qca-qt5/qca_qiodevice.patch (limited to 'deps/qca-qt5') diff --git a/deps/qca-qt5/qca-qt5.SlackBuild b/deps/qca-qt5/qca-qt5.SlackBuild index 2bcdc5a..35816b2 100755 --- a/deps/qca-qt5/qca-qt5.SlackBuild +++ b/deps/qca-qt5/qca-qt5.SlackBuild @@ -23,7 +23,7 @@ PKGNAM=qca-qt5 VERSION=${VERSION:-2.1.0.3} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} NUMJOBS=${NUMJOBS:--j6} # Automatically determine the architecture we're building on: @@ -58,6 +58,10 @@ cd $TMP rm -rf $PKGNAM-$VERSION tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 cd $PKGNAM-$VERSION || exit 1 + +# Add a missing include. Fixes build against Qt 5.5: +cat $CWD/qca_qiodevice.patch | 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/deps/qca-qt5/qca_qiodevice.patch b/deps/qca-qt5/qca_qiodevice.patch new file mode 100644 index 0000000..e6b18a2 --- /dev/null +++ b/deps/qca-qt5/qca_qiodevice.patch @@ -0,0 +1,23 @@ +From: Hrvoje Senjan +Date: Sat, 17 Jan 2015 19:12:18 +0000 +Subject: Add missing QIODevice include +X-Git-Url: http://quickgit.kde.org/?p=qca.git&a=commitdiff&h=7207e6285e932044cd66d49d0dc484666cfb0092 +--- +Add missing QIODevice include + +Fixes build with Qt 5.5 +--- + + +--- a/include/QtCrypto/qca_basic.h ++++ b/include/QtCrypto/qca_basic.h +@@ -35,6 +35,8 @@ + + #include "qca_core.h" + ++#include ++ + // Qt5 comes with QStringLiteral for wrapping string literals, which Qt4 does + // not have. It is needed if the headers are built with QT_NO_CAST_FROM_ASCII. + // Defining it here as QString::fromUtf8 for convenience. + -- cgit v1.2.3