diff options
| author | David Woodfall <dave@dawoodfall.net> | 2018-08-25 00:37:02 +0700 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2018-09-23 06:11:02 +0700 |
| commit | fc730b801383c0943af4706fc1f9b83a7073e509 (patch) | |
| tree | c5f2fb6130362184e0ff9f0223f88894e8beb111 /libraries/qt5-legacy/patches | |
| parent | 8a3430f7e7ae4b79cfde2366c227a6e66a1e38c6 (diff) | |
libraries/qt5-legacy: Added (a multi-platform C++ GUI toolkit).
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'libraries/qt5-legacy/patches')
| -rw-r--r-- | libraries/qt5-legacy/patches/nss-update-sslv3-nonce.patch | 44 | ||||
| -rw-r--r-- | libraries/qt5-legacy/patches/qt5.mysql.h.diff | 12 |
2 files changed, 56 insertions, 0 deletions
diff --git a/libraries/qt5-legacy/patches/nss-update-sslv3-nonce.patch b/libraries/qt5-legacy/patches/nss-update-sslv3-nonce.patch new file mode 100644 index 0000000000000..1700c226a65d8 --- /dev/null +++ b/libraries/qt5-legacy/patches/nss-update-sslv3-nonce.patch @@ -0,0 +1,44 @@ +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-legacy/patches/qt5.mysql.h.diff b/libraries/qt5-legacy/patches/qt5.mysql.h.diff new file mode 100644 index 0000000000000..41dc9d34d52a0 --- /dev/null +++ b/libraries/qt5-legacy/patches/qt5.mysql.h.diff @@ -0,0 +1,12 @@ +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 +@@ -60,7 +60,7 @@ + #include <QtCore/qt_windows.h> + #endif + +-#include <mysql.h> ++#include <mysql/mysql.h> + + #ifdef QT_PLUGIN + #define Q_EXPORT_SQLDRIVER_MYSQL |