summaryrefslogtreecommitdiffstats
path: root/source/l/qt5/patches/qt5.qtbug-51890.patch
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2020-02-17 06:03:43 +0000
committer Eric Hameleers <alien@slackware.com>2020-02-17 17:59:51 +0100
commit8ea9f1e02e85e3cc2b4ccda52639e96651d21653 (patch)
treedacfd5fff40a77f9335c18e572a6587149bb0abc /source/l/qt5/patches/qt5.qtbug-51890.patch
parent6087aff6cae8d8d4c46ce086cb7b70a5af412d2b (diff)
downloadcurrent-8ea9f1e02e85e3cc2b4ccda52639e96651d21653.tar.gz
current-8ea9f1e02e85e3cc2b4ccda52639e96651d21653.tar.xz
Mon Feb 17 06:03:43 UTC 202020200217060343
ap/ksh93-20200131_e4fea8c5-x86_64-1.txz: Upgraded. ap/zsh-5.8-x86_64-1.txz: Upgraded. l/brotli-1.0.7-x86_64-1.txz: Added. l/gmime-3.2.6-x86_64-1.txz: Upgraded. l/hyphen-2.8.8-x86_64-1.txz: Added. l/openal-soft-1.20.1-x86_64-1.txz: Upgraded. Thanks to Skaendo and Willy Sudiarto Raharjo. l/qt5-webkit-5.212.0_alpha3-x86_64-1.txz: Added. Thanks to alienBOB. l/woff2-20180531_a0d0ed7-x86_64-1.txz: Added. n/bluez-5.53-x86_64-1.txz: Upgraded. n/mutt-1.13.4-x86_64-1.txz: Upgraded. n/samba-4.11.6-x86_64-3.txz: Rebuilt. n/socat-1.7.3.4-x86_64-1.txz: Added. n/whois-5.5.6-x86_64-1.txz: Upgraded. testing/packages/PAM/samba-4.11.6-x86_64-3_pam.txz: Rebuilt. Added patches to fix joining a DC when using krb5. Looks like the patches are already upstreamed in the latest 4.12.0-rc. Thanks to camerabambai.
Diffstat (limited to 'source/l/qt5/patches/qt5.qtbug-51890.patch')
-rw-r--r--source/l/qt5/patches/qt5.qtbug-51890.patch82
1 files changed, 0 insertions, 82 deletions
diff --git a/source/l/qt5/patches/qt5.qtbug-51890.patch b/source/l/qt5/patches/qt5.qtbug-51890.patch
deleted file mode 100644
index 51168b90f..000000000
--- a/source/l/qt5/patches/qt5.qtbug-51890.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-QTBUG-51890: qtwebengine fails to build with system nss 3.23
-Patch obtained from:
-https://github.com/qtproject/qtwebengine/commit/82900c7b96b2a6fb42fe3841df7685b820edd588.patch
-
-And modified to exclude the "Subproject commit" lines.
-
-# ----------------------------------------------------------------------------
-
-From 82900c7b96b2a6fb42fe3841df7685b820edd588 Mon Sep 17 00:00:00 2001
-From: Kai Koehne <kai.koehne@theqtcompany.com>
-Date: Thu, 24 Mar 2016 13:55:28 +0100
-Subject: [PATCH] Use system NSS only for certificate handling
-
-Compiling against NSS 3.23 fails with current Chromium. Also, with NSS
-3.21 there are failures connecting to e.g. google.com.
-
-Fix this by adapting the setup endorsed by upstream Chromium: BoringSSL
-is always used for cryptography, and NSS only for certificate handlng.
-
-Patches included in 3rdparty update:
-
-0a385bb [backport] Call EnsureNSSHttpIOInit in the chimera build.
-0472123 Fix build against newer NSS
-90c62c4 <third_party/libpng> [Backport] update to libpng 1.2.56
-34857b8 <third_party/libpng> [Backport] Stop large iCCP chunks causing delays and "Aw Snap!"
-
-Task-number: QTBUG-52193
-Task-number: QTBUG-51890
-Task-number: QTBUG-52068
-Change-Id: If8aaed9b9a09475c5ed0dfec64d31f45ce9670f5
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
----
- src/3rdparty | 2 +-
- src/core/config/linux.pri | 9 ++++++---
- tools/qmake/mkspecs/features/configure.prf | 4 ++--
- 3 files changed, 9 insertions(+), 6 deletions(-)
-
-#diff --git a/src/3rdparty b/src/3rdparty
-#index 3b2b78c..0a385bb 160000
-#--- a/src/3rdparty
-#+++ b/src/3rdparty
-#@@ -1 +1 @@
-#-Subproject commit 3b2b78caa761db2b7b25dc51c3dae8316f595db1
-#+Subproject commit 0a385bb01d9cf060fae4c9d350ee98561654df96
-diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
-index 88c1a41..39eeb2a 100644
---- a/src/core/config/linux.pri
-+++ b/src/core/config/linux.pri
-@@ -18,11 +18,14 @@ GYP_CONFIG += \
- use_gio=0 \
- use_gnome_keyring=0 \
- use_kerberos=0 \
-- use_pango=0
-+ use_pango=0 \
-+ use_openssl=1
-
--!use?(nss) {
-+use?(nss) {
-+ GYP_CONFIG += use_nss_certs=1 \
-+ use_openssl_certs=0
-+} else {
- GYP_CONFIG += use_nss_certs=0 \
-- use_openssl=1 \
- use_openssl_certs=1
- }
-
-diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf
-index 4cb4600..953572d 100644
---- a/tools/qmake/mkspecs/features/configure.prf
-+++ b/tools/qmake/mkspecs/features/configure.prf
-@@ -72,9 +72,9 @@ defineTest(runConfigure) {
- defineTest(finalizeConfigure) {
- linux {
- use?(nss) {
-- log("SSL............................... Using system NSS$${EOL}")
-+ log("Certificate handling.............. Using system NSS$${EOL}")
- } else {
-- log("SSL............................... Using bundled BoringSSL$${EOL}")
-+ log("Certificate handling.............. Using bundled BoringSSL$${EOL}")
- }
- use?(system_icu) {
- packagesExist("icu-uc icu-i18n") {