pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

qt6-qtwebengine: explain why using bundled re2



Module Name:	pkgsrc-wip
Committed By:	Mark Davies <mark%ecs.vuw.ac.nz@localhost>
Pushed By:	markd
Date:		Fri Feb 21 07:44:51 2025 +1300
Changeset:	0882feca3f0ab4796907abafc5657d899173be93

Modified Files:
	qt6-qtwebengine/Makefile

Log Message:
qt6-qtwebengine: explain why using bundled re2

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0882feca3f0ab4796907abafc5657d899173be93

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

diffstat:
 qt6-qtwebengine/Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diffs:
diff --git a/qt6-qtwebengine/Makefile b/qt6-qtwebengine/Makefile
index 23b011a73a..3f6b6562a3 100644
--- a/qt6-qtwebengine/Makefile
+++ b/qt6-qtwebengine/Makefile
@@ -43,7 +43,9 @@ CMAKE_CONFIGURE_ARGS+=		-DQT_FEATURE_webengine_system_libevent=ON
 CMAKE_CONFIGURE_ARGS+=		-DQT_FEATURE_webengine_system_libvpx=ON
 CMAKE_CONFIGURE_ARGS+=		-DQT_FEATURE_webengine_system_minizip=ON
 CMAKE_CONFIGURE_ARGS+=		-DQT_FEATURE_webengine_system_zlib=ON
-## for the moment
+# As pkgsrc abseil is built with FORCE_CXX_STD=c++14 it is incompatible
+# with chromium's bundled abseil and therefore so is pkgsrc re2
+# so use bundled version
 CMAKE_CONFIGURE_ARGS+=		-DQT_FEATURE_webengine_system_re2=OFF
 CMAKE_CONFIGURE_ARGS+=		-DQT_FEATURE_webengine_kerberos=ON
 CMAKE_CONFIGURE_ARGS+=		-DQT_FEATURE_webengine_vulkan=OFF
@@ -117,7 +119,7 @@ do-install:
 # chromium insists on using its own protobuf
 # so don't include here as versions must match
 #.include "../../devel/protobuf/buildlink3.mk"
-.include "../../devel/re2/buildlink3.mk"
+#.include "../../devel/re2/buildlink3.mk"
 .include "../../devel/snappy/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 #.include "../../mk/jpeg.buildlink3.mk"


Home | Main Index | Thread Index | Old Index