Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 13 Sep 2023 06:00:57 GMT
From:      "Tobias C. Berner" <tcberner@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 190bd2d09011 - main - www/qt5-webengine: switch to using bundled re2
Message-ID:  <202309130600.38D60vf7093362@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by tcberner:

URL: https://cgit.FreeBSD.org/ports/commit/?id=190bd2d090115c5c38661198d16fd55288aeb9c1

commit 190bd2d090115c5c38661198d16fd55288aeb9c1
Author:     Tobias C. Berner <tcberner@FreeBSD.org>
AuthorDate: 2023-09-13 05:55:39 +0000
Commit:     Tobias C. Berner <tcberner@FreeBSD.org>
CommitDate: 2023-09-13 06:00:30 +0000

    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.
---
 www/qt5-webengine/Makefile                              |  1 -
 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
+ }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202309130600.38D60vf7093362>