diff --git a/desktop/toolkit/qt5/qt5-gstreamer/pspec.xml b/desktop/toolkit/qt5/qt5-gstreamer/pspec.xml
index 95d01dddbf..a28991ff6d 100755
--- a/desktop/toolkit/qt5/qt5-gstreamer/pspec.xml
+++ b/desktop/toolkit/qt5/qt5-gstreamer/pspec.xml
@@ -22,10 +22,10 @@
gobject-introspection-devel
mesa-devel
glib2-devel
- qt5-base-devel
+ qt5-base-devel
gst-plugins-base-devel
- qt5-declarative-devel
- qt5-quickcontrols2-devel
+ qt5-declarative-devel
+ qt5-quickcontrols2-devel
qt-gstreamer-1.6.patch
@@ -40,8 +40,8 @@
gstreamer
mesa
glib2
- qt5-base
- qt5-declarative
+ qt5-base
+ qt5-declarative
gst-plugins-base
@@ -58,8 +58,8 @@
glib2-devel
gstreamer-devel
qt5-gstreamer
- qt5-base-devel
- qt5-declarative-devel
+ qt5-base-devel
+ qt5-declarative-devel
gst-plugins-base-devel
@@ -70,6 +70,13 @@
+
+ 2020-12-14
+ 1.2.0
+ Rebuild qt5-5.15.2
+ Pisi Linux Community
+ admin@pisilinux.org
+
2020-09-09
1.2.0
diff --git a/desktop/toolkit/qt5/qt5-webengine/actions.py b/desktop/toolkit/qt5/qt5-webengine/actions.py
index 31b57224ab..978170d8e9 100755
--- a/desktop/toolkit/qt5/qt5-webengine/actions.py
+++ b/desktop/toolkit/qt5/qt5-webengine/actions.py
@@ -11,6 +11,9 @@ from pisi.actionsapi import qt5
from pisi.actionsapi import get
def setup():
+ # 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.makedirs("build")
shelltools.cd("build")
#shelltools.export("QT5LINK", "/usr/lib/qt5/bin")
@@ -18,6 +21,7 @@ def setup():
#shelltools.export("CFLAGS", "%s -I/usr/lib/sqlite3.16.2" % get.CFLAGS())
#shelltools.system("qmake WEBENGINE_CONFIG+=use_proprietary_codecs WEBENGINE_CONFIG+=use_system_icu WEBENGINE_CONFIG+=use_system_protobuf WEBENGINE_CONFIG+=use_system_ffmpeg qtwebengine.pro")
#pisitools.ldflags.add("-Wl,--no-keep-memory ")
+ shelltools.export("NINJAJOBS", "-j 4")
shelltools.system("qmake .. -- -proprietary-codecs \
-system-ffmpeg \
-system-opus \
diff --git a/desktop/toolkit/qt5/qt5-webengine/pspec.xml b/desktop/toolkit/qt5/qt5-webengine/pspec.xml
index c63bdfbe75..150c0ada90 100755
--- a/desktop/toolkit/qt5/qt5-webengine/pspec.xml
+++ b/desktop/toolkit/qt5/qt5-webengine/pspec.xml
@@ -11,15 +11,15 @@
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.1/submodules/qtwebengine-everywhere-src-5.15.1.tar.xz
+ http://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebengine-everywhere-src-5.15.2.tar.xz
- qt5-base-devel
- qt5-declarative-devel
- qt5-xmlpatterns-devel
- qt5-location-devel
- qt5-sensors-devel
- qt5-webchannel-devel
- qt5-designer-devel
+ qt5-base-devel
+ qt5-declarative-devel
+ qt5-xmlpatterns-devel
+ qt5-location-devel
+ qt5-sensors-devel
+ qt5-webchannel-devel
+ qt5-designer-devel
bison
re2-devel
re2c
@@ -77,7 +77,7 @@
libxkbcommon-devel
- qtbug-86752.patch
+
@@ -118,7 +118,7 @@
libopus
libxml2
libvpx
- qt5-base
+ qt5-base
alsa-lib
harfbuzz
libevent
@@ -128,11 +128,11 @@
libXScrnSaver
libXdamage
libXrender
- qt5-location
+ qt5-location
libXcomposite
libjpeg-turbo
- qt5-webchannel
- qt5-declarative
+ qt5-webchannel
+ qt5-declarative
zlib
minizip
protobuf
@@ -150,17 +150,17 @@
qt5-webengine
- qt5-base-devel
- qt5-declarative-devel
- qt5-location-devel
- qt5-webchannel-devel
+ qt5-base-devel
+ qt5-declarative-devel
+ qt5-location-devel
+ qt5-webchannel-devel
qt5-webengine-docs
- qt5-base
+ qt5-base
/usr/share/doc
@@ -168,6 +168,13 @@
+
+ 2020-12-14
+ 5.15.2
+ Version bump.
+ Mustafa Cinasal
+ muscnsl@gmail.com
+
2020-10-01
5.15.1
diff --git a/desktop/toolkit/qt5/qt5-webkit/files/d92b11fe.patch b/desktop/toolkit/qt5/qt5-webkit/files/d92b11fe.patch
new file mode 100644
index 0000000000..de3bbcfc3e
--- /dev/null
+++ b/desktop/toolkit/qt5/qt5-webkit/files/d92b11fe.patch
@@ -0,0 +1,46 @@
+From d92b11fea65364fefa700249bd3340e0cd4c5b31 Mon Sep 17 00:00:00 2001
+From: Dmitry Shachnev
+Date: Tue, 4 Aug 2020 21:04:06 +0300
+Subject: [PATCH] Let Bison generate the header directly, to fix build with
+ Bison 3.7
+
+Starting with Bison 3.7, the generated C++ file #include's the header
+by default, instead of duplicating it. So we should not delete it.
+
+Remove the code to add #ifdef guards to the header, since Bison adds
+them itself since version 2.6.3.
+---
+ Source/WebCore/css/makegrammar.pl | 21 +--------------------
+ 1 file changed, 1 insertion(+), 20 deletions(-)
+
+diff --git a/Source/WebCore/css/makegrammar.pl b/Source/WebCore/css/makegrammar.pl
+index 5d63b08102eb..9435701c7061 100644
+--- a/Source/WebCore/css/makegrammar.pl
++++ b/Source/WebCore/css/makegrammar.pl
+@@ -73,25 +73,6 @@
+ }
+
+ my $fileBase = File::Spec->join($outputDir, $filename);
+-my @bisonCommand = ($bison, "-d", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp");
++my @bisonCommand = ($bison, "--defines=$fileBase.h", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp");
+ push @bisonCommand, "--no-lines" if $^O eq "MSWin32"; # Work around bug in bison >= 3.0 on Windows where it puts backslashes into #line directives.
+ system(@bisonCommand) == 0 or die;
+-
+-open HEADER, ">$fileBase.h" or die;
+-print HEADER << "EOF";
+-#ifndef CSSGRAMMAR_H
+-#define CSSGRAMMAR_H
+-EOF
+-
+-open HPP, "<$fileBase.cpp.h" or open HPP, "<$fileBase.hpp" or die;
+-while () {
+- print HEADER;
+-}
+-close HPP;
+-
+-print HEADER "#endif\n";
+-close HEADER;
+-
+-unlink("$fileBase.cpp.h");
+-unlink("$fileBase.hpp");
+-
diff --git a/desktop/toolkit/qt5/qt5-webkit/pspec.xml b/desktop/toolkit/qt5/qt5-webkit/pspec.xml
index fb3925f46c..c329d4f0c1 100755
--- a/desktop/toolkit/qt5/qt5-webkit/pspec.xml
+++ b/desktop/toolkit/qt5/qt5-webkit/pspec.xml
@@ -45,21 +45,21 @@
glib2-devel
sqlite-devel
python-devel
- qt5-linguist
- qt5-base-devel
- qt5-sql-sqlite
- qt5-qdbusviewer
- qt5-sensors-devel
- qt5-designer-devel
- qt5-location-devel
- qt5-assistant-devel
- qt5-multimedia-devel
- qt5-webchannel-devel
- qt5-declarative-devel
+ qt5-linguist
+ qt5-base-devel
+ qt5-sql-sqlite
+ qt5-qdbusviewer
+ qt5-sensors-devel
+ qt5-designer-devel
+ qt5-location-devel
+ qt5-assistant-devel
+ qt5-multimedia-devel
+ qt5-webchannel-devel
+ qt5-declarative-devel
gst-plugins-base-devel
-
+ d92b11fe.patch
-->
@@ -97,11 +97,11 @@
gstreamer
gst-plugins-base
gst-plugins-base
- qt5-base
- qt5-location
- qt5-sensors
- qt5-webchannel
- qt5-declarative
+ qt5-base
+ qt5-location
+ qt5-sensors
+ qt5-webchannel
+ qt5-declarative
@@ -128,13 +128,20 @@
gstreamer-devel
gst-plugins-base-devel
qt5-webkit
- qt5-base-devel
- qt5-sensors-devel
- qt5-declarative-devel
+ qt5-base-devel
+ qt5-sensors-devel
+ qt5-declarative-devel
+
+ 2020-12-14
+ 5.212.0
+ Rebuild qt5-5.15.2
+ Mustafa Cinasal
+ muscnsl@gmail.com
+
2020-09-09
5.212.0