diff options
author | Eric Hameleers <alien@slackware.com> | 2016-08-22 18:31:38 +0200 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2016-08-22 18:31:38 +0200 |
commit | ebd87d8a49dcfd524bc745b5563e994c188cd755 (patch) | |
tree | 097bb02d4e1a53e431702ff7311dd5300b44b86e /deps/qca-qt5 | |
parent | 6dce8be4bf0af44260b77fef4d1ba635c620bc8c (diff) | |
download | ktown-ebd87d8a49dcfd524bc745b5563e994c188cd755.tar.gz ktown-ebd87d8a49dcfd524bc745b5563e994c188cd755.tar.xz |
deps: Qt5 updated to 5.7.0 and rebuilt packages depending on it.
Updated:
- qt5
Rebuilt against new qt5:
- qt5-webkit
- PyQt5
- sni-qt
- qca-qt5
- qt-gstreamer
- phonon
- libdbusmenu-qt5
- polkit-qt5-1
- grantlee
Original Slackware package rebuilt (to add Qt5 support):
- poppler
Diffstat (limited to 'deps/qca-qt5')
-rw-r--r-- | deps/qca-qt5/.url | 2 | ||||
-rwxr-xr-x | deps/qca-qt5/qca-qt5.SlackBuild | 5 | ||||
-rw-r--r-- | deps/qca-qt5/qca_qiodevice.patch | 23 |
3 files changed, 3 insertions, 27 deletions
diff --git a/deps/qca-qt5/.url b/deps/qca-qt5/.url new file mode 100644 index 0000000..e63affd --- /dev/null +++ b/deps/qca-qt5/.url @@ -0,0 +1,2 @@ +http://download.kde.org/stable/qca/2.1.1/src/qca-2.1.1.tar.xz + diff --git a/deps/qca-qt5/qca-qt5.SlackBuild b/deps/qca-qt5/qca-qt5.SlackBuild index 2b73fcf..26e8990 100755 --- a/deps/qca-qt5/qca-qt5.SlackBuild +++ b/deps/qca-qt5/qca-qt5.SlackBuild @@ -24,7 +24,7 @@ PKGNAM=qca-qt5 SRCNAM=qca VERSION=${VERSION:-2.1.1} -BUILD=${BUILD:-4} +BUILD=${BUILD:-5} NUMJOBS=${NUMJOBS:--j6} # Automatically determine the architecture we're building on: @@ -60,9 +60,6 @@ rm -rf $SRCNAM-$VERSION tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1 cd $SRCNAM-$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 deleted file mode 100644 index e6b18a2..0000000 --- a/deps/qca-qt5/qca_qiodevice.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Hrvoje Senjan <hrvoje.senjan@gmail.com> -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 <QIODevice> -+ - // 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. - |