* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/
@ 2016-04-23 19:37 Davide Pesavento
0 siblings, 0 replies; 6+ messages in thread
From: Davide Pesavento @ 2016-04-23 19:37 UTC (permalink / raw
To: gentoo-commits
commit: d4e796a0bc39189d690465c3a455b27873989456
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 23 19:37:40 2016 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Apr 23 19:37:40 2016 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=d4e796a0
dev-qt/qtwebengine: delete unused patches
Package-Manager: portage-2.2.28
.../files/qtwebengine-5.6.0-nss-3.23-01.patch | 59 ------------------
.../files/qtwebengine-5.6.0-nss-3.23-02.patch | 69 ----------------------
2 files changed, 128 deletions(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.6.0-nss-3.23-01.patch b/dev-qt/qtwebengine/files/qtwebengine-5.6.0-nss-3.23-01.patch
deleted file mode 100644
index 8d192b6..0000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.6.0-nss-3.23-01.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 0a385bb01d9cf060fae4c9d350ee98561654df96 Mon Sep 17 00:00:00 2001
-From: Kai Koehne <kai.koehne@theqtcompany.com>
-Date: Thu, 24 Mar 2016 12:34:25 +0100
-Subject: [PATCH] [backport] Call EnsureNSSHttpIOInit in the chimera build.
-
-Otherwise we end up using the default NSS client and not
-SystemURLRequestContext.
-
-This is a minimal fix to be merged onto release branches.
-A follow-up will revise this to be somewhat less error-prone.
-
-BUG=539520
-TEST=Open about:net-internals on Linux or Chrome OS
- Visit https://incomplete-chain.badssl.com/ in a new tab
- The Events tab of about:net-internals should show a fetch for http://crt.comodoca.com/COMODORSADomainValidationSecureServerCA.crt
-
-Review URL: https://codereview.chromium.org/1384343002
-
-Task-number: QTBUG-51890
-Task-number: QTBUG-52068
-Change-Id: I567d5cd5e6d4e53b833699e67c45f3bdfc52953d
-Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
----
- chromium/net/socket/ssl_client_socket_openssl.cc | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/src/3rdparty/chromium/net/socket/ssl_client_socket_openssl.cc b/src/3rdparty/chromium/net/socket/ssl_client_socket_openssl.cc
-index 5489ead..dc9b3ff 100644
---- a/src/3rdparty/chromium/net/socket/ssl_client_socket_openssl.cc
-+++ b/src/3rdparty/chromium/net/socket/ssl_client_socket_openssl.cc
-@@ -57,6 +57,10 @@
- #include "net/ssl/ssl_platform_key.h"
- #endif
-
-+#if defined(USE_NSS_CERTS) || defined(OS_IOS)
-+#include "net/cert_net/nss_ocsp.h"
-+#endif
-+
- namespace net {
-
- namespace {
-@@ -795,6 +799,14 @@ int SSLClientSocketOpenSSL::Init() {
- DCHECK(!ssl_);
- DCHECK(!transport_bio_);
-
-+#if defined(USE_NSS_CERTS) || defined(OS_IOS)
-+ if (ssl_config_.cert_io_enabled) {
-+ // TODO(davidben): Move this out of SSLClientSocket. See
-+ // https://crbug.com/539520.
-+ EnsureNSSHttpIOInit();
-+ }
-+#endif
-+
- SSLContext* context = SSLContext::GetInstance();
- crypto::OpenSSLErrStackTracer err_tracer(FROM_HERE);
-
---
-2.7.4
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.6.0-nss-3.23-02.patch b/dev-qt/qtwebengine/files/qtwebengine-5.6.0-nss-3.23-02.patch
deleted file mode 100644
index a194650..0000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.6.0-nss-3.23-02.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-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/core/config/linux.pri | 9 ++++++---
- tools/qmake/mkspecs/features/configure.prf | 4 ++--
- 3 files changed, 9 insertions(+), 6 deletions(-)
-
-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") {
---
-2.7.4
-
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/
@ 2017-12-15 22:04 Jimi Huotari
0 siblings, 0 replies; 6+ messages in thread
From: Jimi Huotari @ 2017-12-15 22:04 UTC (permalink / raw
To: gentoo-commits
commit: 8e488dabaa7ea2058ed9fefc1986b2ddedaebe5c
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 15 21:57:25 2017 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Fri Dec 15 22:01:24 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=8e488dab
dev-qt/qtwebengine: bring back the ICU patch for 5.9.9999
While 9fc33af6d26ab78fa51e4570e972502cad3bb9ee is correct in that
this patch does not apply on 5.9999 and 5.10.*, it's still required
for 5.9.9999 (and the others do have the same issue still, but
require a different patch).
Package-Manager: Portage-2.3.18, Repoman-2.3.6
.../qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch b/dev-qt/qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch
new file mode 100644
index 00000000..9866ab92
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch
@@ -0,0 +1,16 @@
+Fix build with >=ICU-60
+
+Bug: https://bugs.gentoo.org/639220
+Bug: https://bugreports.qt.io/browse/QTBUG-64925
+
+--- a/src/3rdparty/chromium/components/url_formatter/url_formatter.cc
++++ b/src/3rdparty/chromium/components/url_formatter/url_formatter.cc
+@@ -488,7 +488,7 @@
+ // are added to the allowed set. The list has to be updated when a new
+ // version of Unicode is released. The current version is 9.0.0 and ICU 60
+ // will have Unicode 10.0 data.
+-#if U_ICU_VERSION_MAJOR_NUM < 60
++#if U_ICU_VERSION_MAJOR_NUM < 60 || defined(TOOLKIT_QT)
+ const icu::UnicodeSet aspirational_scripts(
+ icu::UnicodeString(
+ // Unified Canadian Syllabics
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/
@ 2018-02-09 11:40 Michael Palimaka
0 siblings, 0 replies; 6+ messages in thread
From: Michael Palimaka @ 2018-02-09 11:40 UTC (permalink / raw
To: gentoo-commits
commit: 057656398bd8e729e47d983151e510c6ecca18ee
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 9 11:39:40 2018 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Feb 9 11:39:53 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=05765639
dev-qt/qtwebengine: fix typo in patch
Package-Manager: Portage-2.3.19, Repoman-2.3.6
dev-qt/qtwebengine/files/qtwebengine-5.10.0-jpeg-9.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.10.0-jpeg-9.patch b/dev-qt/qtwebengine/files/qtwebengine-5.10.0-jpeg-9.patch
index 21e147db..e70d64c7 100644
--- a/dev-qt/qtwebengine/files/qtwebengine-5.10.0-jpeg-9.patch
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.10.0-jpeg-9.patch
@@ -30,7 +30,7 @@ Fix build with jpeg-9. Bug #646456
cinfo.image_width = m_OrigWidth;
cinfo.image_height = m_OrigHeight;
- int ret = jpeg_read_header(&cinfo, true);
-+ int ret = jpeg_read_header(&cinfo, TUE);
++ int ret = jpeg_read_header(&cinfo, TRUE);
if (ret != JPEG_HEADER_OK)
return false;
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/
@ 2018-03-17 4:14 Davide Pesavento
0 siblings, 0 replies; 6+ messages in thread
From: Davide Pesavento @ 2018-03-17 4:14 UTC (permalink / raw
To: gentoo-commits
commit: 731764edfb5e1647f119249a2621daa612116765
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 17 04:14:34 2018 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Mar 17 04:14:34 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=731764ed
dev-qt/qtwebengine: delete unused patches
Package-Manager: Portage-2.3.24, Repoman-2.3.6
.../files/qtwebengine-5.10.0-jpeg-9.patch | 45 ---------------------
.../qtwebengine-5.9.0-paxmark-mksnapshot.patch | 46 ----------------------
2 files changed, 91 deletions(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.10.0-jpeg-9.patch b/dev-qt/qtwebengine/files/qtwebengine-5.10.0-jpeg-9.patch
deleted file mode 100644
index e70d64c7..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.10.0-jpeg-9.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Fix build with jpeg-9. Bug #646456
-
---- a/src/3rdparty/chromium/third_party/pdfium/core/fxcodec/codec/fx_codec_jpeg.cpp
-+++ b/src/3rdparty/chromium/third_party/pdfium/core/fxcodec/codec/fx_codec_jpeg.cpp
-@@ -74,11 +74,11 @@
- }
-
- static boolean _src_fill_buffer(j_decompress_ptr cinfo) {
-- return 0;
-+ return FALSE;
- }
-
- static boolean _src_resync(j_decompress_ptr cinfo, int desired) {
-- return 0;
-+ return FALSE;
- }
-
- static void _error_do_nothing(j_common_ptr cinfo) {}
-@@ -147,7 +147,7 @@
- jpeg_destroy_decompress(&cinfo);
- return false;
- }
-- int ret = jpeg_read_header(&cinfo, true);
-+ int ret = jpeg_read_header(&cinfo, TRUE);
- if (ret != JPEG_HEADER_OK) {
- jpeg_destroy_decompress(&cinfo);
- return false;
-@@ -231,7 +231,7 @@
- }
- cinfo.image_width = m_OrigWidth;
- cinfo.image_height = m_OrigHeight;
-- int ret = jpeg_read_header(&cinfo, true);
-+ int ret = jpeg_read_header(&cinfo, TRUE);
- if (ret != JPEG_HEADER_OK)
- return false;
-
-@@ -459,7 +459,7 @@
- if (setjmp(ctx->m_JumpMark) == -1)
- return 1;
-
-- int ret = jpeg_read_header(&ctx->m_Info, true);
-+ int ret = jpeg_read_header(&ctx->m_Info, TRUE);
- if (ret == JPEG_SUSPENDED)
- return 2;
- if (ret != JPEG_HEADER_OK)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.9.0-paxmark-mksnapshot.patch b/dev-qt/qtwebengine/files/qtwebengine-5.9.0-paxmark-mksnapshot.patch
deleted file mode 100644
index 5eb8ce12..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.9.0-paxmark-mksnapshot.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- a/src/3rdparty/chromium/v8/src/v8.gyp
-+++ b/src/3rdparty/chromium/v8/src/v8.gyp
-@@ -36,6 +36,7 @@
- 'v8_experimental_extra_library_files%': [],
- 'v8_enable_inspector%': 0,
- 'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)',
-+ 'mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot_u<(EXECUTABLE_SUFFIX)',
- 'mkpeephole_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkpeephole<(EXECUTABLE_SUFFIX)',
- 'v8_os_page_size%': 0,
- },
-@@ -2432,7 +2433,7 @@
- ]
- },
- {
-- 'target_name': 'mksnapshot',
-+ 'target_name': 'mksnapshot_u',
- 'type': 'executable',
- 'dependencies': [
- 'v8_base',
-@@ -2485,5 +2486,26 @@
- }],
- ],
- },
-+ {
-+ 'target_name': 'mksnapshot',
-+ 'type': 'executable',
-+ 'dependencies': ['mksnapshot_u'],
-+ 'actions': [
-+ {
-+ 'action_name': 'paxmark_m_mksnapshot',
-+ 'inputs': [
-+ '<(mksnapshot_u_exec)',
-+ ],
-+ 'outputs': [
-+ '<(mksnapshot_exec)',
-+ ],
-+ 'action': [
-+ 'sh',
-+ '-c',
-+ 'cp <(mksnapshot_u_exec) <(mksnapshot_exec) && paxmark.sh m <(mksnapshot_exec)',
-+ ],
-+ },
-+ ],
-+ },
- ],
- }
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/
@ 2018-06-21 9:16 Jimi Huotari
0 siblings, 0 replies; 6+ messages in thread
From: Jimi Huotari @ 2018-06-21 9:16 UTC (permalink / raw
To: gentoo-commits
commit: 5969dd7c3f4c5cd099266aa57cbcd7e3d3c02b4d
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Thu Jun 21 03:47:51 2018 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Thu Jun 21 09:01:21 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=5969dd7c
dev-qt/qtwebengine: Update libxml2-disable-catalogs.patch.
Update qtwebengine-5.11.1-libxml2-disable-catalogs.patch to version
accepted by Chromium upstream.
Bug: https://bugs.gentoo.org/653078
.../files/qtwebengine-5.11.1-libxml2-disable-catalogs.patch | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-libxml2-disable-catalogs.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-libxml2-disable-catalogs.patch
index 8ac5b90b..7e0efcf3 100644
--- a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-libxml2-disable-catalogs.patch
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-libxml2-disable-catalogs.patch
@@ -23,18 +23,7 @@
#include <libxslt/xslt.h>
#include <memory>
#include "core/css/StyleEngine.h"
-@@ -538,10 +542,6 @@
- static bool ShouldAllowExternalLoad(const KURL& url) {
- String url_string = url.GetString();
-
-- // libxml should not be configured with catalogs enabled, so it
-- // should not be asking to load default catalogs.
-- CHECK(!IsLibxmlDefaultCatalogFile(url));
--
- // The most common DTD. There isn't much point in hammering www.w3c.org by
- // requesting this URL for every XHTML document.
- if (url_string.StartsWithIgnoringASCIICase("http://www.w3.org/TR/xhtml"))
-@@ -646,6 +646,9 @@
+@@ -646,6 +650,9 @@
if (did_init)
return;
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/
@ 2019-12-18 15:33 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2019-12-18 15:33 UTC (permalink / raw
To: gentoo-commits
commit: 6f09be54d1edd658a3add7c5ca4f617295bb2870
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 18 15:30:53 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Dec 18 15:30:53 2019 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=6f09be54
dev-qt/qtwebengine: Drop unused patch
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/qtwebengine-5.12.5-icu-65.patch | 33 ----------------------
1 file changed, 33 deletions(-)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.12.5-icu-65.patch b/dev-qt/qtwebengine/files/qtwebengine-5.12.5-icu-65.patch
deleted file mode 100644
index d7fdaebd..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.12.5-icu-65.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 27947d92157b0987ceef9ae31fe0d3e7f8b653df Mon Sep 17 00:00:00 2001
-From: Kirill Burtsev <kirill.burtsev@qt.io>
-Date: Fri, 23 Aug 2019 15:09:25 +0200
-Subject: Fix compilation with system ICU
-
-ICU upstream now requires that ICU4C API macros are used with a
-trailing semicolon.
-
-- https://unicode-org.atlassian.net/browse/ICU-20601
-- https://github.com/unicode-org/icu/pull/759
-
-Change-Id: Ie05c005ebcded9a228386db5d9abe9863787ec2b
-Fixes: QTBUG-78911
-Reviewed-by: Jimi Huotari <chiitoo@gentoo.org>
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
----
- .../blink/renderer/core/dom/document.cc | 2 +-
- chromium/third_party/icu/BUILD.gn | 28 +++++++++++++++-------
- 2 files changed, 21 insertions(+), 9 deletions(-)
-
-diff --git a/chromium/third_party/blink/renderer/core/dom/document.cc b/chromium/third_party/blink/renderer/core/dom/document.cc
-index 920dab7c48d..43fd422393c 100644
---- a/src/3rdparty/chromium/third_party/blink/renderer/core/dom/document.cc
-+++ b/src/3rdparty/chromium/third_party/blink/renderer/core/dom/document.cc
-@@ -6065,7 +6065,7 @@ static ParseQualifiedNameResult ParseQualifiedNameInternal(
-
- for (unsigned i = 0; i < length;) {
- UChar32 c;
-- U16_NEXT(characters, i, length, c)
-+ U16_NEXT(characters, i, length, c);
- if (c == ':') {
- if (saw_colon)
- return ParseQualifiedNameResult(kQNMultipleColons);
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-12-18 15:33 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-17 4:14 [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/ Davide Pesavento
-- strict thread matches above, loose matches on Subject: below --
2019-12-18 15:33 Andreas Sturmlechner
2018-06-21 9:16 Jimi Huotari
2018-02-09 11:40 Michael Palimaka
2017-12-15 22:04 Jimi Huotari
2016-04-23 19:37 Davide Pesavento
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox