commit: eb95b42220ff63338858a7fc86624b8141f910bc Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> AuthorDate: Tue Oct 29 23:50:42 2019 +0000 Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> CommitDate: Tue Oct 29 23:52:27 2019 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=eb95b422
dev-qt/qtwebengine: update crash reporting patch Replace 'no-kcrash-reporting' patch with an upstream fix, and drop it from where it's no longer needed. https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?h=73-based&id=ccfc032f Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org> .../qtwebengine-5.13.1-disable-crash-reports.patch | 29 ++++++++++++++++++++++ .../qtwebengine-5.13.1-no-kcrash-reporting.patch | 18 -------------- dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild | 4 +-- dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild | 5 ---- dev-qt/qtwebengine/qtwebengine-5.14.0_beta2.ebuild | 2 -- dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild | 5 ---- 6 files changed, 31 insertions(+), 32 deletions(-) diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.13.1-disable-crash-reports.patch b/dev-qt/qtwebengine/files/qtwebengine-5.13.1-disable-crash-reports.patch new file mode 100644 index 00000000..c0a5941b --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.13.1-disable-crash-reports.patch @@ -0,0 +1,29 @@ +From ccfc032fb57e98936ad9dd08ad5e75845b9e74b8 Mon Sep 17 00:00:00 2001 +From: Kirill Burtsev <[email protected]> +Date: Tue, 2 Jul 2019 17:17:18 +0200 +Subject: FIXUP: Disable crash-reports when reporting is disabled + +Fix compilation issue because of unknown macro and flag, +as enable_reporting feature is defined for net sub component. + +Change-Id: I451dc005fec66ddbf7a5c9de43eccfaafa2fe809 +Reviewed-by: Allan Sandfeld Jensen <[email protected]> +--- + chromium/content/public/common/content_features.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/chromium/content/public/common/content_features.cc b/chromium/content/public/common/content_features.cc +index e14b7733d9b..ff3f58dc1fc 100644 +--- a/src/3rdparty/chromium/content/public/common/content_features.cc ++++ b/src/3rdparty/chromium/content/public/common/content_features.cc +@@ -4,6 +4,7 @@ + + #include "content/public/common/content_features.h" + #include "build/build_config.h" ++#include "net/net_buildflags.h" + + namespace features { + +-- +cgit v1.2.1 + diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.13.1-no-kcrash-reporting.patch b/dev-qt/qtwebengine/files/qtwebengine-5.13.1-no-kcrash-reporting.patch deleted file mode 100644 index 6f66c262..00000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.13.1-no-kcrash-reporting.patch +++ /dev/null @@ -1,18 +0,0 @@ -Signed-off-by: Nicholas Meyer <[email protected]> - ---- a/src/3rdparty/chromium/content/public/common/content_features.cc 2019-10-10 22:59:16.733542336 -0700 -+++ b/src/3rdparty/chromium/content/public/common/content_features.cc 2019-10-10 22:59:03.675634565 -0700 -@@ -119,12 +119,7 @@ - // Enables crash reporting via Reporting API. - // https://www.w3.org/TR/reporting/#crash-report - const base::Feature kCrashReporting{"CrashReporting", --#if BUILDFLAG(ENABLE_REPORTING) -- base::FEATURE_ENABLED_BY_DEFAULT --#else -- base::FEATURE_DISABLED_BY_DEFAULT --#endif --}; -+ base::FEATURE_DISABLED_BY_DEFAULT}; - - // Enables specification of a target element in the fragment identifier - // via a CSS selector. diff --git a/dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild index 39f64d63..c606a80b 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild @@ -83,8 +83,8 @@ PATCHES+=( "${FILESDIR}/${P}-pulseaudio-13.patch" # bug 694960 # QTBUG-76963, 5.13 branch: "${FILESDIR}/${P}-webrtc-missing-header-w-linux-headers-5.2.patch" - # bug 693668, upstream(?) TODO: - "${FILESDIR}/${P}-no-kcrash-reporting.patch" + # bug 693668 + "${FILESDIR}/${P}-disable-crash-reports.patch" ) src_prepare() { diff --git a/dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild index f22df0e5..3ec1fb34 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild @@ -78,11 +78,6 @@ DEPEND="${RDEPEND} pax_kernel? ( sys-apps/elfix ) " -PATCHES+=( - # bug 693668, upstream(?) TODO: - "${FILESDIR}/${PN}-5.13.1-no-kcrash-reporting.patch" -) - src_prepare() { use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" ) diff --git a/dev-qt/qtwebengine/qtwebengine-5.14.0_beta2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.14.0_beta2.ebuild index 8ef8814c..7033c9fc 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.14.0_beta2.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.14.0_beta2.ebuild @@ -80,8 +80,6 @@ DEPEND="${RDEPEND} PATCHES+=( "${FILESDIR}/${P}-icu-65.patch" - # bug 693668, upstream(?) TODO: - "${FILESDIR}/${PN}-5.13.1-no-kcrash-reporting.patch" ) src_prepare() { diff --git a/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild index 35adda04..13940d0b 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild @@ -78,11 +78,6 @@ DEPEND="${RDEPEND} pax_kernel? ( sys-apps/elfix ) " -PATCHES+=( - # bug 693668, upstream(?) TODO: - "${FILESDIR}/${PN}-5.13.1-no-kcrash-reporting.patch" -) - src_prepare() { use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" )
