CVS commit: pkgsrc/x11/qt5-qtwebengine

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Jun  7 08:44:58 UTC 2023

Modified Files:
        pkgsrc/x11/qt5-qtwebengine: Makefile

Log Message:
qt5-qtwebengine: re2 now pulls in abseil

But this comes with a different version of abseil, which breaks the
build.

Remove abseil headers (not used by re2) from buildlink directory
to work around this.


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 pkgsrc/x11/qt5-qtwebengine/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/qt5-qtwebengine/Makefile
diff -u pkgsrc/x11/qt5-qtwebengine/Makefile:1.44 pkgsrc/x11/qt5-qtwebengine/Makefile:1.45
--- pkgsrc/x11/qt5-qtwebengine/Makefile:1.44    Tue Jun  6 12:42:55 2023
+++ pkgsrc/x11/qt5-qtwebengine/Makefile Wed Jun  7 08:44:58 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2023/06/06 12:42:55 riastradh Exp $
+# $NetBSD: Makefile,v 1.45 2023/06/07 08:44:58 wiz Exp $
 
 DISTNAME=      qtwebengine-everywhere-opensource-src-${QTVERSION}
 PKGNAME=       qt5-qtwebengine-${QTVERSION}
@@ -60,6 +60,9 @@ pre-configure:
        ${CP} ${FILESDIR}/audio_manager_openbsd.* ${CHROMESRC}/media/audio/openbsd
        cd ${WRKSRC} && env -i ${MAKE_ENV} ${CHROMESRC}/build/linux/unbundle/replace_gn_files.py \
                --system-libraries ${GN_SYSTEM_LIBS}
+       # re2 pulls in abseil headers, but doesn't need them
+       # avoid conflict with the ones included in the tarball
+       ${RM} -rf ${BUILDLINK_DIR}/include/absl
 
 post-install:
 .for i in Qt5Pdf.pc Qt5PdfWidgets.pc Qt5WebEngine.pc Qt5WebEngineCore.pc Qt5WebEngineWidgets.pc