From 51af5f0eb4cddbe6aa7953717873691d77aae9ff Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 10 Jul 2019 23:40:16 +0100 Subject: gentoo resync : 11.07.2019 --- dev-qt/qtwebengine/Manifest | 5 + .../qtwebengine-5.12.4-bump-V8-patchlevel.patch | 29 +++++ ...twebengine-5.12.4-fix-arm-32bit-segfaults.patch | 30 +++++ ...ix-should_override_user_agent_in_new_tabs.patch | 33 +++++ dev-qt/qtwebengine/qtwebengine-5.12.4.ebuild | 136 +++++++++++++++++++++ 5 files changed, 233 insertions(+) create mode 100644 dev-qt/qtwebengine/files/qtwebengine-5.12.4-bump-V8-patchlevel.patch create mode 100644 dev-qt/qtwebengine/files/qtwebengine-5.12.4-fix-arm-32bit-segfaults.patch create mode 100644 dev-qt/qtwebengine/files/qtwebengine-5.12.4-fix-should_override_user_agent_in_new_tabs.patch create mode 100644 dev-qt/qtwebengine/qtwebengine-5.12.4.ebuild (limited to 'dev-qt/qtwebengine') diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest index fa57a939d5f8..6a0667745961 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -1,5 +1,10 @@ AUX qtwebengine-5.11.2-paxmark-mksnapshot.patch 888 BLAKE2B d44e8772dafd8962805abe412470d94ced2d11e47d3e7e25acbfafa54669677a1e072b435a06ed093f7c9ce27d8d98fab4b042cd49862350d77c944418a335b9 SHA512 893aef4801d1f2a3fad1f4d1ef2c2b122d4004b7966e76d8e1adeb8cc5b03ce8b0ddf30d20690ca6e0b15b76074aa386b46b00d0c828b7684c6fcacc33b2865f AUX qtwebengine-5.12.0-nouveau-disable-gpu.patch 3740 BLAKE2B fc2745ba0e3ac264d2f59ede3628f6d4d94db8f175c4cf68444e5dabb5fd0266957c804da7e0e761d8f39ddbe2781ae023aef8db1a907907e7db116b48a8cd11 SHA512 fe407c7907e6e9dd09be6e53f4c560ab453e5081fbbac4392b29fdb32cfccd1157e6a9ed2c7839b1aeda2088309e124b7130963175472a660ea46807299e8d9a +AUX qtwebengine-5.12.4-bump-V8-patchlevel.patch 1003 BLAKE2B 44dd0aaa31a51f62d164b436f1938dd49cc1e82628410b4091c9e58ecdb64be2e74fd6850fcaf9728e62c1a3b583080780d5301ef54ad4b5f839d8f9c77580a1 SHA512 e0a1154124135dbffe2f8872d797f602e0817a35bbaec60850fb4f5ab2aecd8a5f47e2df1bc34ce3057b0ba5131882ce6b3347f6f6ab74bd59cb3bcc4d334127 +AUX qtwebengine-5.12.4-fix-arm-32bit-segfaults.patch 1355 BLAKE2B 2778cba49d0d942ea09b65936a24de7b49392b9f477b018934984896dfe8f5d40beebc58648e6f0304bf43ba9762f125f2178b1351ef45abe502a24784930a5b SHA512 6eeade86772715f58771f7c6114b67d79b8696ddb84ce180ee5b4c5619488372eeab6d5b6b3104c79505a13c39143205dac9537ca7ef97ed7d91fa2d1a648ff0 +AUX qtwebengine-5.12.4-fix-should_override_user_agent_in_new_tabs.patch 1429 BLAKE2B 8156e6ea24b87994343be6b1a4488f4ebc1c336c4546c677f05c4cd93e908b1f066a84e0e735ecddf28596b9793138d1d2d5802ee022860e1e5f979783c87502 SHA512 cbec12f2e557a3fcf9c3f1fb93a44ea26a5a18dc5e919eafa62947acddbf1ebb0cef9a2c957ec1ac3ae47bb13abc60cccfbbe710af34f8a703ee5e035e0ba196 DIST qtwebengine-everywhere-src-5.12.3.tar.xz 249275648 BLAKE2B 7d2404084a510c62b638dd09736130eeb40e494f9594339afc7df6628878aafed778a2785f6848702d51b3a4ef1dc8b333d5e5eeeeb8f930b4da839eb70bc175 SHA512 5b500ec6653aa6ed70e7826fe394f95c7932eaea5b1b48f6342a6f18294f75e4f954959fa2f42de0685097679389245d2bc80454e8eea202fa18a326d6d5a9a5 +DIST qtwebengine-everywhere-src-5.12.4.tar.xz 249328292 BLAKE2B e76d4f0c7081bd4ccbfb8a7eba6e0ef8280b4558bf545eb76bcf87ca03c79912e9e095f7bbdb30693f6ffc2dee61db7a4308cc072d92d78773082b3df238d0b2 SHA512 312c584222ed5e7183af2be8a4f42b84c7fed18c3d4b080bc32bed1bd5c7dc88c9752deaf7afc1b4d9fcd02c8c8a013d32d5be2e7635fec2c085cdbe81998de8 EBUILD qtwebengine-5.12.3.ebuild 3537 BLAKE2B 9f67577d90599893da90e7a7929c6f2c92f519e5245343a40d7371c4de2f106e4e8ca240b76046cd0f188b3d4bc8ecbe3c37b620275b4160d78a273e101f1640 SHA512 998e860b7000ddc81ef1a77c38a1c73fc13d133eab40a2b6fb7403aad55c51bfd2890324848f8abdab8e2dd8c47816472319e1b87f4d722ad93a1ef1391c7b51 +EBUILD qtwebengine-5.12.4.ebuild 3496 BLAKE2B 24c54e53972f28524324d4b9da1cfdabc59a71e819990fbb15f0ac6354360adac995c39f66b09bba468003c2182362662f17059b418dde2229796f22345749d2 SHA512 944db18087d48f876e0d1344faa8cb0f0b19fdd5215445a4fd039dc014bc475593a85af2fb859f815e61e58faaf9046a521f0de677ac13c06f530ef0b4d54bba MISC metadata.xml 1178 BLAKE2B 3c9dc86e76a316c93c637b10d9939e95e86bda9bbf3d349575594ab68457b72bc72b9c92ab5650dae9e15cf7726ad904b478b6888744f4cac2382d5f9a9943cd SHA512 20bfcdd36c2f2a6fc95f402bfb6a79982b9fd5e16b659395fef3e41cf475ab76493a93cfa30fca505b0d31c0d2b2d4ef9a297ef8d64fe4d50617b74a7b81c707 diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.12.4-bump-V8-patchlevel.patch b/dev-qt/qtwebengine/files/qtwebengine-5.12.4-bump-V8-patchlevel.patch new file mode 100644 index 000000000000..90bcfc3027f4 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.12.4-bump-V8-patchlevel.patch @@ -0,0 +1,29 @@ +From 6f3c15d2319ca11c2e31076292f5733baf64d991 Mon Sep 17 00:00:00 2001 +From: Allan Sandfeld Jensen +Date: Tue, 18 Jun 2019 10:29:48 +0200 +Subject: [PATCH 2/3] Bump V8 patch level + +Otherwise it might use outdated script caches. + +Change-Id: I839c6a11c3e1991f232972ad2d87fe6318256307 +Fixes: QTBUG-72532 +Reviewed-by: Michal Klocek +--- + src/3rdparty/chromium/v8/include/v8-version.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/3rdparty/chromium/v8/include/v8-version.h b/src/3rdparty/chromium/v8/include/v8-version.h +index 3e703039517..8dacc30c340 100644 +--- a/src/3rdparty/chromium/v8/include/v8-version.h ++++ b/src/3rdparty/chromium/v8/include/v8-version.h +@@ -11,7 +11,7 @@ + #define V8_MAJOR_VERSION 6 + #define V8_MINOR_VERSION 9 + #define V8_BUILD_NUMBER 427 +-#define V8_PATCH_LEVEL 31 ++#define V8_PATCH_LEVEL 32 + + // Use 1 for candidates and 0 otherwise. + // (Boolean macro values are not supported by all preprocessors.) +-- +2.21.0 diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.12.4-fix-arm-32bit-segfaults.patch b/dev-qt/qtwebengine/files/qtwebengine-5.12.4-fix-arm-32bit-segfaults.patch new file mode 100644 index 000000000000..11b637422694 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.12.4-fix-arm-32bit-segfaults.patch @@ -0,0 +1,30 @@ +From 2323dc924a3b107647f9e5f0bdbcfc44b9713195 Mon Sep 17 00:00:00 2001 +From: Michal Klocek +Date: Thu, 20 Jun 2019 09:09:53 +0200 +Subject: [PATCH 3/3] Fix segfaults with arm 32bit on metrics + +Gcc 6 seems to misscompile pair's template constructor +in std::map emplace, use converting move constructor instead. + +Fixes: QTBUG-75097 +Change-Id: Ia50dc9eadb58f713432c0228a4a5aed73b275f32 +Reviewed-by: Allan Sandfeld Jensen +--- + src/3rdparty/chromium/services/metrics/public/cpp/ukm_entry_builder_base.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/3rdparty/chromium/services/metrics/public/cpp/ukm_entry_builder_base.cc b/src/3rdparty/chromium/services/metrics/public/cpp/ukm_entry_builder_base.cc +index 6685a5816db..5c5380e007e 100644 +--- a/src/3rdparty/chromium/services/metrics/public/cpp/ukm_entry_builder_base.cc ++++ b/src/3rdparty/chromium/services/metrics/public/cpp/ukm_entry_builder_base.cc +@@ -23,7 +23,7 @@ UkmEntryBuilderBase::~UkmEntryBuilderBase() = default; + + void UkmEntryBuilderBase::SetMetricInternal(uint64_t metric_hash, + int64_t value) { +- entry_->metrics.emplace(metric_hash, value); ++ entry_->metrics.emplace(std::make_pair(metric_hash, value)); + } + + void UkmEntryBuilderBase::Record(UkmRecorder* recorder) { +-- +2.21.0 diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.12.4-fix-should_override_user_agent_in_new_tabs.patch b/dev-qt/qtwebengine/files/qtwebengine-5.12.4-fix-should_override_user_agent_in_new_tabs.patch new file mode 100644 index 000000000000..4e3ef674c32d --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.12.4-fix-should_override_user_agent_in_new_tabs.patch @@ -0,0 +1,33 @@ +From e8eec84aac0dc626770a483d503f7b16ab0dbe70 Mon Sep 17 00:00:00 2001 +From: Allan Sandfeld Jensen +Date: Fri, 7 Jun 2019 14:18:23 +0200 +Subject: [PATCH 1/3] Fix changing should_override_user_agent_in_new_tabs_ + +It wouldn't be updated if the custom user-agent didn't change. + +Change-Id: Ic31ef485e2cb84903f9b48cb9ad5f9f1a723eb92 +Reviewed-by: Michal Klocek +--- + src/3rdparty/chromium/content/browser/web_contents/web_contents_impl.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/3rdparty/chromium/content/browser/web_contents/web_contents_impl.cc b/src/3rdparty/chromium/content/browser/web_contents/web_contents_impl.cc +index a2659263737..4c127f835d6 100644 +--- a/src/3rdparty/chromium/content/browser/web_contents/web_contents_impl.cc ++++ b/src/3rdparty/chromium/content/browser/web_contents/web_contents_impl.cc +@@ -1230,11 +1230,11 @@ WebUI* WebContentsImpl::GetCommittedWebUI() const { + + void WebContentsImpl::SetUserAgentOverride(const std::string& override, + bool override_in_new_tabs) { ++ should_override_user_agent_in_new_tabs_ = override_in_new_tabs; ++ + if (GetUserAgentOverride() == override) + return; + +- should_override_user_agent_in_new_tabs_ = override_in_new_tabs; +- + renderer_preferences_.user_agent_override = override; + + // Send the new override string to the renderer. +-- +2.21.0 diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.4.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.4.ebuild new file mode 100644 index 000000000000..1739c23e3a2d --- /dev/null +++ b/dev-qt/qtwebengine/qtwebengine-5.12.4.ebuild @@ -0,0 +1,136 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python2_7 ) +inherit multiprocessing pax-utils python-any-r1 qt5-build + +DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications" + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi + +IUSE="alsa bindist designer jumbo-build pax_kernel 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-qt/qtcore-${PV} + ~dev-qt/qtdeclarative-${PV} + ~dev-qt/qtgui-${PV} + ~dev-qt/qtnetwork-${PV} + ~dev-qt/qtpositioning-${PV} + ~dev-qt/qtprintsupport-${PV} + ~dev-qt/qtwebchannel-${PV}[qml] + dev-libs/expat + dev-libs/libevent:= + dev-libs/libxml2[icu] + dev-libs/libxslt + dev-libs/re2:= + 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] + 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/libXrandr + x11-libs/libXrender + x11-libs/libXScrnSaver + x11-libs/libXtst + alsa? ( media-libs/alsa-lib ) + designer? ( ~dev-qt/designer-${PV} ) + pulseaudio? ( media-sound/pulseaudio:= ) + system-ffmpeg? ( media-video/ffmpeg:0= ) + system-icu? ( >=dev-libs/icu-60.2:= ) + widgets? ( + ~dev-qt/qtdeclarative-${PV}[widgets] + ~dev-qt/qtwidgets-${PV} + ) +" +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + >=app-arch/gzip-1.7 + dev-util/gperf + dev-util/ninja + dev-util/re2c + sys-devel/bison + pax_kernel? ( sys-apps/elfix ) +" + +PATCHES+=( + "${FILESDIR}/${PN}-5.12.0-nouveau-disable-gpu.patch" # bug 609752 + "${FILESDIR}/${P}-fix-should_override_user_agent_in_new_tabs.patch" + "${FILESDIR}/${P}-bump-V8-patchlevel.patch" # QTBUG-72532 + "${FILESDIR}/${P}-fix-arm-32bit-segfaults.patch" # QTBUG-75097 +) + +src_prepare() { + use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" ) + + if ! use jumbo-build; then + sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \ + src/core/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/include |' || die + + qt_use_disable_config alsa webengine-alsa src/core/config/linux.pri + qt_use_disable_config pulseaudio webengine-pulseaudio src/core/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 +} + +src_configure() { + export NINJA_PATH=/usr/bin/ninja + export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}" + + local myqmakeargs=( + -- + -opus + -printing-and-pdf + -webp + $(usex alsa '-alsa' '') + $(usex bindist '' '-proprietary-codecs') + $(usex pulseaudio '-pulseaudio' '') + $(usex system-ffmpeg '-ffmpeg' '') + $(usex 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 + + pax-mark m "${D}${QT5_LIBEXECDIR}"/QtWebEngineProcess +} -- cgit v1.2.3