commit f8e18138df4da5dd576d592effd329d438c99c5d Author: Tim Biermann <tbier@posteo.de> Date: Tue Jun 28 18:30:27 2022 +0200 qtwebengine: 5.15.9 -> 5.15.10 diff --git a/qtwebengine/.signature b/qtwebengine/.signature index 80bdba27e..41f41025a 100644 --- a/qtwebengine/.signature +++ b/qtwebengine/.signature @@ -1,14 +1,12 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/QDrrJTqcp65T5VqJkEuPdGfb5vQSTLoyr0KXn011jNZkJgBvdJvzYo0Qh3D7H0DTU8+MyImPnmf9UlK7774Lgk= -SHA256 (Pkgfile) = d040ab8079379e5d7a880c3cbe1d0113fab5d1921b468b14316c2f24d4fde9d2 +RWSE3ohX2g5d/YVLseJexSWcGujgg9xH1oTiOIwzJ0/OODc1qOpA41Hmd97whsBqh1QZ9V06iM79Ob9/lzsRAWqpuVURon3+hQU= +SHA256 (Pkgfile) = eb45f8a030408d04a98a3baeb9114e62831b3d521f267b7c79805be9a49f6fd6 SHA256 (.footprint) = 44b1db82a792e29d0e7a4bf1a4ea7d0ed7b440ab9f0df493452d03ff3c164554 -SHA256 (qtwebengine-5.15.9.tar.xz) = 4b61afcd5b5452d9b3178f28335fb455da543170220f72dba85fe6aa8e76fa39 -SHA256 (qtwebengine-5.15.9-build_fixes-1.patch) = 78aa2fb51bf3b4916f23e4bf81dcaff838da7b38c3261d8cfd18178b52e50445 +SHA256 (qtwebengine-5.15.10.tar.xz) = 07e9845fe51104a80c0be3bceaa66a11c846bd3f96eeab5bf4af940a7bde1701 +SHA256 (qtwebengine-5.15.10-build_fixes-1.patch) = 4d86ddd723ffe605066a8cf4412535cc0b0929ee2819919a749bb17ad9464093 SHA256 (qtwebengine-5.15.2-disable-fatal-warnings.patch) = 19dac26d6753f4cbe1fe2bcb911d8124ea082f55ff86b45cdcba294d3c199249 -SHA256 (qtwebengine-5.15.2-extra_gn.patch) = 3b691d9fb242688e1521a26bf1c47ce5aaa9cd6f7e7fdc458c332470a563d6be SHA256 (qtwebengine-5.15.2_p20210224-chromium-87-v8-icu68.patch) = 4bd5364a5f45c68e0bd452dad7a6f638142503da8c43aaeb15d577aa09369c7c SHA256 (qtwebengine-5.15.2_p20210521-clang-libc++.patch) = 64f786a919c7c145033139e6effe236459dad7b7bb5b52428e00fc70592ce05d SHA256 (qtwebengine-5.15.2_p20211015-pdfium-system-lcms2.patch) = 391f899137cabf4c90ff3bc3a1cf9687d6a273e7bd42618760e7f09c7e0d3e32 SHA256 (qtwebengine-5.15.3_p20220406-ffmpeg5.patch) = 63b0a709c7d1e84193dada20109740d6b9a768f6d83809247dd9691ff50bfc7c SHA256 (qt5-webengine-pipewire-0.3.patch) = 5e3a3c4711d964d5152a04059a2b5c1d14bb13dd29bce370120f60e85b476b6f -SHA256 (gcc12.patch) = 2a59acf4574bdd9a0c1a2314aef11d44a2de033392b72ae21f97370e4bbaba99 diff --git a/qtwebengine/Pkgfile b/qtwebengine/Pkgfile index d677813a2..e0cc33c70 100644 --- a/qtwebengine/Pkgfile +++ b/qtwebengine/Pkgfile @@ -1,21 +1,20 @@ # 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 opus python qt5 xorg-libxscrnsaver xorg-libxtst +# Depends on: ffmpeg libvpx libwebp nodejs nss qt5 xorg-libxscrnsaver xorg-libxtst +# Optional: jsoncpp krb5 libevent libsrtp pipewire pulseaudio snappy name=qtwebengine -version=5.15.9 -release=2 +version=5.15.10 +release=1 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 - qtwebengine-5.15.2-extra_gn.patch qtwebengine-5.15.2_p20210224-chromium-87-v8-icu68.patch qtwebengine-5.15.2_p20210521-clang-libc++.patch qtwebengine-5.15.2_p20211015-pdfium-system-lcms2.patch qtwebengine-5.15.3_p20220406-ffmpeg5.patch - qt5-webengine-pipewire-0.3.patch - gcc12.patch) + qt5-webengine-pipewire-0.3.patch) build() { cd qtwebengine-$version @@ -23,13 +22,11 @@ build() { # https://www.linuxfromscratch.org/blfs/view/svn/x/qtwebengine.html patch -p1 -i $SRC/qtwebengine-$version-build_fixes-1.patch patch -p1 -i $SRC/qtwebengine-5.15.2-disable-fatal-warnings.patch - patch -p1 -i $SRC/qtwebengine-5.15.2-extra_gn.patch patch -p1 -i $SRC/qtwebengine-5.15.2_p20210224-chromium-87-v8-icu68.patch patch -p1 -i $SRC/qtwebengine-5.15.2_p20210521-clang-libc++.patch patch -p1 -i $SRC/qtwebengine-5.15.2_p20211015-pdfium-system-lcms2.patch patch -p1 -i $SRC/qtwebengine-5.15.3_p20220406-ffmpeg5.patch patch -p1 -d src/3rdparty -i $SRC/qt5-webengine-pipewire-0.3.patch - patch -p0 -d src/3rdparty/chromium/third_party/skia/src/utils/ -i $SRC/gcc12.patch mkdir -pv .git src/3rdparty/chromium/.git sed -e '/^MODULE_VERSION/s/5.*/5.15.2/' -i .qmake.conf @@ -42,13 +39,14 @@ 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 && CC=clang CXX=clang++ prt-get isinst ccache && export \ - QMAKE_CC='ccache gcc' \ - QMAKE_LINK_C='ccache gcc' \ - QMAKE_LINK_C_SHLIB='ccache gcc' \ - QMAKE_CXX='ccache g++' \ - QMAKE_LINK='ccache g++' \ - QMAKE_LINK_SHLIB='ccache g++' \ + QMAKE_CC="ccache ${CC:-gcc}" \ + QMAKE_LINK_C="ccache ${CC:-gcc}" \ + QMAKE_LINK_C_SHLIB="ccache ${CC:-gcc}" \ + QMAKE_CXX="ccache ${CXX:-g++}" \ + QMAKE_LINK="ccache ${CXX:-g++}" \ + QMAKE_LINK_SHLIB="ccache ${CXX:-g++}" \ PATH="$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')" install -d build @@ -56,8 +54,7 @@ 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' - PKGMK_QTWEBENGINE+=' -no-webengine-icu' + prt-get isinst icu && PKGMK_QTWEBENGINE+=' -webengine-icu' || PKGMK_QTWEBENGINE+=' -no-webengine-icu' qmake-qt5 .. -- \ $PKGMK_QTWEBENGINE \ diff --git a/qtwebengine/gcc12.patch b/qtwebengine/gcc12.patch deleted file mode 100644 index 7d7e4fa98..000000000 --- a/qtwebengine/gcc12.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- SkParseColor.cpp.orig 2022-05-10 21:02:09.968689017 +0200 -+++ SkParseColor.cpp 2022-05-10 21:02:17.812647846 +0200 -@@ -6,6 +6,7 @@ - */ - - -+#include <iterator> - #include "include/utils/SkParse.h" - - static constexpr const char* gColorNames[] = { diff --git a/qtwebengine/qtwebengine-5.15.2-extra_gn.patch b/qtwebengine/qtwebengine-5.15.2-extra_gn.patch deleted file mode 100644 index 0488122ce..000000000 --- a/qtwebengine/qtwebengine-5.15.2-extra_gn.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/core/gn_run.pro b/src/core/gn_run.pro -index 3d6fda80e..3d0bc86fe 100644 ---- a/src/core/gn_run.pro -+++ b/src/core/gn_run.pro -@@ -38,5 +38,6 @@ build_pass|!debug_and_release { - } - -+ gn_args += $$(EXTRA_GN) - gn_args = $$system_quote($$gn_args) - gn_src_root = $$system_quote($$system_path($$QTWEBENGINE_ROOT/$$getChromiumSrcDir())) - gn_build_root = $$system_quote($$system_path($$OUT_PWD/$$getConfigDir())) - gn_python = "--script-executable=$$pythonPathForSystem()"