diff --git a/desktop/toolkit/qt5/qt5-webengine/actions.py b/desktop/toolkit/qt5/qt5-webengine/actions.py index 3957ce5f93..116c1f67a2 100755 --- a/desktop/toolkit/qt5/qt5-webengine/actions.py +++ b/desktop/toolkit/qt5/qt5-webengine/actions.py @@ -11,8 +11,21 @@ from pisi.actionsapi import qt5 from pisi.actionsapi import get def setup(): + shelltools.copy("qtwebengine-release.sh", "%s/qtwebengine-release.sh" % get.workDIR()) + shelltools.cd("%s" % get.workDIR()) + + shelltools.system("sh ./qtwebengine-release.sh") + + shelltools.cd("qtwebengine-everywhere-src-%s" % get.srcVERSION()) + + + # Disable jumbo build https://bugreports.qt.io/browse/QTBUG-88657 gcc10 shelltools.system("sed -i 's|use_jumbo_build=true|use_jumbo_build=false|' -i src/buildtools/config/common.pri") + + #shelltools.system("sh ./qtwebengine-release.sh") + #shelltools.system("git submodule init") + #shelltools.system("git submodule update") shelltools.makedirs("build") shelltools.cd("build") @@ -24,11 +37,14 @@ def setup(): #shelltools.export("NINJAJOBS", "-j 4") shelltools.system("qmake .. -- -proprietary-codecs \ -system-ffmpeg \ - -system-opus \ -system-webp \ + -system-opus \ -spellchecker \ -webengine-icu \ - -webengine-kerberos") + -webengine-kerberos \ + -webengine-webrtc-pipewire") + + qt5.configure("..") def build(): shelltools.cd("build") diff --git a/desktop/toolkit/qt5/qt5-webengine/files/fedora/qtwebengine-release.sh b/desktop/toolkit/qt5/qt5-webengine/files/fedora/qtwebengine-release.sh new file mode 100644 index 0000000000..cece5b070d --- /dev/null +++ b/desktop/toolkit/qt5/qt5-webengine/files/fedora/qtwebengine-release.sh @@ -0,0 +1,16 @@ +#!/bin/sh +set -x +VERSION=5.15.5 +CHROMIUMHASH=`wget https://code.qt.io/cgit/qt/qtwebengine.git/tree/src/3rdparty?h=$VERSION -q --content-on-error -O - | grep "Bad object name: " | sed 's/^.*Bad object name: \([0-9a-f]\{40\}\).*$/\1/g'` +rm -rf qtwebengine-$VERSION qtwebengine-$VERSION.tar.gz qtwebengine-chromium-$CHROMIUMHASH qtwebengine-chromium-$CHROMIUMHASH.tar.gz qtwebengine-everywhere-src-$VERSION +wget https://github.com/qt/qtwebengine/archive/$VERSION.tar.gz -O qtwebengine-$VERSION.tar.gz || exit $? +tar xzf qtwebengine-$VERSION.tar.gz || exit $? +wget https://github.com/qt/qtwebengine-chromium/archive/$CHROMIUMHASH.tar.gz -O qtwebengine-chromium-$CHROMIUMHASH.tar.gz || exit $? +tar xzf qtwebengine-chromium-$CHROMIUMHASH.tar.gz || exit $? +mv qtwebengine-$VERSION qtwebengine-everywhere-src-$VERSION || exit $? +cd qtwebengine-everywhere-src-$VERSION ; syncqt.pl -version $VERSION || exit $? +rmdir ../qtwebengine-everywhere-src-$VERSION/src/3rdparty || exit $? +mv ../qtwebengine-chromium-$CHROMIUMHASH src/3rdparty || exit $? +# cd .. +# XZ_OPT=-9 tar cJf qtwebengine-everywhere-src-$VERSION.tar.xz qtwebengine-everywhere-src-$VERSION || exit $? +# rm -rf qtwebengine-$VERSION qtwebengine-$VERSION.tar.gz qtwebengine-chromium-$CHROMIUMHASH qtwebengine-chromium-$CHROMIUMHASH.tar.gz qtwebengine-everywhere-src-$VERSION diff --git a/desktop/toolkit/qt5/qt5-webengine/pspec.xml b/desktop/toolkit/qt5/qt5-webengine/pspec.xml index 557a79ca41..86e1c2b331 100755 --- a/desktop/toolkit/qt5/qt5-webengine/pspec.xml +++ b/desktop/toolkit/qt5/qt5-webengine/pspec.xml @@ -11,7 +11,10 @@ Provides support for web applications using the Chromium browser project Provides support for web applications using the Chromium browser project LGPLv2.1-linking-exception - http://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebengine-everywhere-src-5.15.2.tar.xz + https://github.com/qt/qtwebengine/archive/refs/tags/v5.15.5-lts.tar.gz + + fedora/qtwebengine-release.sh + qt5-base-devel qt5-declarative-devel @@ -21,6 +24,8 @@ qt5-webchannel-devel qt5-designer-devel bison + wget + nodejs re2-devel re2c ninja @@ -63,6 +68,7 @@ nss-devel perl python-devel + python3-devel libvpx-devel libjpeg-turbo-devel x264-devel @@ -75,10 +81,11 @@ poppler-cpp-devel python-Jinja2 libxkbcommon-devel + libxkbfile-devel - qtwebengine-icu68.patch + @@ -139,6 +146,7 @@ protobuf pulseaudio-libs libxkbcommon + libxkbfile @@ -169,6 +177,13 @@ + + 2021-07-08 + 5.15.5 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2021-02-27 5.15.2