commit bfed937a1959912034a446648006f848f15d1d4f Author: Danny Rawlins <contact@romster.me> Date: Mon Feb 21 20:23:39 2022 +1100 [notify] qtwebengine: 5.15.6 -> 5.15.8 new dependency ffmpeg4 diff --git a/qtwebengine/.footprint b/qtwebengine/.footprint index eed207d83..8f4460072 100644 --- a/qtwebengine/.footprint +++ b/qtwebengine/.footprint @@ -299,6 +299,7 @@ drwxr-xr-x root/root usr/lib/qt5/qml/QtWebEngine/Controls2Delegates/ drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/qt5/ drwxr-xr-x root/root usr/share/qt5/resources/ +-rw-r--r-- root/root usr/share/qt5/resources/icudtl.dat -rw-r--r-- root/root usr/share/qt5/resources/qtwebengine_devtools_resources.pak -rw-r--r-- root/root usr/share/qt5/resources/qtwebengine_resources.pak -rw-r--r-- root/root usr/share/qt5/resources/qtwebengine_resources_100p.pak diff --git a/qtwebengine/.signature b/qtwebengine/.signature index d95b32149..e0884e909 100644 --- a/qtwebengine/.signature +++ b/qtwebengine/.signature @@ -1,7 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/YCkf1DYQZcoH/ynBvqqO2w+fIYwm6IVTQomNE60A+0qQeIlSd09JBubGE5vC/7FZsLTuZRPQXsatm6G8+ZAlQQ= -SHA256 (Pkgfile) = 6b06b33b2c7e3772d0a17b663354803f46e8cfed9464e9f8110305ba6e8d2d67 -SHA256 (.footprint) = 9c07e0209b90e6d45f593e30c0b5342a594c32de974cc61990189f9e80f4a21a -SHA256 (qtwebengine-5.15.6.tar.xz) = b120e51147bea8a91d447cc4458b50c4dda99b7c49c7ca06ca9bbdcaac9a2690 -SHA256 (qtwebengine-5.15.6-5.15.7-1.patch) = 792bafa85e7bbf87274db435f7a5dd36c8398feb515565f43744f9cf689c9249 -SHA256 (qtwebengine-5.15.7-build_fixes-1.patch) = 94cdbc0d55bc968b6705a8a3b1fc115a6d4ac66e6e19d83b02d1580ae3a6ff30 +RWSE3ohX2g5d/R8gKK+2LSPc07GbUqh8EkA4SRAwVbrDoPxR2/eNmE8pQG9uNiSDvzIsEzRZhIS2kwTD7iof0Z8woV2gcJe+twk= +SHA256 (Pkgfile) = 2b2f80d437eae5fa139a47b042aa7cc789f83ad114f02f92fba80497b22ba1d6 +SHA256 (.footprint) = 44b1db82a792e29d0e7a4bf1a4ea7d0ed7b440ab9f0df493452d03ff3c164554 +SHA256 (qtwebengine-5.15.8.tar.xz) = 9315c78db8e077d6dab6bd67e4b47c89c0109c87a557fb5095e9da280cbdafec +SHA256 (qtwebengine-5.15.8-build_fixes-1.patch) = 78aa2fb51bf3b4916f23e4bf81dcaff838da7b38c3261d8cfd18178b52e50445 diff --git a/qtwebengine/Pkgfile b/qtwebengine/Pkgfile index 2898cdfa4..999187345 100644 --- a/qtwebengine/Pkgfile +++ b/qtwebengine/Pkgfile @@ -1,21 +1,19 @@ # Description: Provides support for web applications using the Chromium browser project. # URL: https://www.qt.io/ # Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: ffmpeg libvpx libwebp nodejs nss python qt5 xorg-libxscrnsaver xorg-libxtst +# Depends on: ffmpeg4 libvpx libwebp nodejs nss python qt5 xorg-libxscrnsaver xorg-libxtst name=qtwebengine -version=5.15.6 -release=2 +version=5.15.8 +release=1 source=(https://anduin.linuxfromscratch.org/BLFS/qtwebengine/$name-$version.tar.xz - https://www.linuxfromscratch.org/patches/blfs/svn/qtwebengine-5.15.6-5.15.7-... - https://www.linuxfromscratch.org/patches/blfs/svn/qtwebengine-5.15.7-build_f...) + https://www.linuxfromscratch.org/patches/blfs/svn/qtwebengine-5.15.8-build_f...) build() { cd qtwebengine-$version # https://www.linuxfromscratch.org/blfs/view/svn/x/qtwebengine.html - patch -p1 -i $SRC/qtwebengine-5.15.6-5.15.7-1.patch - patch -p1 -i $SRC/qtwebengine-5.15.7-build_fixes-1.patch + patch -p1 -i $SRC/qtwebengine-5.15.8-build_fixes-1.patch mkdir -pv .git src/3rdparty/chromium/.git sed -e '/^MODULE_VERSION/s/5.*/5.15.2/' -i .qmake.conf @@ -41,11 +39,11 @@ build() { install -d build cd build - ulimit -n 2048 - prt-get isinst pulseaudio && PKGMK_QTWEBENGINE+=' -pulseaudio' || PKGMK_QTWEBENGINE+=' -no-pulseaudio' prt-get isinst icu && PKGMK_QTWEBENGINE+=' -webengine-icu' || PKGMK_QTWEBENGINE+=' -no-webengine-icu' + export PKG_CONFIG_PATH+="/usr/lib/ffmpeg4/pkgconfig" + qmake-qt5 .. -- \ $PKGMK_QTWEBENGINE \ -proprietary-codecs \