mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
dev-qt/qtwebengine: Cleanup vulnerable 5.15.2_p20210824-r1
Bug: https://bugs.gentoo.org/815397 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
@@ -1,5 +1,3 @@
|
||||
DIST qtwebengine-5.15.2-chromium87-ppc64le.tar.xz 28536 BLAKE2B 98f8e01e7026d9df1d30ae453d4394d3c4ad04c0620a2496235d45f5f1080c2280e040826cde7f72d9771bfc80d0c3df56c9dcbe4f763cec432ad56de37d64c5 SHA512 c90a76f44a9d720624016fd082ab3036f12e13b9789e869ebaf5e4774afca7d4187faf187f365f696d1a7eda05ca75516556ee9d291cdb3408d57cc4b23e2654
|
||||
DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
|
||||
DIST qtwebengine-5.15.2_p20210824.tar.xz 320214264 BLAKE2B fe611805107822f495e0921de4fc9a8737bd3238a332e03d27421a3fd14dc1417c1d69e9ec5e9f6bf922f98045cbdf9ee2c76621db988c8b1e6e0e90b2c6dc7e SHA512 3a5f9ef45ba488aee601e092d1c4a5f707a854d5b9f0a5e62cb88dcdf280163182abc98b0a55b28591e81e18b5147142d404dcdc92feb61414ce2d4ce0d2dca6
|
||||
DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B fca1d1406874d04eafb64bb4d8730512a6307ba44fb99d76f428ca1bd4a303758e0c3bd8f92a59f7bcf62e5b767c5a8ed239028bdb74ad7a8b62abf88d38c101 SHA512 61cbfbe4ff340b75ea8d356e031e932ac03fe65dd009999ff897ca4b0185d1d989490daf75ffeaaabb3e92c870c11c7ff8ad2cd6372f5363b3d774b8ecca6d89
|
||||
DIST qtwebengine-5.15.2_p20211019.tar.xz 320325744 BLAKE2B fac2f2a44e0f443a2642c0a0b3888ff15d047ce5b2de6673213db308e60f3e26b12adf98ad1dcf305630f0bc55abff078942711fbd10d05dc5a4095faadead25 SHA512 4abd2ca416228bbafa31aad9deae1466748930c02bcc08b559bbbb21fda598f720137e2af0cfa176dd534c8da97934d76e59b72c124b73564378fda0deaddaee
|
||||
|
||||
@@ -1,141 +0,0 @@
|
||||
diff -up b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
|
||||
--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
|
||||
+++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
|
||||
@@ -257,6 +257,18 @@ ResultExpr EvaluateSyscallImpl(int fs_de
|
||||
return RestrictKillTarget(current_pid, sysno);
|
||||
}
|
||||
|
||||
+#if defined(__NR_newfstatat)
|
||||
+ if (sysno == __NR_newfstatat) {
|
||||
+ return RewriteFstatatSIGSYS();
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
+#if defined(__NR_fstatat64)
|
||||
+ if (sysno == __NR_fstatat64) {
|
||||
+ return RewriteFstatatSIGSYS();
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
if (SyscallSets::IsFileSystem(sysno) ||
|
||||
SyscallSets::IsCurrentDirectory(sysno)) {
|
||||
return Error(fs_denied_errno);
|
||||
diff -up b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc
|
||||
--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc
|
||||
+++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc
|
||||
@@ -6,6 +6,8 @@
|
||||
|
||||
#include "sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h"
|
||||
|
||||
+#include <errno.h>
|
||||
+#include <fcntl.h>
|
||||
#include <stddef.h>
|
||||
#include <stdint.h>
|
||||
#include <string.h>
|
||||
@@ -355,6 +357,35 @@ intptr_t SIGSYSSchedHandler(const struct
|
||||
return -ENOSYS;
|
||||
}
|
||||
|
||||
+intptr_t SIGSYSFstatatHandler(const struct arch_seccomp_data& args,
|
||||
+ void* aux) {
|
||||
+ switch (args.nr) {
|
||||
+#if defined(__NR_newfstatat)
|
||||
+ case __NR_newfstatat:
|
||||
+#endif
|
||||
+#if defined(__NR_fstatat64)
|
||||
+ case __NR_fstatat64:
|
||||
+#endif
|
||||
+#if defined(__NR_newfstatat) || defined(__NR_fstatat64)
|
||||
+ if (*reinterpret_cast<const char *>(args.args[1]) == '\0'
|
||||
+ && args.args[3] == static_cast<uint64_t>(AT_EMPTY_PATH)) {
|
||||
+ return sandbox::sys_fstat64(static_cast<int>(args.args[0]),
|
||||
+ reinterpret_cast<struct stat64 *>(args.args[2]));
|
||||
+ } else {
|
||||
+ errno = EACCES;
|
||||
+ return -1;
|
||||
+ }
|
||||
+ break;
|
||||
+#endif
|
||||
+ }
|
||||
+
|
||||
+ CrashSIGSYS_Handler(args, aux);
|
||||
+
|
||||
+ // Should never be reached.
|
||||
+ RAW_CHECK(false);
|
||||
+ return -ENOSYS;
|
||||
+}
|
||||
+
|
||||
bpf_dsl::ResultExpr CrashSIGSYS() {
|
||||
return bpf_dsl::Trap(CrashSIGSYS_Handler, NULL);
|
||||
}
|
||||
@@ -387,6 +418,10 @@ bpf_dsl::ResultExpr RewriteSchedSIGSYS()
|
||||
return bpf_dsl::Trap(SIGSYSSchedHandler, NULL);
|
||||
}
|
||||
|
||||
+bpf_dsl::ResultExpr RewriteFstatatSIGSYS() {
|
||||
+ return bpf_dsl::Trap(SIGSYSFstatatHandler, NULL);
|
||||
+}
|
||||
+
|
||||
void AllocateCrashKeys() {
|
||||
#if !defined(OS_NACL_NONSFI)
|
||||
if (seccomp_crash_key)
|
||||
diff -up b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h
|
||||
--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h
|
||||
+++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h
|
||||
@@ -62,6 +62,10 @@ SANDBOX_EXPORT intptr_t SIGSYSPtraceFail
|
||||
// sched_setparam(), sched_setscheduler()
|
||||
SANDBOX_EXPORT intptr_t SIGSYSSchedHandler(const arch_seccomp_data& args,
|
||||
void* aux);
|
||||
+// If the fstatat syscall is actually a disguised fstat, calls the regular fstat
|
||||
+// syscall, otherwise, crashes in the same way as CrashSIGSYS_Handler.
|
||||
+SANDBOX_EXPORT intptr_t SIGSYSFstatatHandler(const struct arch_seccomp_data& args,
|
||||
+ void* aux);
|
||||
|
||||
// Variants of the above functions for use with bpf_dsl.
|
||||
SANDBOX_EXPORT bpf_dsl::ResultExpr CrashSIGSYS();
|
||||
@@ -72,6 +76,7 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr Crash
|
||||
SANDBOX_EXPORT bpf_dsl::ResultExpr CrashSIGSYSFutex();
|
||||
SANDBOX_EXPORT bpf_dsl::ResultExpr CrashSIGSYSPtrace();
|
||||
SANDBOX_EXPORT bpf_dsl::ResultExpr RewriteSchedSIGSYS();
|
||||
+SANDBOX_EXPORT bpf_dsl::ResultExpr RewriteFstatatSIGSYS();
|
||||
|
||||
// Allocates a crash key so that Seccomp information can be recorded.
|
||||
void AllocateCrashKeys();
|
||||
diff -up b/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc b/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc
|
||||
--- a/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc
|
||||
+++ b/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc
|
||||
@@ -261,4 +261,13 @@ int sys_sigaction(int signum,
|
||||
|
||||
#endif // defined(MEMORY_SANITIZER)
|
||||
|
||||
+SANDBOX_EXPORT int sys_fstat64(int fd, struct stat64 *buf)
|
||||
+{
|
||||
+#if defined(__NR_fstat64)
|
||||
+ return syscall(__NR_fstat64, fd, buf);
|
||||
+#else
|
||||
+ return syscall(__NR_fstat, fd, buf);
|
||||
+#endif
|
||||
+}
|
||||
+
|
||||
} // namespace sandbox
|
||||
diff -up b/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.h b/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.h
|
||||
--- a/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.h
|
||||
+++ b/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.h
|
||||
@@ -17,6 +17,7 @@ struct sock_fprog;
|
||||
struct rlimit64;
|
||||
struct cap_hdr;
|
||||
struct cap_data;
|
||||
+struct stat64;
|
||||
|
||||
namespace sandbox {
|
||||
|
||||
@@ -84,6 +85,9 @@ SANDBOX_EXPORT int sys_sigaction(int sig
|
||||
const struct sigaction* act,
|
||||
struct sigaction* oldact);
|
||||
|
||||
+// Recent glibc rewrites fstat to fstatat.
|
||||
+SANDBOX_EXPORT int sys_fstat64(int fd, struct stat64 *buf);
|
||||
+
|
||||
} // namespace sandbox
|
||||
|
||||
#endif // SANDBOX_LINUX_SERVICES_SYSCALL_WRAPPERS_H_
|
||||
@@ -1,10 +0,0 @@
|
||||
--- a/src/buildtools/gn.pro
|
||||
+++ b/src/buildtools/gn.pro
|
||||
@@ -25,6 +25,7 @@
|
||||
msvc:!clang_cl: gn_gen_args += --use-lto
|
||||
|
||||
gn_configure = $$system_quote($$gn_bootstrap) $$gn_gen_args
|
||||
+ gn_configure += --no-static-libstdc++
|
||||
macos {
|
||||
gn_configure += --isysroot \"$$QMAKE_MAC_SDK_PATH\"
|
||||
}
|
||||
@@ -1,74 +0,0 @@
|
||||
diff --git a/src/3rdparty/chromium/third_party/angle/src/libANGLE/HandleAllocator.cpp b/src/3rdparty/chromium/third_party/angle/src/libANGLE/HandleAllocator.cpp
|
||||
index 013f1dfb2..3ce63c192 100644
|
||||
--- a/src/3rdparty/chromium/third_party/angle/src/libANGLE/HandleAllocator.cpp
|
||||
+++ b/src/3rdparty/chromium/third_party/angle/src/libANGLE/HandleAllocator.cpp
|
||||
@@ -9,6 +9,7 @@
|
||||
|
||||
#include "libANGLE/HandleAllocator.h"
|
||||
|
||||
+#include <limits>
|
||||
#include <algorithm>
|
||||
#include <functional>
|
||||
|
||||
diff --git a/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_atk_hyperlink.cc b/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_atk_hyperlink.cc
|
||||
index be91def6b..73f202356 100644
|
||||
--- a/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_atk_hyperlink.cc
|
||||
+++ b/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_atk_hyperlink.cc
|
||||
@@ -245,7 +245,7 @@ static void AXPlatformAtkHyperlinkInit(AXPlatformAtkHyperlink* self, gpointer) {
|
||||
}
|
||||
|
||||
GType ax_platform_atk_hyperlink_get_type() {
|
||||
- static volatile gsize type_volatile = 0;
|
||||
+ static gsize type_volatile = 0;
|
||||
|
||||
AXPlatformNodeAuraLinux::EnsureGTypeInit();
|
||||
|
||||
diff --git a/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_node_auralinux.cc b/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_node_auralinux.cc
|
||||
index 04125c6fd..6c64e5d8e 100644
|
||||
--- a/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_node_auralinux.cc
|
||||
+++ b/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_node_auralinux.cc
|
||||
@@ -2274,7 +2274,7 @@ void ClassInit(gpointer class_pointer, gpointer /* class_data */) {
|
||||
GType GetType() {
|
||||
AXPlatformNodeAuraLinux::EnsureGTypeInit();
|
||||
|
||||
- static volatile gsize type_volatile = 0;
|
||||
+ static gsize type_volatile = 0;
|
||||
if (g_once_init_enter(&type_volatile)) {
|
||||
static const GTypeInfo type_info = {
|
||||
sizeof(AXPlatformNodeAuraLinuxClass), // class_size
|
||||
diff --git a/src/3rdparty/chromium/ui/gtk/gtk_key_bindings_handler.cc b/src/3rdparty/chromium/ui/gtk/gtk_key_bindings_handler.cc
|
||||
index c663a2074..38a342484 100644
|
||||
--- a/src/3rdparty/chromium/ui/gtk/gtk_key_bindings_handler.cc
|
||||
+++ b/src/3rdparty/chromium/ui/gtk/gtk_key_bindings_handler.cc
|
||||
@@ -141,7 +141,7 @@ void GtkKeyBindingsHandler::HandlerClassInit(HandlerClass* klass) {
|
||||
}
|
||||
|
||||
GType GtkKeyBindingsHandler::HandlerGetType() {
|
||||
- static volatile gsize type_id_volatile = 0;
|
||||
+ static gsize type_id_volatile = 0;
|
||||
if (g_once_init_enter(&type_id_volatile)) {
|
||||
GType type_id = g_type_register_static_simple(
|
||||
GTK_TYPE_TEXT_VIEW, g_intern_static_string("GtkKeyBindingsHandler"),
|
||||
--- a/src/3rdparty/chromium/components/bookmarks/browser/bookmark_expanded_state_tracker.cc
|
||||
+++ b/src/3rdparty/chromium/components/bookmarks/browser/bookmark_expanded_state_tracker.cc
|
||||
@@ -2,6 +2,7 @@
|
||||
// Use of this source code is governed by a BSD-style license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
+#include <cstddef>
|
||||
#include "components/bookmarks/browser/bookmark_expanded_state_tracker.h"
|
||||
|
||||
#include <stdint.h>
|
||||
diff --git a/src/3rdparty/chromium/components/bookmarks/browser/base_bookmark_model_observer.cc b/src/3rdparty/chromium/components/bookmarks/browser/base_bookmark_model_observer.cc
|
||||
index 657a3c96b..ad641a082 100644
|
||||
--- a/src/3rdparty/chromium/components/bookmarks/browser/base_bookmark_model_observer.cc
|
||||
+++ b/src/3rdparty/chromium/components/bookmarks/browser/base_bookmark_model_observer.cc
|
||||
@@ -2,6 +2,8 @@
|
||||
// Use of this source code is governed by a BSD-style license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
+#include <cstddef>
|
||||
+
|
||||
#include "components/bookmarks/browser/base_bookmark_model_observer.h"
|
||||
|
||||
namespace bookmarks {
|
||||
@@ -1,32 +0,0 @@
|
||||
https://src.fedoraproject.org/rpms/qt5-qtwebengine/raw/rawhide/f/qtwebengine-harfbuzz.patch
|
||||
--- a/src/3rdparty/chromium/components/paint_preview/common/subset_font.cc
|
||||
+++ b/src/3rdparty/chromium/components/paint_preview/common/subset_font.cc
|
||||
@@ -71,9 +71,9 @@ sk_sp<SkData> SubsetFont(SkTypeface* typeface, const GlyphUsage& usage) {
|
||||
hb_set_t* glyphs =
|
||||
hb_subset_input_glyph_set(input.get()); // Owned by |input|.
|
||||
usage.ForEach(base::BindRepeating(&AddGlyphs, base::Unretained(glyphs)));
|
||||
- hb_subset_input_set_retain_gids(input.get(), true);
|
||||
+ hb_subset_input_set_flags(input.get(), HB_SUBSET_FLAGS_RETAIN_GIDS);
|
||||
|
||||
- HbScoped<hb_face_t> subset_face(hb_subset(face.get(), input.get()));
|
||||
+ HbScoped<hb_face_t> subset_face(hb_subset_or_fail(face.get(), input.get()));
|
||||
HbScoped<hb_blob_t> subset_blob(hb_face_reference_blob(subset_face.get()));
|
||||
if (!subset_blob)
|
||||
return nullptr;
|
||||
--- a/src/3rdparty/chromium/third_party/skia/src/pdf/SkPDFSubsetFont.cpp
|
||||
+++ b/src/3rdparty/chromium/third_party/skia/src/pdf/SkPDFSubsetFont.cpp
|
||||
@@ -71,11 +71,10 @@ static sk_sp<SkData> subset_harfbuzz(sk_sp<SkData> fontData,
|
||||
hb_set_t* glyphs = hb_subset_input_glyph_set(input.get());
|
||||
glyphUsage.getSetValues([&glyphs](unsigned gid) { hb_set_add(glyphs, gid);});
|
||||
|
||||
- hb_subset_input_set_retain_gids(input.get(), true);
|
||||
// TODO: When possible, check if a font is 'tricky' with FT_IS_TRICKY.
|
||||
// If it isn't known if a font is 'tricky', retain the hints.
|
||||
- hb_subset_input_set_drop_hints(input.get(), false);
|
||||
- HBFace subset(hb_subset(face.get(), input.get()));
|
||||
+ hb_subset_input_set_flags(input.get(), HB_SUBSET_FLAGS_RETAIN_GIDS | HB_SUBSET_FLAGS_NO_HINTING);
|
||||
+ HBFace subset(hb_subset_or_fail(face.get(), input.get()));
|
||||
HBBlob result(hb_face_reference_blob(subset.get()));
|
||||
return to_data(std::move(result));
|
||||
}
|
||||
|
||||
@@ -1,237 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
inherit estack flag-o-matic multiprocessing python-any-r1 qt5-build
|
||||
|
||||
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
|
||||
HOMEPAGE="https://www.qt.io/"
|
||||
|
||||
if [[ ${QT5_BUILD_TYPE} == release ]]; then
|
||||
KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
|
||||
if [[ ${PV} == ${QT5_PV}_p* ]]; then
|
||||
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
|
||||
S="${WORKDIR}/${P}"
|
||||
QT5_BUILD_DIR="${S}_build"
|
||||
fi
|
||||
else
|
||||
EGIT_BRANCH="5.15"
|
||||
EGIT_REPO_URI=(
|
||||
"https://code.qt.io/qt/${QT5_MODULE}.git"
|
||||
"https://github.com/qt/${QT5_MODULE}.git"
|
||||
)
|
||||
inherit git-r3
|
||||
fi
|
||||
|
||||
# patchset based on https://github.com/chromium-ppc64le releases
|
||||
SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-chromium87-ppc64le.tar.xz )"
|
||||
|
||||
IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets"
|
||||
REQUIRED_USE="designer? ( widgets )"
|
||||
|
||||
RDEPEND="
|
||||
app-arch/snappy:=
|
||||
dev-libs/glib:2
|
||||
dev-libs/nspr
|
||||
dev-libs/nss
|
||||
dev-libs/expat
|
||||
dev-libs/libevent:=
|
||||
dev-libs/libxml2[icu]
|
||||
dev-libs/libxslt
|
||||
dev-libs/re2:=
|
||||
=dev-qt/qtcore-${QT5_PV}*
|
||||
=dev-qt/qtdeclarative-${QT5_PV}*
|
||||
=dev-qt/qtgui-${QT5_PV}*
|
||||
=dev-qt/qtnetwork-${QT5_PV}*
|
||||
=dev-qt/qtprintsupport-${QT5_PV}*
|
||||
=dev-qt/qtwebchannel-${QT5_PV}*[qml]
|
||||
media-libs/fontconfig
|
||||
media-libs/freetype
|
||||
media-libs/harfbuzz:=
|
||||
media-libs/lcms:2
|
||||
media-libs/libjpeg-turbo:=
|
||||
media-libs/libpng:0=
|
||||
>=media-libs/libvpx-1.5:=[svc(+)]
|
||||
media-libs/libwebp:=
|
||||
media-libs/mesa[egl,X(+)]
|
||||
media-libs/opus
|
||||
sys-apps/dbus
|
||||
sys-apps/pciutils
|
||||
sys-libs/zlib[minizip]
|
||||
virtual/libudev
|
||||
x11-libs/libdrm
|
||||
x11-libs/libX11
|
||||
x11-libs/libXcomposite
|
||||
x11-libs/libXcursor
|
||||
x11-libs/libXdamage
|
||||
x11-libs/libXext
|
||||
x11-libs/libXfixes
|
||||
x11-libs/libXi
|
||||
x11-libs/libxkbfile
|
||||
x11-libs/libXrandr
|
||||
x11-libs/libXrender
|
||||
x11-libs/libXScrnSaver
|
||||
x11-libs/libXtst
|
||||
alsa? ( media-libs/alsa-lib )
|
||||
designer? ( =dev-qt/designer-${QT5_PV}* )
|
||||
geolocation? ( =dev-qt/qtpositioning-${QT5_PV}* )
|
||||
kerberos? ( virtual/krb5 )
|
||||
pulseaudio? ( media-sound/pulseaudio:= )
|
||||
system-ffmpeg? ( media-video/ffmpeg:0= )
|
||||
system-icu? ( >=dev-libs/icu-69.1:= )
|
||||
widgets? (
|
||||
=dev-qt/qtdeclarative-${QT5_PV}*[widgets]
|
||||
=dev-qt/qtwidgets-${QT5_PV}*
|
||||
)
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="${PYTHON_DEPS}
|
||||
dev-util/gperf
|
||||
dev-util/ninja
|
||||
dev-util/re2c
|
||||
net-libs/nodejs[ssl]
|
||||
sys-devel/bison
|
||||
sys-devel/flex
|
||||
ppc64? ( >=dev-util/gn-0.1807 )
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-5.15.2-disable-fatal-warnings.patch" # downstream, bug 695446
|
||||
"${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_p20210406-glibc-2.33.patch" # by Fedora, bug 769989
|
||||
"${FILESDIR}/${PN}-5.15.2_p20210521-gcc11.patch" # by Fedora, bug 768261
|
||||
"${FILESDIR}/${PN}-5.15.2_p20210824-abseil-cpp-glibc-2.34.patch" # bug 811312
|
||||
"${FILESDIR}/${PN}-5.15.2_p20210824-breakpad-glibc-2.34.patch" # bug 811312
|
||||
)
|
||||
|
||||
pkg_preinst() {
|
||||
elog "This version of Qt WebEngine is based on Chromium version 87.0.4280, with"
|
||||
elog "additional security fixes from newer versions. Extensive as it is, the"
|
||||
elog "list of backports is impossible to evaluate, but always bound to be behind"
|
||||
elog "Chromium's release schedule."
|
||||
elog "In addition, various online services may deny service based on an outdated"
|
||||
elog "user agent version (and/or other checks). Google is already known to do so."
|
||||
elog
|
||||
elog "tldr: Your web browsing experience will be compromised."
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
# bug 307861
|
||||
eshopts_push -s extglob
|
||||
if is-flagq '-g?(gdb)?([1-9])'; then
|
||||
ewarn
|
||||
ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
|
||||
ewarn "You may experience really long compilation times and/or increased memory usage."
|
||||
ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
|
||||
ewarn
|
||||
fi
|
||||
eshopts_pop
|
||||
|
||||
case ${QT5_BUILD_TYPE} in
|
||||
live) git-r3_src_unpack ;&
|
||||
release) default ;;
|
||||
esac
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
if [[ ${PV} == ${QT5_PV}_p* ]]; then
|
||||
# This is made from git, and for some reason will fail w/o .git directories.
|
||||
mkdir -p .git src/3rdparty/chromium/.git || die
|
||||
fi
|
||||
# We need to make sure this integrates well into Qt 5.15.2 installation.
|
||||
# Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it.
|
||||
sed -e "/^MODULE_VERSION/s/5\.15\.[3456789]/${QT5_PV}/" -i .qmake.conf || die
|
||||
|
||||
# QTBUG-88657 - jumbo-build could still make trouble
|
||||
if ! use jumbo-build; then
|
||||
sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
|
||||
src/buildtools/config/common.pri || die
|
||||
fi
|
||||
|
||||
# bug 620444 - ensure local headers are used
|
||||
find "${S}" -type f -name "*.pr[fio]" | \
|
||||
xargs sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' || die
|
||||
|
||||
if use system-icu; then
|
||||
# Sanity check to ensure that bundled copy of ICU is not used.
|
||||
# Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because
|
||||
# src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system.
|
||||
# If usage of headers of bundled copy of ICU occurs, then lists of shim headers in
|
||||
# shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in
|
||||
# src/3rdparty/chromium/third_party/icu/BUILD.gn should be updated.
|
||||
local file
|
||||
while read file; do
|
||||
echo "#error This file should not be used!" > "${file}" || die
|
||||
done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null)
|
||||
fi
|
||||
|
||||
if has_version ">=media-libs/harfbuzz-3.0.0-r1"; then
|
||||
# We can get away with conditionally applying this with has_version
|
||||
# because we have a := dep on harfbuzz and the subslot changed
|
||||
# at 3.0.0.
|
||||
eapply "${FILESDIR}/qtwebengine-5.15.2_p20210824-harfbuzz-3.0.0.patch"
|
||||
fi
|
||||
|
||||
# src/3rdparty/gn fails with libc++ due to passing of `-static-libstdc++`
|
||||
if tc-is-clang && has_version 'sys-devel/clang[default-libcxx]'; then
|
||||
eapply "${FILESDIR}/${PN}-5.15.2_p20210521-clang-libc++.patch"
|
||||
fi
|
||||
|
||||
qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri
|
||||
qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/config/linux.pri
|
||||
|
||||
qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
|
||||
|
||||
qt_use_disable_mod widgets widgets src/src.pro
|
||||
|
||||
qt5-build_src_prepare
|
||||
|
||||
# we need to generate ppc64 stuff because upstream does not ship it yet
|
||||
if use ppc64; then
|
||||
einfo "Patching for ppc64le and generating build files"
|
||||
eapply "${FILESDIR}/qtwebengine-5.15.2-enable-ppc64.patch"
|
||||
pushd src/3rdparty/chromium > /dev/null || die
|
||||
eapply -p0 "${WORKDIR}/${PN}-ppc64le"
|
||||
popd > /dev/null || die
|
||||
pushd src/3rdparty/chromium/third_party/libvpx > /dev/null || die
|
||||
mkdir -vp source/config/linux/ppc64 || die
|
||||
mkdir -p source/libvpx/test || die
|
||||
touch source/libvpx/test/test.mk || die
|
||||
./generate_gni.sh || die
|
||||
popd >/dev/null || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
export NINJA_PATH=/usr/bin/ninja
|
||||
export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
|
||||
|
||||
local myqmakeargs=(
|
||||
--
|
||||
-no-build-qtpdf
|
||||
-printing-and-pdf
|
||||
-system-opus
|
||||
-system-webp
|
||||
$(qt_use alsa)
|
||||
$(qt_use !bindist proprietary-codecs)
|
||||
$(qt_use geolocation webengine-geolocation)
|
||||
$(qt_use kerberos webengine-kerberos)
|
||||
$(qt_use pulseaudio)
|
||||
$(usex system-ffmpeg -system-ffmpeg -qt-ffmpeg)
|
||||
$(qt_use system-icu webengine-icu)
|
||||
)
|
||||
qt5-build_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
qt5-build_src_install
|
||||
|
||||
# bug 601472
|
||||
if [[ ! -f ${D}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
|
||||
die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
|
||||
fi
|
||||
}
|
||||
Reference in New Issue
Block a user