mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-03 03:48:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
5bb2aee08b
vcpkg/ports/qt5-webengine/workaround-protobuf-issue.patch

18 lines
762 B
Diff
Raw Normal View History

[qt5-webengine] Work around mixed protobuf issue (#37044) On MS Windows qt5-webengine fails to build in a context where protobuf from vcpkg is also used because it includes the vcpkg supplied version of protobuf headers when building the Qt part of the code in qt5-webengine, against the internal copy of Chromium which has used its older copy of protobuf to generate the headers. The build failure seen is this: FAILED: obj/QtWebEngineCore/browser_message_filter_qt.obj ... ... C:\vcpkgroot\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 To work around this issue we ensure that the path to the chromium provided version of protobuf is included before the path to the vcpkg provided includes residing in: C:/vcpkgroot/qt5-webengine/x64-windows-dbg/include Fixes #12150 Fixes #27932 Fixes #34452 - [x] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [x] SHA512s are updated for each updated download. - [x] The "supports" clause reflects platforms that may be fixed by this new version. - [x] Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file. - [x] Any patches that are no longer applied are deleted from the port's directory. - [x] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [x] Only one version is added to each modified port's versions file.
2024-03-02 06:39:36 +08:00
diff --git a/src/core/core_chromium.pri b/src/core/core_chromium.pri
index a846f2fbc..102ec9ace 100644
--- a/src/core/core_chromium.pri
+++ b/src/core/core_chromium.pri
@@ -32,6 +32,12 @@ isUniversal() {
# whenever we are cross compiling.
qtConfig(webengine-embedded-build): DEFINES += QTWEBENGINE_EMBEDDED_SWITCHES
[qt5-webengine] Work around mixed abseil-cpp issue (#39530)
2024-07-01 13:48:29 +08:00
+# 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.
[qt5-webengine] Work around mixed protobuf issue (#37044) On MS Windows qt5-webengine fails to build in a context where protobuf from vcpkg is also used because it includes the vcpkg supplied version of protobuf headers when building the Qt part of the code in qt5-webengine, against the internal copy of Chromium which has used its older copy of protobuf to generate the headers. The build failure seen is this: FAILED: obj/QtWebEngineCore/browser_message_filter_qt.obj ... ... C:\vcpkgroot\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 To work around this issue we ensure that the path to the chromium provided version of protobuf is included before the path to the vcpkg provided includes residing in: C:/vcpkgroot/qt5-webengine/x64-windows-dbg/include Fixes #12150 Fixes #27932 Fixes #34452 - [x] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [x] SHA512s are updated for each updated download. - [x] The "supports" clause reflects platforms that may be fixed by this new version. - [x] Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file. - [x] Any patches that are no longer applied are deleted from the port's directory. - [x] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [x] Only one version is added to each modified port's versions file.
2024-03-02 06:39:36 +08:00
+# See https://github.com/microsoft/vcpkg/issues/12150
+CHROMIUM_SRC_DIR = $$QTWEBENGINE_ROOT/$$getChromiumSrcDir()
[qt5-webengine] Work around mixed abseil-cpp issue (#39530)
2024-07-01 13:48:29 +08:00
+INCLUDEPATH = $$CHROMIUM_SRC_DIR/third_party/protobuf/src $$CHROMIUM_SRC_DIR/third_party/abseil-cpp $$INCLUDEPATH
[qt5-webengine] Work around mixed protobuf issue (#37044) On MS Windows qt5-webengine fails to build in a context where protobuf from vcpkg is also used because it includes the vcpkg supplied version of protobuf headers when building the Qt part of the code in qt5-webengine, against the internal copy of Chromium which has used its older copy of protobuf to generate the headers. The build failure seen is this: FAILED: obj/QtWebEngineCore/browser_message_filter_qt.obj ... ... C:\vcpkgroot\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 To work around this issue we ensure that the path to the chromium provided version of protobuf is included before the path to the vcpkg provided includes residing in: C:/vcpkgroot/qt5-webengine/x64-windows-dbg/include Fixes #12150 Fixes #27932 Fixes #34452 - [x] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [x] SHA512s are updated for each updated download. - [x] The "supports" clause reflects platforms that may be fixed by this new version. - [x] Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file. - [x] Any patches that are no longer applied are deleted from the port's directory. - [x] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [x] Only one version is added to each modified port's versions file.
2024-03-02 06:39:36 +08:00
+
INCLUDEPATH += $$PWD $$PWD/api
[qt5-webengine] Work around mixed abseil-cpp issue (#39530)
2024-07-01 13:48:29 +08:00
[qt5-webengine] Work around mixed protobuf issue (#37044) On MS Windows qt5-webengine fails to build in a context where protobuf from vcpkg is also used because it includes the vcpkg supplied version of protobuf headers when building the Qt part of the code in qt5-webengine, against the internal copy of Chromium which has used its older copy of protobuf to generate the headers. The build failure seen is this: FAILED: obj/QtWebEngineCore/browser_message_filter_qt.obj ... ... C:\vcpkgroot\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 To work around this issue we ensure that the path to the chromium provided version of protobuf is included before the path to the vcpkg provided includes residing in: C:/vcpkgroot/qt5-webengine/x64-windows-dbg/include Fixes #12150 Fixes #27932 Fixes #34452 - [x] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [x] SHA512s are updated for each updated download. - [x] The "supports" clause reflects platforms that may be fixed by this new version. - [x] Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file. - [x] Any patches that are no longer applied are deleted from the port's directory. - [x] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [x] Only one version is added to each modified port's versions file.
2024-03-02 06:39:36 +08:00
clang_cl {
Reference in New Issue Copy Permalink