5 files changed, 63 insertions, 2 deletions
diff --git a/ports/qt5-webengine/CONTROL b/ports/qt5-webengine/CONTROL
index bfc1e1dbd..929a7ad64 100644
--- a/ports/qt5-webengine/CONTROL
+++ b/ports/qt5-webengine/CONTROL
@@ -1,5 +1,5 @@
 Source: qt5-webengine
-Version: 5.15.1
+Version: 5.15.2
 Port-Version: 1
 Description: Qt5 webengine Module; 
 Build-Depends:  qt5-base[core], qt5-declarative, qt5-location, qt5-quickcontrols, qt5-quickcontrols2, qt5-tools, qt5-webchannel, atlmfc (windows), ffmpeg[core] (!windows)
diff --git a/ports/qt5-webengine/build_1.patch b/ports/qt5-webengine/build_1.patch
new file mode 100644
index 000000000..dfa3ea721
--- /dev/null
+++ b/ports/qt5-webengine/build_1.patch
@@ -0,0 +1,12 @@
+diff --git a/src/3rdparty/chromium/third_party/angle/BUILD.gn b/src/3rdparty/chromium/third_party/angle/BUILD.gn
+index ad7675f4e..4a43479d9 100644
+--- a/src/3rdparty/chromium/third_party/angle/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/angle/BUILD.gn
+@@ -126,7 +126,6 @@ config("extra_warnings") {
+   # Enable more default warnings on Windows.
+   if (is_win) {
+     cflags += [
+-      "/we4244",  # Conversion: possible loss of data.
+       "/we4456",  # Variable shadowing.
+       "/we4458",  # declaration hides class member.
+       "/we4715",  # not all control paths return a value
diff --git a/ports/qt5-webengine/build_2.patch b/ports/qt5-webengine/build_2.patch
new file mode 100644
index 000000000..7a4622516
--- /dev/null
+++ b/ports/qt5-webengine/build_2.patch
@@ -0,0 +1,29 @@
+diff --git a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/circular_queue.h b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/circular_queue.h
+index 59dbfad04..134357395 100644
+--- a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/circular_queue.h
++++ b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/circular_queue.h
+@@ -74,7 +74,7 @@ class CircularQueue {
+       return queue_->Get(pos_);
+     }
+ 
+-    const T* operator->() const {
++    T* operator->() const {
+ #if PERFETTO_DCHECK_IS_ON()
+       PERFETTO_DCHECK(generation_ == queue_->generation());
+ #endif
+@@ -82,13 +82,13 @@ class CircularQueue {
+     }
+ 
+     T& operator*() { return *(operator->()); }
+-    const T& operator*() const { return *(operator->()); }
++    T& operator*() const { return *(operator->()); }
+ 
+     value_type& operator[](difference_type i) {
+       return *(*this + i);
+     }
+ 
+-    const value_type& operator[](difference_type i) const {
++    value_type& operator[](difference_type i) const {
+       return *(*this + i);
+     }
+ 
diff --git a/ports/qt5-webengine/build_3.patch b/ports/qt5-webengine/build_3.patch
new file mode 100644
index 000000000..a86c5dec4
--- /dev/null
+++ b/ports/qt5-webengine/build_3.patch
@@ -0,0 +1,17 @@
+diff --git a/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/lab_color_space.h b/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/lab_color_space.h
+index 78c316e04..fdb0312e0 100644
+--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/lab_color_space.h
++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/lab_color_space.h
+@@ -138,9 +138,9 @@ class LABColorSpace {
+                       clamp(lab.Z(), -128.0f, 128.0f)};
+ 
+     return {
+-        invf((v.X() + 16.0f) / 116.0f + (v.Y() * 0.002f)) * kIlluminantD50.X(),
+-        invf((v.X() + 16.0f) / 116.0f) * kIlluminantD50.Y(),
+-        invf((v.X() + 16.0f) / 116.0f - (v.Z() * 0.005f)) * kIlluminantD50.Z()};
++        (float)(invf((v.X() + 16.0f) / 116.0f + (v.Y() * 0.002f)) * kIlluminantD50.X()),
++        (float)(invf((v.X() + 16.0f) / 116.0f) * kIlluminantD50.Y()),
++        (float)(invf((v.X() + 16.0f) / 116.0f - (v.Z() * 0.005f)) * kIlluminantD50.Z())};
+   }
+ 
+  private:
diff --git a/ports/qt5-webengine/portfile.cmake b/ports/qt5-webengine/portfile.cmake
index aac884be3..797d5fedb 100644
--- a/ports/qt5-webengine/portfile.cmake
+++ b/ports/qt5-webengine/portfile.cmake
@@ -37,7 +37,10 @@ vcpkg_add_to_path(PREPEND "${GPERF_DIR}")
 vcpkg_add_to_path(PREPEND "${NINJA_DIR}")
 
 set(PATCHES common.pri.patch 
-            gl.patch)
+            gl.patch
+            build_1.patch
+            build_2.patch
+            build_3.patch)
 
 if(NOT VCPKG_TARGET_IS_WINDOWS)
     list(APPEND CORE_OPTIONS "BUILD_OPTIONS" "-webengine-system-libwebp" "-webengine-system-ffmpeg" "-webengine-system-icu")