commit 1566ebe7a119a9ef9f9c16c8c29a15002c046ab6 Author: Tim Biermann <tbier@posteo.de> Date: Fri Jun 30 15:09:43 2023 +0200 qtwebengine: added workaround for system-re2 diff --git a/qtwebengine/.signature b/qtwebengine/.signature index 75655387b..51ad79ee5 100644 --- a/qtwebengine/.signature +++ b/qtwebengine/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/ZyPiHk0V01oeMYIOBnywyrBxAuayhBSX3t50hlB93qeXmt5nuIT3ePsgYqsi0N3Yd7eL89mIRUvVypZ7UE+pwE= -SHA256 (Pkgfile) = 780c13dcdecc427cb6b751e69c7b2d3f55309ef8d7c049338557991e93fb80ca +RWSE3ohX2g5d/UPTwI0tVcqapHabGDt1fQBK4VoEOYRbLDEEuBjBbDr3e3MzGaxyKftMPwONZzwj7jR8iq4shaSNSt5MwuQifAo= +SHA256 (Pkgfile) = ae3e7ea90833b69569931ce3d067470def56c81a2992bd298af3e2075a8aedff SHA256 (.footprint) = 9c07e0209b90e6d45f593e30c0b5342a594c32de974cc61990189f9e80f4a21a SHA256 (qtwebengine-5.15.14.tar.xz) = 1475c004860585b22af13a2b719ef10992fad58f1c145bf5cb43fbc86a3a67d2 SHA256 (qtwebengine-5.15.14-build_fixes-1.patch) = a9e248414302b6fbd19e0404142e5ad082fb4a45eaf6f96d1b847a7b4bf8e1bd diff --git a/qtwebengine/Pkgfile b/qtwebengine/Pkgfile index 2c7affe0f..e4d08954a 100644 --- a/qtwebengine/Pkgfile +++ b/qtwebengine/Pkgfile @@ -6,7 +6,7 @@ name=qtwebengine version=5.15.14 -release=1 +release=2 source=(https://anduin.linuxfromscratch.org/BLFS/qtwebengine/$name-$version.tar.xz https://www.linuxfromscratch.org/patches/blfs/svn/qtwebengine-$version-build... qtwebengine-5.15.2-disable-fatal-warnings.patch @@ -41,7 +41,7 @@ build() { # Ninja, by default, sets the number of jobs to the number of availalble threads test -n "$JOBS" && export NINJAFLAGS+=" -j ${JOBS-1}" - prt-get isinst clang && export CC=clang CXX=clang++ + prt-get isinst clang && export CC=clang CXX=clang++ QMAKE_XSPEC=linux-clang prt-get isinst lld && export AR=llvm-ar NM=llvm-nm RANLIB=llvm-ranlib LDFLAGS+=' -fuse-ld=lld' prt-get isinst ccache && export \ @@ -51,7 +51,10 @@ build() { QMAKE_CXX="ccache ${CXX:-g++}" \ QMAKE_LINK="ccache ${CXX:-g++}" \ QMAKE_LINK_SHLIB="ccache ${CXX:-g++}" \ + QMAKESPEC=/usr/lib/qt5/mkspecs/${QMAKE_XSPEC:-linux-g++} PATH="$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')" + sed -i -e 's|"-Wno-unknown-attributes",|"-Wno-enum-constexpr-conversion",\n &|' \ + src/3rdparty/chromium/build/config/compiler/BUILD.gn install -d build cd build @@ -59,13 +62,16 @@ build() { prt-get isinst pulseaudio && PKGMK_QTWEBENGINE+=' -pulseaudio' || PKGMK_QTWEBENGINE+=' -no-pulseaudio' prt-get isinst pipewire && PKGMK_QTWEBENGINE+=' -webengine-webrtc-pipewire' prt-get isinst icu && PKGMK_QTWEBENGINE+=' -webengine-icu' || PKGMK_QTWEBENGINE+=' -no-webengine-icu' + ## recent system-re2 crashes build + prt-get isinst re2 && PKGMK_QTWEBENGINE+=' -no-feature-webengine-system-re2' qmake-qt5 .. -- \ $PKGMK_QTWEBENGINE \ -proprietary-codecs \ -system-ffmpeg \ -system-opus \ - -system-webp + -system-webp \ + -no-feature-webengine-embedded-build make make INSTALL_ROOT=$PKG install