summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Dave Woodfall <dave@tty1.uk>2019-05-18 21:51:46 +0100
committer Willy Sudiarto Raharjo <willysr@slackbuilds.org>2019-05-25 07:31:56 +0700
commit3bd264869747532239e7561c407d2442b54e14dc (patch)
tree6ba24b70f4828fdd9da9ec7953774974a7fcf19e
parent8ee7e92217555121fa50e817a81f62fb7681a711 (diff)
downloadslackbuilds-3bd264869747532239e7561c407d2442b54e14dc.tar.gz
slackbuilds-3bd264869747532239e7561c407d2442b54e14dc.tar.xz
libraries/qt5: Add mysql patch.
-rw-r--r--libraries/qt5/patches/explicitly-initialize-sqlite.patch (renamed from libraries/qt5/explicitly-initialize-sqlite.patch)0
-rw-r--r--libraries/qt5/patches/nss-update-sslv3-nonce.patch44
-rw-r--r--libraries/qt5/patches/qt5.mysql.h.diff6
-rw-r--r--libraries/qt5/qt5.SlackBuild23
4 files changed, 21 insertions, 52 deletions
diff --git a/libraries/qt5/explicitly-initialize-sqlite.patch b/libraries/qt5/patches/explicitly-initialize-sqlite.patch
index 2773658adc..2773658adc 100644
--- a/libraries/qt5/explicitly-initialize-sqlite.patch
+++ b/libraries/qt5/patches/explicitly-initialize-sqlite.patch
diff --git a/libraries/qt5/patches/nss-update-sslv3-nonce.patch b/libraries/qt5/patches/nss-update-sslv3-nonce.patch
deleted file mode 100644
index 1700c226a6..0000000000
--- a/libraries/qt5/patches/nss-update-sslv3-nonce.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -Naur qt-everywhere-opensource-src-5.5.1.orig/qtwebengine/src/3rdparty/chromium/net/quic/crypto/chacha20_poly1305_decrypter_nss.cc qt-everywhere-opensource-src-5.5.1/qtwebengine/src/3rdparty/chromium/net/quic/crypto/chacha20_poly1305_decrypter_nss.cc
---- qt-everywhere-opensource-src-5.5.1.orig/qtwebengine/src/3rdparty/chromium/net/quic/crypto/chacha20_poly1305_decrypter_nss.cc 2015-10-13 04:36:54.000000000 +0000
-+++ qt-everywhere-opensource-src-5.5.1/qtwebengine/src/3rdparty/chromium/net/quic/crypto/chacha20_poly1305_decrypter_nss.cc 2016-03-15 11:57:53.898988200 +0000
-@@ -66,9 +66,9 @@
- AeadParams* aead_params) const {
- aead_params->len = sizeof(aead_params->data.nss_aead_params);
- CK_NSS_AEAD_PARAMS* nss_aead_params = &aead_params->data.nss_aead_params;
-- nss_aead_params->pIv =
-+ nss_aead_params->pNonce =
- reinterpret_cast<CK_BYTE*>(const_cast<char*>(nonce.data()));
-- nss_aead_params->ulIvLen = nonce.size();
-+ nss_aead_params->ulNonceLen = nonce.size();
- nss_aead_params->pAAD =
- reinterpret_cast<CK_BYTE*>(const_cast<char*>(associated_data.data()));
- nss_aead_params->ulAADLen = associated_data.size();
-diff -Naur qt-everywhere-opensource-src-5.5.1.orig/qtwebengine/src/3rdparty/chromium/net/quic/crypto/chacha20_poly1305_encrypter_nss.cc qt-everywhere-opensource-src-5.5.1/qtwebengine/src/3rdparty/chromium/net/quic/crypto/chacha20_poly1305_encrypter_nss.cc
---- qt-everywhere-opensource-src-5.5.1.orig/qtwebengine/src/3rdparty/chromium/net/quic/crypto/chacha20_poly1305_encrypter_nss.cc 2015-10-13 04:36:54.000000000 +0000
-+++ qt-everywhere-opensource-src-5.5.1/qtwebengine/src/3rdparty/chromium/net/quic/crypto/chacha20_poly1305_encrypter_nss.cc 2016-03-15 11:57:53.902988200 +0000
-@@ -66,9 +66,9 @@
- AeadParams* aead_params) const {
- aead_params->len = sizeof(aead_params->data.nss_aead_params);
- CK_NSS_AEAD_PARAMS* nss_aead_params = &aead_params->data.nss_aead_params;
-- nss_aead_params->pIv =
-+ nss_aead_params->pNonce =
- reinterpret_cast<CK_BYTE*>(const_cast<char*>(nonce.data()));
-- nss_aead_params->ulIvLen = nonce.size();
-+ nss_aead_params->ulNonceLen = nonce.size();
- nss_aead_params->pAAD =
- reinterpret_cast<CK_BYTE*>(const_cast<char*>(associated_data.data()));
- nss_aead_params->ulAADLen = associated_data.size();
-diff -Naur qt-everywhere-opensource-src-5.5.1.orig/qtwebengine/src/3rdparty/chromium/net/third_party/nss/ssl/ssl3con.c qt-everywhere-opensource-src-5.5.1/qtwebengine/src/3rdparty/chromium/net/third_party/nss/ssl/ssl3con.c
---- qt-everywhere-opensource-src-5.5.1.orig/qtwebengine/src/3rdparty/chromium/net/third_party/nss/ssl/ssl3con.c 2015-10-13 04:36:52.000000000 +0000
-+++ qt-everywhere-opensource-src-5.5.1/qtwebengine/src/3rdparty/chromium/net/third_party/nss/ssl/ssl3con.c 2016-03-15 12:00:01.376986796 +0000
-@@ -2088,8 +2088,8 @@
- param.len = sizeof(aeadParams);
- param.data = (unsigned char *) &aeadParams;
- memset(&aeadParams, 0, sizeof(aeadParams));
-- aeadParams.pIv = (unsigned char *) additionalData;
-- aeadParams.ulIvLen = 8;
-+ aeadParams.pNonce = (unsigned char *) additionalData;
-+ aeadParams.ulNonceLen = 8;
- aeadParams.pAAD = (unsigned char *) additionalData;
- aeadParams.ulAADLen = additionalDataLen;
- aeadParams.ulTagLen = tagSize;
diff --git a/libraries/qt5/patches/qt5.mysql.h.diff b/libraries/qt5/patches/qt5.mysql.h.diff
index 41dc9d34d5..1ac6faacfd 100644
--- a/libraries/qt5/patches/qt5.mysql.h.diff
+++ b/libraries/qt5/patches/qt5.mysql.h.diff
@@ -1,6 +1,6 @@
-diff -Naur qt-everywhere-opensource-src-5.1.0.orig/qtbase/src/sql/drivers/mysql/qsql_mysql_p.h qt-everywhere-opensource-src-5.1.0/qtbase/src/sql/drivers/mysql/qsql_mysql_p.h
---- qt-everywhere-opensource-src-5.1.0.orig/qtbase/src/sql/drivers/mysql/qsql_mysql_p.h 2013-07-02 07:09:52.000000000 +0000
-+++ qt-everywhere-opensource-src-5.1.0/qtbase/src/sql/drivers/mysql/qsql_mysql_p.h 2013-07-21 21:21:01.190172379 +0000
+diff -Naur qt-everywhere-opensource-src-5.1.0.orig/qtbase/src/plugins/sqldrivers/mysql/qsql_mysql_p.h qt-everywhere-opensource-src-5.1.0/qtbase/src/plugins/sqldrivers/mysql/qsql_mysql_p.h
+--- qt-everywhere-opensource-src-5.1.0.orig/qtbase/src/plugins/sqldrivers/mysql/qsql_mysql_p.h 2013-07-02 07:09:52.000000000 +0000
++++ qt-everywhere-opensource-src-5.1.0/qtbase/src/plugins/sqldrivers/mysql/qsql_mysql_p.h 2013-07-21 21:21:01.190172379 +0000
@@ -60,7 +60,7 @@
#include <QtCore/qt_windows.h>
#endif
diff --git a/libraries/qt5/qt5.SlackBuild b/libraries/qt5/qt5.SlackBuild
index 8a1046f062..6d36e054f0 100644
--- a/libraries/qt5/qt5.SlackBuild
+++ b/libraries/qt5/qt5.SlackBuild
@@ -51,7 +51,7 @@
PRGNAM=qt5
VERSION=${VERSION:-5.9.8}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -122,6 +122,7 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+ SLKLDFLAGS="-L/usr/lib64"
elif [ "$ARCH" = "armv7hl" ]; then
# To prevent "qatomic_armv6.h error: output number 2 not directly addressable"
# More permanent solution is to patch gcc:
@@ -164,17 +165,29 @@ else
RELOCATIONS=""
fi
-sed -i "s|-O2|$SLKCFLAGS|" qtbase/mkspecs/common/gcc-base.conf
-
# Patch to fix renderer crash on some sites with 5.9.8:
# https://bugreports.qt.io/browse/QTBUG-75853
if [ "$WEBENGINE" = "yes" ]; then
(
cd qtwebengine/src/3rdparty
- patch -p1 <$CWD/explicitly-initialize-sqlite.patch
- )
+ cat $CWD/patches/explicitly-initialize-sqlite.patch \
+ | patch -p1 --verbose
+ ) || exit 1
fi
+# Borrowed a few things from alienBOB:
+# Fix path to mysql header:
+cat $CWD/patches/qt5.mysql.h.diff | patch -p1 --verbose
+
+# Fix missing private includes: QTBUG-37417
+sed -e '/CMAKE_NO_PRIVATE_INCLUDES\ \=\ true/d' \
+ -i qtbase/mkspecs/features/create_cmake.prf
+
+# Use our custom compiler and linker flags:
+sed -i -re "s,-O(2|3),$SLKCFLAGS," qtbase/mkspecs/common/gcc-base.conf
+sed -i -e "/^QMAKE_LFLAGS\s/s,+=,+= $SLKLDFLAGS,g" \
+ qtbase/mkspecs/common/gcc-base.conf
+
export CFLAGS="$SLKCFLAGS"
export CXXFLAGS="$SLKCFLAGS -std=c++11"
./configure -v \