qt5-5.15.3

This commit is contained in:
Rmys
2022-04-18 22:26:51 +03:00
parent ab11ff5e45
commit dbc1e9face
7 changed files with 102 additions and 60 deletions
+3 -3
View File
@@ -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())
@@ -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) {
@@ -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
@@ -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 <libxml/globals.h>
@@ -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
+26 -19
View File
@@ -11,19 +11,19 @@
<Summary>Provides support for web applications using the Chromium browser project</Summary>
<Description>Provides support for web applications using the Chromium browser project</Description>
<License>LGPLv2.1-linking-exception</License>
<Archive sha1sum="cbec2e11561e9c6414417803742248f750e171bd" type="tarbz2">https://invent.kde.org/qt/qt/qtwebengine/-/archive/v5.15.7-lts/qtwebengine-v5.15.7-lts.tar.bz2</Archive>
<Archive sha1sum="27aaae391e039d885b956b473edf8a7d6a1c7de4" type="targz">https://invent.kde.org/qt/qt/qtwebengine-chromium/-/archive/f878faa317d8f58b01565c96e5c2efb8ccdfbddd.tar.gz</Archive>
<Archive sha1sum="59bae67c6a895cd84734d37648862e9bb2ba8ec8" type="tarbz2">https://invent.kde.org/qt/qt/qtwebengine/-/archive/v5.15.9-lts/qtwebengine-v5.15.9-lts.tar.bz2</Archive>
<Archive sha1sum="751b84a9285a6b13fa2f2071cdda52689bfa4042" type="targz">https://invent.kde.org/qt/qt/qtwebengine-chromium/-/archive/b45f07bfbe74c333f1017810c2409e1aa6077a1b.tar.gz</Archive>
<AdditionalFiles>
<AdditionalFile target="qtwebengine-5.15.7-build_fixes-1.patch" permission="0644">qtwebengine-5.15.7-build_fixes-1.patch</AdditionalFile>
</AdditionalFiles>
<BuildDependencies>
<Dependency versionFrom="5.15.2">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.2">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.15.2">qt5-xmlpatterns-devel</Dependency>
<Dependency versionFrom="5.15.2">qt5-location-devel</Dependency>
<Dependency versionFrom="5.15.2">qt5-sensors-devel</Dependency>
<Dependency versionFrom="5.15.2">qt5-webchannel-devel</Dependency>
<Dependency versionFrom="5.15.2">qt5-designer-devel</Dependency>
<Dependency versionFrom="5.15.3">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.3">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.15.3">qt5-xmlpatterns-devel</Dependency>
<Dependency versionFrom="5.15.3">qt5-location-devel</Dependency>
<Dependency versionFrom="5.15.3">qt5-sensors-devel</Dependency>
<Dependency versionFrom="5.15.3">qt5-webchannel-devel</Dependency>
<Dependency versionFrom="5.15.3">qt5-designer-devel</Dependency>
<Dependency>bison</Dependency>
<Dependency>wget</Dependency>
<Dependency versionFrom="16.4.2">nodejs</Dependency>
@@ -88,7 +88,7 @@
</BuildDependencies>
<Patches>
<!-- <Patch level="1">qtbug-86752.patch</Patch> -->
<!-- <Patch>fedora/qtwebengine-everywhere-src-5.15.5-TRUE.patch</Patch> -->
<!-- <Patch>fedora/qtwebengine-everywhere-opensource-src-5.15.5-TRUE.patch</Patch> -->
<!-- <Patch>qtwebengine-5.15.2_p20210220-fixup-CVE-2021-21149-backport.patch</Patch> -->
</Patches>
</Source>
@@ -129,7 +129,7 @@
<Dependency>libopus</Dependency>
<Dependency>libxml2</Dependency>
<Dependency>libvpx</Dependency>
<Dependency versionFrom="5.15.2">qt5-base</Dependency>
<Dependency versionFrom="5.15.3">qt5-base</Dependency>
<Dependency>alsa-lib</Dependency>
<Dependency>harfbuzz</Dependency>
<Dependency>libevent</Dependency>
@@ -139,11 +139,11 @@
<Dependency>libXScrnSaver</Dependency>
<Dependency>libXdamage</Dependency>
<Dependency>libXrender</Dependency>
<Dependency versionFrom="5.15.2">qt5-location</Dependency>
<Dependency versionFrom="5.15.3">qt5-location</Dependency>
<Dependency>libXcomposite</Dependency>
<Dependency>libjpeg-turbo</Dependency>
<Dependency versionFrom="5.15.2">qt5-webchannel</Dependency>
<Dependency versionFrom="5.15.2">qt5-declarative</Dependency>
<Dependency versionFrom="5.15.3">qt5-webchannel</Dependency>
<Dependency versionFrom="5.15.3">qt5-declarative</Dependency>
<Dependency>zlib</Dependency>
<Dependency>minizip</Dependency>
<Dependency>protobuf</Dependency>
@@ -163,17 +163,17 @@
</Files>
<RuntimeDependencies>
<Dependency release="current">qt5-webengine</Dependency>
<Dependency versionFrom="5.15.2">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.2">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.15.2">qt5-location-devel</Dependency>
<Dependency versionFrom="5.15.2">qt5-webchannel-devel</Dependency>
<Dependency versionFrom="5.15.3">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.3">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.15.3">qt5-location-devel</Dependency>
<Dependency versionFrom="5.15.3">qt5-webchannel-devel</Dependency>
</RuntimeDependencies>
</Package>
<Package>
<Name>qt5-webengine-docs</Name>
<RuntimeDependencies>
<Dependency versionFrom="5.15.2">qt5-base</Dependency>
<Dependency versionFrom="5.15.3">qt5-base</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="doc">/usr/share/doc</Path>
@@ -181,6 +181,13 @@
</Package>
<History>
<Update release="26">
<Date>2022-04-18</Date>
<Version>5.15.9</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="25">
<Date>2021-12-01</Date>
<Version>5.15.7</Version>
@@ -0,0 +1,26 @@
From 5b698ba3faffd4e198a45be9fe74f53307395e4b Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.de>
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 <algorithm>
#include <glib.h>
-extern "C" void g_object_unref(gpointer);
-extern "C" gpointer g_object_ref_sink(gpointer);
-
namespace WTF {
enum GRefPtrAdoptType { GRefPtrAdopt };
+28 -19
View File
@@ -43,21 +43,23 @@
<Dependency versionFrom="2.50.2">glib2-devel</Dependency>
<Dependency versionFrom="3.16.2">sqlite-devel</Dependency>
<Dependency versionFrom="2.7.13">python-devel</Dependency>
<Dependency versionFrom="5.15.2">qt5-linguist</Dependency>
<Dependency versionFrom="5.15.2">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.2">qt5-sql-sqlite</Dependency>
<Dependency versionFrom="5.15.2">qt5-qdbusviewer</Dependency>
<Dependency versionFrom="5.15.2">qt5-sensors-devel</Dependency>
<Dependency versionFrom="5.15.2">qt5-designer-devel</Dependency>
<Dependency versionFrom="5.15.2">qt5-location-devel</Dependency>
<Dependency versionFrom="5.15.2">qt5-assistant-devel</Dependency>
<Dependency versionFrom="5.15.2">qt5-multimedia-devel</Dependency>
<Dependency versionFrom="5.15.2">qt5-webchannel-devel</Dependency>
<Dependency versionFrom="5.15.2">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.15.3">qt5-linguist</Dependency>
<Dependency versionFrom="5.15.3">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.3">qt5-sql-sqlite</Dependency>
<Dependency versionFrom="5.15.3">qt5-qdbusviewer</Dependency>
<Dependency versionFrom="5.15.3">qt5-sensors-devel</Dependency>
<Dependency versionFrom="5.15.3">qt5-designer-devel</Dependency>
<Dependency versionFrom="5.15.3">qt5-location-devel</Dependency>
<Dependency versionFrom="5.15.3">qt5-assistant-devel</Dependency>
<Dependency versionFrom="5.15.3">qt5-multimedia-devel</Dependency>
<Dependency versionFrom="5.15.3">qt5-webchannel-devel</Dependency>
<Dependency versionFrom="5.15.3">qt5-declarative-devel</Dependency>
<Dependency versionFrom="1.10.3">gst-plugins-base-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="0">icu68.patch</Patch>
<Patch level="1">glib-2.68.patch</Patch>
<Patch level="1">78360c01.patch</Patch>
<Patch level="1">d92b11fe.patch</Patch>
<!-- <Patch level="1">qt5-webkit-gcc7.patch</Patch> -->
<!-- <Patch level="1">qt5-webkit-null-pointer-dereference.patch</Patch> --> -->
@@ -95,11 +97,11 @@
<Dependency>gstreamer</Dependency>
<Dependency>gst-plugins-base</Dependency>
<Dependency>gst-plugins-base</Dependency>
<Dependency versionFrom="5.15.2">qt5-base</Dependency>
<Dependency versionFrom="5.15.2">qt5-location</Dependency>
<Dependency versionFrom="5.15.2">qt5-sensors</Dependency>
<Dependency versionFrom="5.15.2">qt5-webchannel</Dependency>
<Dependency versionFrom="5.15.2">qt5-declarative</Dependency>
<Dependency versionFrom="5.15.3">qt5-base</Dependency>
<Dependency versionFrom="5.15.3">qt5-location</Dependency>
<Dependency versionFrom="5.15.3">qt5-sensors</Dependency>
<Dependency versionFrom="5.15.3">qt5-webchannel</Dependency>
<Dependency versionFrom="5.15.3">qt5-declarative</Dependency>
</RuntimeDependencies>
</Package>
@@ -126,13 +128,20 @@
<Dependency>gstreamer-devel</Dependency>
<Dependency>gst-plugins-base-devel</Dependency>
<Dependency release="current">qt5-webkit</Dependency>
<Dependency versionFrom="5.15.2">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.2">qt5-sensors-devel</Dependency>
<Dependency versionFrom="5.15.2">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.15.3">qt5-base-devel</Dependency>
<Dependency versionFrom="5.15.3">qt5-sensors-devel</Dependency>
<Dependency versionFrom="5.15.3">qt5-declarative-devel</Dependency>
</RuntimeDependencies>
</Package>
<History>
<Update release="25">
<Date>2022-04-18</Date>
<Version>5.212.0</Version>
<Comment>Rebuild qt5-5.15.3</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="24">
<Date>2020-12-14</Date>
<Version>5.212.0</Version>