New commits:
commit a1a177a0ca8a6e7c00296757baf06c45674e27cc
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
qtwebengine - fixes for glib & gcc
diff --git a/qt5/qtwebengine/BUILD b/qt5/qtwebengine/BUILD
index e17c008..59f2780 100755
--- a/qt5/qtwebengine/BUILD
+++ b/qt5/qtwebengine/BUILD
@@ -1,9 +1,15 @@
-#CFLAGS="${CFLAGS/-ffast-math}" &&
-#CFLAGS='' &&
-# This was mistyped, and why should we remove our flags?
-#CXXFLAGS='' &&
+# this is a special build proc for qtwebengine, with additional parameters
+qt5_build() {
+# qmake uses its own flag settings
+ qmake QMAKE_CONFIG="$OPTS" QMAKE_CFLAGS="$CFLAGS"
QMAKE_CXXFLAGS="$CXXFLAGS"\
+ PREFIX=${1-$QT5DIR} LIBDIR=$QT5DIR/lib *.pro &&
+# -- -system-ffmpeg -webengine-icu &&
+ make
+}
+
OPTS+=" -shared" &&
if list_find "$CXXFLAGS" -Os; then
OPTS+=" -optimize-size"
fi &&
-default_build
+
+qt5_build
diff --git a/qt5/qtwebengine/HISTORY b/qt5/qtwebengine/HISTORY
index 53ab4b6..ae54a54 100644
--- a/qt5/qtwebengine/HISTORY
+++ b/qt5/qtwebengine/HISTORY
@@ -1,3 +1,9 @@
+2021-06-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD patches/*: added
+ apply patches from LFS for icu and glibc
+ upstream patch for perfecto - gcc-11
+ * BUILD: prepare to process webengine params
+
2021-01-18 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: delete qtxmlpatterns
diff --git a/qt5/qtwebengine/PRE_BUILD b/qt5/qtwebengine/PRE_BUILD
new file mode 100755
index 0000000..922c0ab
--- /dev/null
+++ b/qt5/qtwebengine/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+apply_patch_dir patches
diff --git a/qt5/qtwebengine/patches/perfecto.patch
b/qt5/qtwebengine/patches/perfecto.patch
new file mode 100644
index 0000000..c56b410
--- /dev/null
+++ b/qt5/qtwebengine/patches/perfecto.patch
@@ -0,0 +1,21 @@
+commit df07d0f0a2247c0448069fb00852b0cb1158d537
+Author: Peter Varga <pvarga AT inf.u-szeged.hu>
+Date: Fri May 7 15:20:12 2021 +0200
+
+ Fix perfetto build for GCC 11
+
+ Change-Id: I812059fb02597cad329907e026a7c8afe839d04c
+ Reviewed-by: Allan Sandfeld Jensen <allan.jensen AT qt.io>
+
+diff --git
a/chromium/third_party/perfetto/src/trace_processor/containers/string_pool.h
b/chromium/third_party/perfetto/src/trace_processor/containers/string_pool.h
+index 11ae91cfeca..558ff00e8fe 100644
+---
a/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/containers/string_pool.h
++++
b/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/containers/string_pool.h
+@@ -20,6 +20,7 @@
+ #include <stddef.h>
+ #include <stdint.h>
+
++#include <limits>
+ #include <unordered_map>
+ #include <vector>
+
diff --git
a/qt5/qtwebengine/patches/qtwebengine-everywhere-src-5.15.2-ICU68-2.patch
b/qt5/qtwebengine/patches/qtwebengine-everywhere-src-5.15.2-ICU68-2.patch
new file mode 100644
index 0000000..bf6bdbd
--- /dev/null
+++ b/qt5/qtwebengine/patches/qtwebengine-everywhere-src-5.15.2-ICU68-2.patch
@@ -0,0 +1,308 @@
+Submitted By: Marty Jack <martyj19 at comcast dot net>
+Date: 2020-11-02
+Initial Package Version: 5.15.1
+Upstream Status: Unknown
+Origin: self
+Description: Allows qtwebengine to build against system ICU_68.1 which has
+dropped the TRUE and FALSE macros.
+Comment by Ken: This code actually comes from chromium, but they only take
+bugs against their latest release, which I do not have. I have attempted
+to raise a bug at qt.
+
+Revised by Bruce Dubbs on 2020-11-20.
+Rebased and added new changes for 5.15.2
+
+Updated by Douglas R. Reno on 2020-12-09
+Rebased and added change to fix build in libxml2.
+
+diff -Naurp
qtwebengine-everywhere-src-5.15.2.orig/src/3rdparty/chromium/base/i18n/string_compare.cc
qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/components/spellcheck/renderer/spellcheck_worditerator.cc
+---
qtwebengine-everywhere-src-5.15.2.orig/src/3rdparty/chromium/components/spellcheck/renderer/spellcheck_worditerator.cc
2020-11-06 19:22:36.000000000 -0600
++++
qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/components/spellcheck/renderer/spellcheck_worditerator.cc
2020-12-08 19:31:49.348899469 -0600
+@@ -424,7 +424,7 @@ bool SpellcheckWordIterator::Normalize(s
+ // spellchecker and we need manual normalization as well. The normalized
+ // text does not have to be NUL-terminated since its characters are
copied to
+ // string16, which adds a NUL character when we need.
+- icu::UnicodeString input(FALSE, &text_[input_start],
++ icu::UnicodeString input(false, &text_[input_start],
+ base::checked_cast<int32_t>(input_length));
+ UErrorCode status = U_ZERO_ERROR;
+ icu::UnicodeString output;
+diff -Naurp
qtwebengine-everywhere-src-5.15.2.orig/src/3rdparty/chromium/components/url_formatter/spoof_checks/idn_spoof_checker.cc
qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/components/url_formatter/spoof_checks/idn_spoof_checker.cc
+---
qtwebengine-everywhere-src-5.15.2.orig/src/3rdparty/chromium/components/url_formatter/spoof_checks/idn_spoof_checker.cc
2020-11-06 19:22:36.000000000 -0600
++++
qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/components/url_formatter/spoof_checks/idn_spoof_checker.cc
2020-12-08 19:33:19.360898477 -0600
+@@ -347,7 +347,7 @@ bool IDNSpoofChecker::SafeToDisplayAsUni
+ if (U_FAILURE(status) || (result & USPOOF_ALL_CHECKS))
+ return false;
+
+- icu::UnicodeString label_string(FALSE /* isTerminated */, label.data(),
++ icu::UnicodeString label_string(false /* isTerminated */, label.data(),
+
base::checked_cast<int32_t>(label.size()));
+
+ // A punycode label with 'xn--' prefix is not subject to the URL
+@@ -677,7 +677,7 @@ bool IDNSpoofChecker::IsWholeScriptConfu
+ base::StringPiece tld,
+ base::StringPiece16 tld_unicode) {
+ icu::UnicodeString tld_string(
+- FALSE /* isTerminated */, tld_unicode.data(),
++ false /* isTerminated */, tld_unicode.data(),
+ base::checked_cast<int32_t>(tld_unicode.size()));
+ // Allow if the TLD contains any letter from the script, in which case
it's
+ // likely to be a TLD in that script.
+diff -Naurp
qtwebengine-everywhere-src-5.15.2.orig/src/3rdparty/chromium/components/url_formatter/spoof_checks/skeleton_generator.cc
qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/components/url_formatter/spoof_checks/skeleton_generator.cc
+---
qtwebengine-everywhere-src-5.15.2.orig/src/3rdparty/chromium/components/url_formatter/spoof_checks/skeleton_generator.cc
2020-11-06 19:22:36.000000000 -0600
++++
qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/components/url_formatter/spoof_checks/skeleton_generator.cc
2020-12-08 19:33:49.464898146 -0600
+@@ -117,7 +117,7 @@ SkeletonGenerator::~SkeletonGenerator()
+ Skeletons SkeletonGenerator::GetSkeletons(base::StringPiece16 hostname) {
+ Skeletons skeletons;
+ size_t hostname_length = hostname.length() - (hostname.back() == '.' ? 1
: 0);
+- icu::UnicodeString host(FALSE, hostname.data(), hostname_length);
++ icu::UnicodeString host(false, hostname.data(), hostname_length);
+ // If input has any characters outside Latin-Greek-Cyrillic and [0-9._-],
+ // there is no point in getting rid of diacritics because combining marks
+ // attached to non-LGC characters are already blocked.
+diff -Naurp
qtwebengine-everywhere-src-5.15.2.orig/src/3rdparty/chromium/services/service_manager/zygote/zygote_linux.cc