[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/

[Andreas Sturmlechner]

commit:     83411b823ced34db7cad8f19b7c4212b4af5ffe7
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 17 06:43:59 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 24 23:55:51 2021 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=83411b82

dev-qt/qtwebengine: Sync patches from Gentoo ebuild repo

- pdfium-system-lcms2 patch
- supposed systemwide-clang w/ glibc-2.34 fix

Bug: https://bugs.gentoo.org/828099
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...gine-5.15.2_p20211015-pdfium-system-lcms2.patch | 79 ++++++++++++++++++++++
 ...ngine-5.15.2_p20211210-sandbox-glibc-2.34.patch | 27 ++++++++
 dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild  |  2 +
 3 files changed, 108 insertions(+)

diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20211015-pdfium-system-lcms2.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20211015-pdfium-system-lcms2.patch
new file mode 100644
index 00000000..b3c2ffb3
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20211015-pdfium-system-lcms2.patch
@@ -0,0 +1,79 @@
+Description: Use system lcms2
+Author: Sandro Knauß <hefee@××××××.org>
+Origin: Debian
+Forwarded: https://bugreports.qt.io/browse/QTBUG-61746
+Reviewed-by: Sandro Knauß <hefee@××××××.org>
+Last-Update: 2021-03-08
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/3rdparty/chromium/third_party/pdfium/third_party/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/pdfium/third_party/BUILD.gn
+@@ -239,58 +239,19 @@ if (!pdf_use_skia && !pdf_use_skia_paths
+   }
+ }
+ 
+-config("fx_lcms2_warnings") {
+-  visibility = [ ":*" ]
+-  if (is_clang) {
+-    cflags = [
+-      # cmslut.cc is sloppy with aggregate initialization. Version 2.7 of this
+-      # library doesn't appear to have this problem.
+-      "-Wno-missing-braces",
+-    ]
+-  }
++import("//build/shim_headers.gni")
++
++shim_headers("lcms2_shim") {
++  root_path = "lcms/include"
++  headers = [
++    "lcms2.h",
++    "lcms2_plugin.h",
++  ]
+ }
+ 
+ source_set("fx_lcms2") {
+-  configs -= [ "//build/config/compiler:chromium_code" ]
+-  configs += [
+-    "//build/config/compiler:no_chromium_code",
+-    "//build/config/sanitizers:cfi_icall_generalize_pointers",
+-    ":pdfium_third_party_config",
+-
+-    # Must be after no_chromium_code for warning flags to be ordered correctly.
+-    ":fx_lcms2_warnings",
+-  ]
+-  sources = [
+-    "lcms/include/lcms2.h",
+-    "lcms/include/lcms2_plugin.h",
+-    "lcms/src/cmsalpha.c",
+-    "lcms/src/cmscam02.c",
+-    "lcms/src/cmscgats.c",
+-    "lcms/src/cmscnvrt.c",
+-    "lcms/src/cmserr.c",
+-    "lcms/src/cmsgamma.c",
+-    "lcms/src/cmsgmt.c",
+-    "lcms/src/cmshalf.c",
+-    "lcms/src/cmsintrp.c",
+-    "lcms/src/cmsio0.c",
+-    "lcms/src/cmsio1.c",
+-    "lcms/src/cmslut.c",
+-    "lcms/src/cmsmd5.c",
+-    "lcms/src/cmsmtrx.c",
+-    "lcms/src/cmsnamed.c",
+-    "lcms/src/cmsopt.c",
+-    "lcms/src/cmspack.c",
+-    "lcms/src/cmspcs.c",
+-    "lcms/src/cmsplugin.c",
+-    "lcms/src/cmsps2.c",
+-    "lcms/src/cmssamp.c",
+-    "lcms/src/cmssm.c",
+-    "lcms/src/cmstypes.c",
+-    "lcms/src/cmsvirt.c",
+-    "lcms/src/cmswtpnt.c",
+-    "lcms/src/cmsxform.c",
+-  ]
+-  deps = [ "../core/fxcrt" ]
++  deps = [ ":lcms2_shim" ]
++  libs = ["lcms2"]
+ }
+ 
+ if (!build_with_chromium) {

diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20211210-sandbox-glibc-2.34.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20211210-sandbox-glibc-2.34.patch
new file mode 100644
index 00000000..aac512a3
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20211210-sandbox-glibc-2.34.patch
@@ -0,0 +1,27 @@
+Patch taken from www-client/chromium:
+https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files/chromium-glibc-2.34.patch
+
+Dropped parts already upstream.
+
+diff --git a/src/3rdparty/chromium/sandbox/linux/services/credentials.cc b/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
+index ca6b595..1c1ee42 100644
+--- a/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
++++ b/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
+@@ -11,6 +11,7 @@
+ #include <stddef.h>
+ #include <stdint.h>
+ #include <stdio.h>
++#include <string.h>
+ #include <sys/syscall.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
+@@ -100,7 +101,8 @@ bool ChrootToSafeEmptyDir() {
+   // TODO(crbug.com/1247458) Broken in MSan builds after LLVM f1bb30a4956f.
+   clone_flags |= CLONE_VM | CLONE_VFORK | CLONE_SETTLS;
+ 
+-  char tls_buf[PTHREAD_STACK_MIN] = {0};
++  char tls_buf[PTHREAD_STACK_MIN];
++  memset(tls_buf, 0, PTHREAD_STACK_MIN);
+   tls = tls_buf;
+ #endif
+ 

diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
index f2b7c789..d7d70f98 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild
@@ -105,6 +105,8 @@ PATCHES=(
 	"${FILESDIR}/${PN}-5.15.2-extra_gn.patch" # downstream, bug 774186
 	"${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606
 	"${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
+	"${FILESDIR}/${PN}-5.15.2_p20211015-pdfium-system-lcms2.patch" # by Debian, QTBUG-61746
+	"${FILESDIR}/${PN}-5.15.2_p20211210-sandbox-glibc-2.34.patch" # bug 828099, systemwide-clang?
 	"${WORKDIR}/${PN}-5.15.2_p20211019-jumbo-build.patch" # bug 813957
 )