diff options
| author | Tobias C. Berner <tcberner@FreeBSD.org> | 2023-09-13 05:55:39 +0000 |
|---|---|---|
| committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2023-09-13 06:00:30 +0000 |
| commit | 190bd2d090115c5c38661198d16fd55288aeb9c1 (patch) | |
| tree | bbf2f8fc0db3bb83e518d945bfcffb0e24b60940 | |
| parent | 44751f5f02191e232afe5c327cad3d50382ba497 (diff) | |
| download | ports-190bd2d090115c5c38661198d16fd55288aeb9c1.tar.gz ports-190bd2d090115c5c38661198d16fd55288aeb9c1.zip | |
www/qt5-webengine: switch to using bundled re2
See 9d23691afbbc151dbc63933dc8ea370afc391eed for a similar change in
www/qt6-webengine.
Using system re2 leads to compile failures with:
[...]
../../../../qtwebengine-everywhere-src-5.15.8/src/3rdparty/chromium/gpu/command_buffer/service/program_manager.cc:627:25: error: no member named 'as_string' in 'absl::string_view'
return output + input.as_string();
~~~~~ ^
[...]
* PORTREVISION intentionally was not bumped.
| -rw-r--r-- | www/qt5-webengine/Makefile | 1 | ||||
| -rw-r--r-- | www/qt5-webengine/files/patch-src_core_config_linux.pri | 10 |
2 files changed, 9 insertions, 2 deletions
diff --git a/www/qt5-webengine/Makefile b/www/qt5-webengine/Makefile index 93ce67c120c1..c782f72dcff8 100644 --- a/www/qt5-webengine/Makefile +++ b/www/qt5-webengine/Makefile @@ -44,7 +44,6 @@ LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libopus.so:audio/opus \ libpci.so:devel/libpci \ libpng.so:graphics/png \ - libre2.so:devel/re2 \ libsnappy.so:archivers/snappy \ libvpx.so:multimedia/libvpx \ libwebp.so:graphics/webp diff --git a/www/qt5-webengine/files/patch-src_core_config_linux.pri b/www/qt5-webengine/files/patch-src_core_config_linux.pri index 69a53d590201..c867587be127 100644 --- a/www/qt5-webengine/files/patch-src_core_config_linux.pri +++ b/www/qt5-webengine/files/patch-src_core_config_linux.pri @@ -1,4 +1,4 @@ ---- src/core/config/linux.pri.orig 2020-11-07 01:22:36 UTC +--- src/core/config/linux.pri.orig 2021-12-15 16:12:54 UTC +++ src/core/config/linux.pri @@ -20,6 +20,12 @@ qtConfig(webengine-embedded-build) { gn_args += use_alsa=false @@ -13,3 +13,11 @@ !packagesExist(libpci): gn_args += use_libpci=false qtConfig(webengine-ozone-x11) { +@@ -39,6 +45,6 @@ qtConfig(webengine-embedded-build) { + qtConfig(webengine-system-libvpx): gn_args += use_system_libvpx=true + qtConfig(webengine-system-icu): gn_args += use_system_icu=true icu_use_data_file=false + qtConfig(webengine-system-ffmpeg): gn_args += use_system_ffmpeg=true +- qtConfig(webengine-system-re2): gn_args += use_system_re2=true ++ qtConfig(webengine-system-re2): gn_args += use_system_re2=false + qtConfig(webengine-system-lcms2): gn_args += use_system_lcms2=true + } |