commit: afba13087b9d6c2e5edb675882e147f8f1148588 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Apr 1 18:22:53 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Apr 1 18:23:36 2022 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=afba1308
dev-qt/qtwebengine: Drop upstreamed patch Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> ...ngine-5.15.2_p20211210-sandbox-glibc-2.34.patch | 27 ---------------------- dev-qt/qtwebengine/qtwebengine-5.15.3.9999.ebuild | 1 - 2 files changed, 28 deletions(-) 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 deleted file mode 100644 index aac512a3..00000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20211210-sandbox-glibc-2.34.patch +++ /dev/null @@ -1,27 +0,0 @@ -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.3.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.3.9999.ebuild index 3f5a4cb4..8c44a498 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.15.3.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.15.3.9999.ebuild @@ -106,7 +106,6 @@ PATCHES=( "${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 )