diff options
| author | Kai Knoblich <kai@FreeBSD.org> | 2023-08-28 13:23:32 +0000 |
|---|---|---|
| committer | Kai Knoblich <kai@FreeBSD.org> | 2023-08-28 13:40:40 +0000 |
| commit | 9d23691afbbc151dbc63933dc8ea370afc391eed (patch) | |
| tree | b359a1d89be568ab110f5d74cd910ffe4030c564 | |
| parent | 78eacb1e56cc8f6d51fc4f29fc9245bd51140522 (diff) | |
| download | ports-9d23691afbbc151dbc63933dc8ea370afc391eed.tar.gz ports-9d23691afbbc151dbc63933dc8ea370afc391eed.zip | |
www/qt6-webengine: Switch to bundled re2
* Prepare the port for newer versions of devel/re2, which also require
devel/abseil. This combination however causes build errors [1] due
to missing symbols:
[...]
In file included from gen/extensions/browser/browser_sources_jumbo_8.cc:6:
./../../../../../qtwebengine-everywhere-src-6.5.2/src/3rdparty/chromium/extensions/browser/api/web_request/form_data_parser.cc:429:11: error: no member named 'set' in 'absl::string_view'
source_.set(source.data(), source.size());
~~~~~~~ ^
./../../../../../qtwebengine-everywhere-src-6.5.2/src/3rdparty/chromium/extensions/browser/api/web_request/form_data_parser.cc:573:11: error: no member named 'set' in 'absl::string_view'
source_.set(source.data(), source.size());
~~~~~~~ ^
[...]
Unbundling abseil and its-subcomponents via "replace_gn_files.py" didn't
help hence switch to the bundled re2 for now to have a consistent
combination of re2 and abseil.
* Bump PORTREVISION due dependency change.
PR: 260402 [1]
Reported by: diizzy [1]
Reviewed by: diizzy, tcberner
Differential Revision: https://reviews.freebsd.org/D41571
| -rw-r--r-- | www/qt6-webengine/Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/www/qt6-webengine/Makefile b/www/qt6-webengine/Makefile index d3c3c69644b2..24fda63780d9 100644 --- a/www/qt6-webengine/Makefile +++ b/www/qt6-webengine/Makefile @@ -15,7 +15,7 @@ PORTNAME= webengine DISTVERSION= ${QT6_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www PKGNAMEPREFIX= qt6- @@ -41,7 +41,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 \ @@ -56,6 +55,10 @@ USE_XORG= x11 xcb xcomposite xcursor xdamage xext xfixes xi xkbfile \ xrandr xrender xscrnsaver xshmfence xtst CMAKE_ON= QT_FEATURE_webengine_system_ffmpeg QT_FEATURE_webengine_proprietary_codecs +# See https://reviews.freebsd.org/D41571 for further details. From time to +# time, e.g. with new qt6-webengine releases, it should be checked whether +# re2 can be unbundled again. +CMAKE_OFF= QT_FEATURE_webengine_system_re2 # The build system reads the environment variable $NINJA_PATH to decide whether # to boostrap ninja or not (and also to invoke it afterwards). CC and CXX are |