diff --git a/desktop/toolkit/qt5/qt5-webengine/actions.py b/desktop/toolkit/qt5/qt5-webengine/actions.py index b24c1de2f9..44b084392c 100755 --- a/desktop/toolkit/qt5/qt5-webengine/actions.py +++ b/desktop/toolkit/qt5/qt5-webengine/actions.py @@ -12,12 +12,12 @@ from pisi.actionsapi import get def setup(): shelltools.system("mkdir .git") - pisitools.dosed(".qmake.conf", "5.15.7", "5.15.2") + pisitools.dosed(".qmake.conf", "5.15.9", "5.15.3") shelltools.unlinkDir("src/3rdparty") shelltools.move("../qtwebengine-chromium-*", "src/3rdparty") shelltools.system("mkdir src/3rdparty/chromium/.git") - shelltools.system("patch -p1 < qtwebengine-5.15.7-build_fixes-1.patch") + #shelltools.system("patch -p1 < qtwebengine-5.15.7-build_fixes-1.patch") shelltools.system("sed -i 's/NINJAJOBS/NINJA_JOBS/' src/core/gn_run.pro") @@ -26,7 +26,7 @@ def setup(): #shelltools.system("sh ./qtwebengine-release.sh") - #shelltools.cd("qtwebengine-everywhere-src-%s" % get.srcVERSION()) + #shelltools.cd("qtwebengine-everywhere-opensource-src-%s" % get.srcVERSION()) diff --git a/desktop/toolkit/qt5/qt5-webengine/files/fedora/qtwebengine-everywhere-src-5.15.5-TRUE.patch b/desktop/toolkit/qt5/qt5-webengine/files/fedora/qtwebengine-everywhere-src-5.15.5-TRUE.patch index b61c9233de..10a93246d9 100644 --- a/desktop/toolkit/qt5/qt5-webengine/files/fedora/qtwebengine-everywhere-src-5.15.5-TRUE.patch +++ b/desktop/toolkit/qt5/qt5-webengine/files/fedora/qtwebengine-everywhere-src-5.15.5-TRUE.patch @@ -1,6 +1,6 @@ -diff -up qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/libxml/src/encoding.c.TRUE qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/libxml/src/encoding.c ---- qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/libxml/src/encoding.c.TRUE 2021-05-28 07:05:45.000000000 -0500 -+++ qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/libxml/src/encoding.c 2021-06-24 09:44:41.592468805 -0500 +diff -up qtwebengine-everywhere-opensource-src-5.15.5/src/3rdparty/chromium/third_party/libxml/src/encoding.c.TRUE qtwebengine-everywhere-opensource-src-5.15.5/src/3rdparty/chromium/third_party/libxml/src/encoding.c +--- qtwebengine-everywhere-opensource-src-5.15.5/src/3rdparty/chromium/third_party/libxml/src/encoding.c.TRUE 2021-05-28 07:05:45.000000000 -0500 ++++ qtwebengine-everywhere-opensource-src-5.15.5/src/3rdparty/chromium/third_party/libxml/src/encoding.c 2021-06-24 09:44:41.592468805 -0500 @@ -2004,7 +2004,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler #ifdef LIBXML_ICU_ENABLED else if (handler->uconv_out != NULL) { diff --git a/desktop/toolkit/qt5/qt5-webengine/files/fedora/qtwebengine-release.sh b/desktop/toolkit/qt5/qt5-webengine/files/fedora/qtwebengine-release.sh index cece5b070d..a7b59e72fb 100644 --- a/desktop/toolkit/qt5/qt5-webengine/files/fedora/qtwebengine-release.sh +++ b/desktop/toolkit/qt5/qt5-webengine/files/fedora/qtwebengine-release.sh @@ -2,15 +2,15 @@ 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 +rm -rf qtwebengine-$VERSION qtwebengine-$VERSION.tar.gz qtwebengine-chromium-$CHROMIUMHASH qtwebengine-chromium-$CHROMIUMHASH.tar.gz qtwebengine-everywhere-opensource-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-$VERSION qtwebengine-everywhere-opensource-src-$VERSION || exit $? +cd qtwebengine-everywhere-opensource-src-$VERSION ; syncqt.pl -version $VERSION || exit $? +rmdir ../qtwebengine-everywhere-opensource-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 +# XZ_OPT=-9 tar cJf qtwebengine-everywhere-opensource-src-$VERSION.tar.xz qtwebengine-everywhere-opensource-src-$VERSION || exit $? +# rm -rf qtwebengine-$VERSION qtwebengine-$VERSION.tar.gz qtwebengine-chromium-$CHROMIUMHASH qtwebengine-chromium-$CHROMIUMHASH.tar.gz qtwebengine-everywhere-opensource-src-$VERSION diff --git a/desktop/toolkit/qt5/qt5-webengine/files/qtwebengine-5.15.7-build_fixes-1.patch b/desktop/toolkit/qt5/qt5-webengine/files/qtwebengine-5.15.7-build_fixes-1.patch index 9fcca0d9f8..387f5ca215 100644 --- a/desktop/toolkit/qt5/qt5-webengine/files/qtwebengine-5.15.7-build_fixes-1.patch +++ b/desktop/toolkit/qt5/qt5-webengine/files/qtwebengine-5.15.7-build_fixes-1.patch @@ -47,9 +47,9 @@ is older than ours, it's not a problem when building with the internal version of ICU. Users who have installed ICU before libxml2 are exempt from running into this issue. -diff -Naurp qtwebengine-everywhere-src-5.15.2.orig/src/3rdparty/chromium/third_party/libxml/src/encoding.c qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/third_party/libxml/src/encoding.c ---- qtwebengine-everywhere-src-5.15.2.orig/src/3rdparty/chromium/third_party/libxml/src/encoding.c 2020-11-06 19:22:36.000000000 -0600 -+++ qtwebengine-everywhere-src-5.15.2/src/3rdparty/chromium/third_party/libxml/src/encoding.c 2020-12-08 19:39:00.607894718 -0600 +diff -Naurp qtwebengine-everywhere-opensource-src-5.15.2.orig/src/3rdparty/chromium/third_party/libxml/src/encoding.c qtwebengine-everywhere-opensource-src-5.15.2/src/3rdparty/chromium/third_party/libxml/src/encoding.c +--- qtwebengine-everywhere-opensource-src-5.15.2.orig/src/3rdparty/chromium/third_party/libxml/src/encoding.c 2020-11-06 19:22:36.000000000 -0600 ++++ qtwebengine-everywhere-opensource-src-5.15.2/src/3rdparty/chromium/third_party/libxml/src/encoding.c 2020-12-08 19:39:00.607894718 -0600 @@ -44,7 +44,7 @@ #endif #include @@ -257,7 +257,7 @@ diff -Naur a/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/ Sixth: a patch to compile breakpad on glibc-2.34, found at fedora The breakpad part of -https://src.fedoraproject.org/rpms/qt5-qtwebengine/raw/rawhide/f/qtwebengine-everywhere-src-5.15.5-SIGSTKSZ.patch +https://src.fedoraproject.org/rpms/qt5-qtwebengine/raw/rawhide/f/qtwebengine-everywhere-opensource-src-5.15.5-SIGSTKSZ.patch (abseil already fixed) diff -Naur a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc @@ -300,9 +300,9 @@ diff -ur a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_poli return RestrictClockID(); } -diff -up qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h.sandbox-time64-syscalls qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h ---- qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h.sandbox-time64-syscalls 2021-06-24 10:36:45.694826524 -0500 -+++ qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h 2021-06-24 10:37:50.383852263 -0500 +diff -up qtwebengine-everywhere-opensource-src-5.15.5/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h.sandbox-time64-syscalls qtwebengine-everywhere-opensource-src-5.15.5/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h +--- qtwebengine-everywhere-opensource-src-5.15.5/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h.sandbox-time64-syscalls 2021-06-24 10:36:45.694826524 -0500 ++++ qtwebengine-everywhere-opensource-src-5.15.5/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h 2021-06-24 10:37:50.383852263 -0500 @@ -1441,6 +1441,14 @@ #define __NR_io_pgetevents (__NR_SYSCALL_BASE+399) #endif @@ -318,9 +318,9 @@ diff -up qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/s // ARM private syscalls. #if !defined(__ARM_NR_BASE) #define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000) -diff -up qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/system_headers/mips_linux_syscalls.h.sandbox-time64-syscalls qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/system_headers/mips_linux_syscalls.h ---- qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/system_headers/mips_linux_syscalls.h.sandbox-time64-syscalls 2021-05-28 07:05:45.000000000 -0500 -+++ qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/system_headers/mips_linux_syscalls.h 2021-06-24 10:36:45.695826525 -0500 +diff -up qtwebengine-everywhere-opensource-src-5.15.5/src/3rdparty/chromium/sandbox/linux/system_headers/mips_linux_syscalls.h.sandbox-time64-syscalls qtwebengine-everywhere-opensource-src-5.15.5/src/3rdparty/chromium/sandbox/linux/system_headers/mips_linux_syscalls.h +--- qtwebengine-everywhere-opensource-src-5.15.5/src/3rdparty/chromium/sandbox/linux/system_headers/mips_linux_syscalls.h.sandbox-time64-syscalls 2021-05-28 07:05:45.000000000 -0500 ++++ qtwebengine-everywhere-opensource-src-5.15.5/src/3rdparty/chromium/sandbox/linux/system_headers/mips_linux_syscalls.h 2021-06-24 10:36:45.695826525 -0500 @@ -1433,4 +1433,12 @@ #define __NR_memfd_create (__NR_Linux + 354) #endif diff --git a/desktop/toolkit/qt5/qt5-webengine/pspec.xml b/desktop/toolkit/qt5/qt5-webengine/pspec.xml index 80971e35c4..53507270a7 100755 --- a/desktop/toolkit/qt5/qt5-webengine/pspec.xml +++ b/desktop/toolkit/qt5/qt5-webengine/pspec.xml @@ -11,19 +11,19 @@ Provides support for web applications using the Chromium browser project Provides support for web applications using the Chromium browser project LGPLv2.1-linking-exception - https://invent.kde.org/qt/qt/qtwebengine/-/archive/v5.15.7-lts/qtwebengine-v5.15.7-lts.tar.bz2 - https://invent.kde.org/qt/qt/qtwebengine-chromium/-/archive/f878faa317d8f58b01565c96e5c2efb8ccdfbddd.tar.gz + https://invent.kde.org/qt/qt/qtwebengine/-/archive/v5.15.9-lts/qtwebengine-v5.15.9-lts.tar.bz2 + https://invent.kde.org/qt/qt/qtwebengine-chromium/-/archive/b45f07bfbe74c333f1017810c2409e1aa6077a1b.tar.gz qtwebengine-5.15.7-build_fixes-1.patch - 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 wget nodejs @@ -88,7 +88,7 @@ - + @@ -129,7 +129,7 @@ libopus libxml2 libvpx - qt5-base + qt5-base alsa-lib harfbuzz libevent @@ -139,11 +139,11 @@ libXScrnSaver libXdamage libXrender - qt5-location + qt5-location libXcomposite libjpeg-turbo - qt5-webchannel - qt5-declarative + qt5-webchannel + qt5-declarative zlib minizip protobuf @@ -163,17 +163,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 @@ -181,6 +181,13 @@ + + 2022-04-18 + 5.15.9 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2021-12-01 5.15.7 diff --git a/desktop/toolkit/qt5/qt5-webkit/files/glib-2.68.patch b/desktop/toolkit/qt5/qt5-webkit/files/glib-2.68.patch new file mode 100644 index 0000000000..3df6078963 --- /dev/null +++ b/desktop/toolkit/qt5/qt5-webkit/files/glib-2.68.patch @@ -0,0 +1,26 @@ +From 5b698ba3faffd4e198a45be9fe74f53307395e4b Mon Sep 17 00:00:00 2001 +From: Fabian Vogt +Date: Wed, 7 Apr 2021 13:38:09 +0200 +Subject: [PATCH] Remove invalid g_object declarations to fix build with glib + >= 2.68 + +g_object_ref_sink is defined as a macro meanwhile and so the build fails. +Just remove the declarations, glib.h is included anyway. +--- + Source/WTF/wtf/glib/GRefPtr.h | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/Source/WTF/wtf/glib/GRefPtr.h b/Source/WTF/wtf/glib/GRefPtr.h +index 06133d82cb35..d9a1d2f145f5 100644 +--- a/Source/WTF/wtf/glib/GRefPtr.h ++++ b/Source/WTF/wtf/glib/GRefPtr.h +@@ -29,9 +29,6 @@ + #include + #include + +-extern "C" void g_object_unref(gpointer); +-extern "C" gpointer g_object_ref_sink(gpointer); +- + namespace WTF { + + enum GRefPtrAdoptType { GRefPtrAdopt }; diff --git a/desktop/toolkit/qt5/qt5-webkit/pspec.xml b/desktop/toolkit/qt5/qt5-webkit/pspec.xml index 8ffaf11f8c..4b7f16a754 100755 --- a/desktop/toolkit/qt5/qt5-webkit/pspec.xml +++ b/desktop/toolkit/qt5/qt5-webkit/pspec.xml @@ -43,21 +43,23 @@ 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 icu68.patch + glib-2.68.patch + 78360c01.patch d92b11fe.patch --> @@ -95,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 @@ -126,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 + + 2022-04-18 + 5.212.0 + Rebuild qt5-5.15.3 + Mustafa Cinasal + muscnsl@gmail.com + 2020-12-14 5.212.0