[qt5-webengine] Work around mixed abseil-cpp issue (microsoft#39530)

jimwang118 · Jul 1, 2024 · 101cc9a · 101cc9a
1 parent 354c71f
commit 101cc9a
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 14 deletions.
diff --git a/ports/qt5-webengine/portfile.cmake b/ports/qt5-webengine/portfile.cmake
@@ -29,7 +29,7 @@ get_filename_component(GPERF_DIR "${GPERF}" DIRECTORY )
 get_filename_component(NINJA_DIR "${NINJA}" DIRECTORY )
 get_filename_component(NODEJS_DIR "${NODEJS}" DIRECTORY )
 
-if(WIN32) # WIN32 HOST probably has win_flex and win_bison!
+if(CMAKE_HOST_WIN32) # WIN32 HOST probably has win_flex and win_bison!
     if(NOT EXISTS "${FLEX_DIR}/flex${VCPKG_HOST_EXECUTABLE_SUFFIX}")
         file(CREATE_LINK "${FLEX}" "${FLEX_DIR}/flex${VCPKG_HOST_EXECUTABLE_SUFFIX}")
     endif()

diff --git a/ports/qt5-webengine/vcpkg.json b/ports/qt5-webengine/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "qt5-webengine",
   "version": "5.15.14",
+  "port-version": 1,
   "description": "Qt WebEngine provides functionality for rendering regions of dynamic web content.",
   "license": null,
   "supports": "!static",

diff --git a/ports/qt5-webengine/workaround-protobuf-issue.patch b/ports/qt5-webengine/workaround-protobuf-issue.patch
@@ -5,13 +5,13 @@ index a846f2fbc..102ec9ace 100644
 @@ -32,6 +32,12 @@ isUniversal() {
  # whenever we are cross compiling.
  qtConfig(webengine-embedded-build): DEFINES += QTWEBENGINE_EMBEDDED_SWITCHES
- 
-+# Prepend Chromium's protobuf include directory to the include paths
-+# to ensure we see same protobuf version as chromium.
+
++# Prepend Chromium's protobuf and abseil-cpp include directories to the include paths
++# to ensure we use chromiums own copies instead of vcpkg provided libraries.
 +# See https://github.com/microsoft/vcpkg/issues/12150
 +CHROMIUM_SRC_DIR = $$QTWEBENGINE_ROOT/$$getChromiumSrcDir()
-+INCLUDEPATH = $$CHROMIUM_SRC_DIR/third_party/protobuf/src $$INCLUDEPATH
++INCLUDEPATH = $$CHROMIUM_SRC_DIR/third_party/protobuf/src $$CHROMIUM_SRC_DIR/third_party/abseil-cpp $$INCLUDEPATH
 +
  INCLUDEPATH += $$PWD $$PWD/api
- 
+
  clang_cl {
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
@@ -959,13 +959,6 @@ qt5-canvas3d:x86-windows=skip
 # Missing system libraries
 qtwayland:x64-osx=fail
 qtwayland:arm64-osx=fail
-# Missing prerequisites for CI success
-# Fail due to outdated protoc headers.
-# D:\buildtrees\qt5-webengine\x64-windows-dbg\src\core\debug\gen\net/third_party/quiche/src/quic/core/proto/cached_network_parameters.pb.h(17):
-# fatal error C1189: #error:  This file was generated by an older version of protoc which is
-# Succesful built requires protobuf to be installed after qt5-webengine not before. Otherwise the build picks up the wrong headers from inside vcpkg.
-qt5-webengine:x64-windows=skip
-qt5-webengine:x86-windows=skip
 # Missing system libraries
 qt5-x11extras:x64-osx=fail
 qt5-x11extras:arm64-osx=fail

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -7330,7 +7330,7 @@
     },
     "qt5-webengine": {
       "baseline": "5.15.14",
-      "port-version": 0
+      "port-version": 1
     },
     "qt5-webglplugin": {
       "baseline": "5.15.14",

diff --git a/versions/q-/qt5-webengine.json b/versions/q-/qt5-webengine.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3a7ec5e30688651f573aff75217a83180298a520",
+      "version": "5.15.14",
+      "port-version": 1
+    },
     {
       "git-tree": "d09061cfbd0d6b0d29cb8aae7267c734ce74c883",
       "version": "5.15.14",