diff --git a/ports/qt5-webengine/build_1.patch b/ports/qt5-webengine/build_1.patch index dfa3ea721f2718..4bef9ebd43b444 100644 --- a/ports/qt5-webengine/build_1.patch +++ b/ports/qt5-webengine/build_1.patch @@ -1,12 +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 +index fb57176..fa84cc5 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") { +@@ -131,7 +131,6 @@ config("extra_warnings") { # Enable more default warnings on Windows. if (is_win) { cflags += [ - "/we4244", # Conversion: possible loss of data. + "/we4312", # Conversion: greater size. "/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 index 7a4622516d846f..77d7cbe0dc3f20 100644 --- a/ports/qt5-webengine/build_2.patch +++ b/ports/qt5-webengine/build_2.patch @@ -1,29 +1,24 @@ 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 +index 18ca770..5585a67 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 { +@@ -74,16 +74,16 @@ 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 { + return const_cast::Iterator*>(this)->operator->(); } T& operator*() { return *(operator->()); } - const T& operator*() const { return *(operator->()); } + T& operator*() const { return *(operator->()); } - value_type& operator[](difference_type i) { - return *(*this + i); - } + 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); + return const_cast::Iterator&>(*this)[i]; } diff --git a/ports/qt5-webengine/build_3.patch b/ports/qt5-webengine/build_3.patch deleted file mode 100644 index a86c5dec4641b4..00000000000000 --- a/ports/qt5-webengine/build_3.patch +++ /dev/null @@ -1,17 +0,0 @@ -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 60020c83f8a139..080b21b3ce3e45 100644 --- a/ports/qt5-webengine/portfile.cmake +++ b/ports/qt5-webengine/portfile.cmake @@ -44,8 +44,7 @@ vcpkg_add_to_path(PREPEND "${NINJA_DIR}") set(PATCHES common.pri.patch gl.patch build_1.patch - build_2.patch - build_3.patch) + build_2.patch) set(OPTIONS) if("proprietary-codecs" IN_LIST FEATURES) diff --git a/ports/qt5-webengine/vcpkg.json b/ports/qt5-webengine/vcpkg.json index 3ea9d9a5e071fa..f6349b28bf7832 100644 --- a/ports/qt5-webengine/vcpkg.json +++ b/ports/qt5-webengine/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qt5-webengine", "version": "5.15.3", + "port-version": 1, "description": "Qt5 webengine Module;", "license": null, "supports": "!static", diff --git a/versions/baseline.json b/versions/baseline.json index d87a108b82ff86..9df85e4ff7d754 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5746,7 +5746,7 @@ }, "qt5-webengine": { "baseline": "5.15.3", - "port-version": 0 + "port-version": 1 }, "qt5-webglplugin": { "baseline": "5.15.3", diff --git a/versions/q-/qt5-webengine.json b/versions/q-/qt5-webengine.json index b7b79a2326cb95..159af06521d1b0 100644 --- a/versions/q-/qt5-webengine.json +++ b/versions/q-/qt5-webengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "533cd8995acbdf2a8cc24a96da7515777dfe7c38", + "version": "5.15.3", + "port-version": 1 + }, { "git-tree": "4b097155aca1faecdaa639daec2395e9a8c0cdad", "version": "5.15.3",