summaryrefslogtreecommitdiff
path: root/libraries/qt5/patches
diff options
context:
space:
mode:
authorLarry Hajali <larryhaja[at]gmail[dot]com>2016-03-16 16:18:25 +0100
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-03-17 17:57:33 +0700
commite7666ab949e833ad44b0d728a506f00ce815de05 (patch)
tree07912f11a5b4f0e763f8c97e674091d380d967cb /libraries/qt5/patches
parente2fe9203261a59b558e79890a0c11c2cec7c7e6a (diff)
downloadslackbuilds-e7666ab949e833ad44b0d728a506f00ce815de05.tar.gz
libraries/qt5: Added a patch for the newer mozilla-nss.
Also another one for QTBUG-48321 (cropped video with vlc) Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'libraries/qt5/patches')
-rw-r--r--libraries/qt5/patches/nss-update-sslv3-nonce.patch44
-rw-r--r--libraries/qt5/patches/qt5.whandle.patch24
2 files changed, 68 insertions, 0 deletions
diff --git a/libraries/qt5/patches/nss-update-sslv3-nonce.patch b/libraries/qt5/patches/nss-update-sslv3-nonce.patch
new file mode 100644
index 0000000000..1700c226a6
--- /dev/null
+++ b/libraries/qt5/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/patches/qt5.whandle.patch b/libraries/qt5/patches/qt5.whandle.patch
new file mode 100644
index 0000000000..4428974d04
--- /dev/null
+++ b/libraries/qt5/patches/qt5.whandle.patch
@@ -0,0 +1,24 @@
+From: Ulf Hermann <ulf.hermann@theqtcompany.com>
+Date: Tue, 27 Oct 2015 14:25:42 +0000 (+0100)
+Subject: WIP: Also do hide/show via WA_OutsideWSRange for native widgets
+X-Git-Url: https://codereview.qt-project.org/gitweb?p=qt%2Fqtbase.git;a=commitdiff_plain;h=5ea44d1d516f0c68a6793279df5c1569ef9fadd2
+
+WIP: Also do hide/show via WA_OutsideWSRange for native widgets
+
+Task-number: QTBUG-48321
+Change-Id: I78ef29975181ee22429c9bd4b11d96d9e68b7a9c
+---
+
+diff --git a/qtbase/src/widgets/kernel/qwidget.cpp b/qtbase/src/widgets/kernel/qwidget.cpp
+index a006246..024005d 100644
+--- a/qtbase/src/widgets/kernel/qwidget.cpp
++++ b/qtbase/src/widgets/kernel/qwidget.cpp
+@@ -7169,7 +7169,7 @@ void QWidgetPrivate::setGeometry_sys(int x, int y, int w, int h, bool isMove)
+
+ bool needsShow = false;
+
+- if (q->isWindow()) {
++ if (q->isWindow() || q->windowHandle()) {
+ if (!(data.window_state & Qt::WindowFullScreen) && (w == 0 || h == 0)) {
+ q->setAttribute(Qt::WA_OutsideWSRange, true);
+ if (q->isVisible() && q->testAttribute(Qt::WA_Mapped))