Compare commits
25 Commits
f29-riscv6
...
master
Author | SHA1 | Date |
---|---|---|
Rex Dieter | b59d810cc2 | |
Rex Dieter | fc947f145e | |
Fedora Release Engineering | 42c51517d5 | |
Troy Dawson | 0d179f3863 | |
Jan Grulich | 309d4a0b4d | |
Jan Grulich | 83158077aa | |
Jan Grulich | da8a759069 | |
Fedora Release Engineering | 18535d7421 | |
Rex Dieter | 63353305fc | |
Rex Dieter | a71dddbdb6 | |
Jan Grulich | a234086b5e | |
Jan Grulich | 33f0d0327c | |
Rex Dieter | 9f54555dc8 | |
Fedora Release Engineering | 12d06fbac8 | |
Pete Walter | bee5546887 | |
Rex Dieter | abf8d52e3d | |
Rex Dieter | 884856c6b4 | |
Rex Dieter | 041784405b | |
Rex Dieter | b5f618bb38 | |
Jan Grulich | 260c951c5a | |
Rex Dieter | 573af481ea | |
Christian Dersch | 1dfa492be4 | |
Rex Dieter | 94f8c4ca54 | |
Fedora Release Engineering | 56d03a6014 | |
Pete Walter | 79c3dd196f |
|
@ -1,2 +1,3 @@
|
|||
/qtwebkit-opensource-src-5.9.0.tar.xz
|
||||
/qtwebkit-5.212.0-alpha2.tar.xz
|
||||
/qtwebkit-5.212.0-alpha3.tar.xz
|
||||
|
|
|
@ -1,24 +0,0 @@
|
|||
From 5648446933f52fe479d0a9006f6393a81a790116 Mon Sep 17 00:00:00 2001
|
||||
From: Konstantin Tokarev <annulen@yandex.ru>
|
||||
Date: Thu, 25 May 2017 00:49:22 +0300
|
||||
Subject: [PATCH 031/143] Disable ES6 Proxy object
|
||||
|
||||
Change-Id: Ifd6404e254b242afa8dd563c03f9588b4b05ab93
|
||||
---
|
||||
Source/JavaScriptCore/runtime/JSGlobalObject.cpp | 3 +
|
||||
91 files changed, 17 insertions(+), 1379 deletions(-)
|
||||
diff --git a/Source/JavaScriptCore/runtime/JSGlobalObject.cpp b/Source/JavaScriptCore/runtime/JSGlobalObject.cpp
|
||||
index 9e613a21215..7d57590b4c5 100644
|
||||
--- a/Source/JavaScriptCore/runtime/JSGlobalObject.cpp
|
||||
+++ b/Source/JavaScriptCore/runtime/JSGlobalObject.cpp
|
||||
@@ -458,7 +458,10 @@ m_ ## lowerName ## Prototype->putDirectWithoutTransition(vm, vm.propertyNames->c
|
||||
putDirectWithoutTransition(vm, vm.propertyNames->TypeError, m_typeErrorConstructor.get(), DontEnum);
|
||||
putDirectWithoutTransition(vm, vm.propertyNames->URIError, m_URIErrorConstructor.get(), DontEnum);
|
||||
|
||||
+#if !PLATFORM(QT)
|
||||
+ // Disable ES6 Proxy because our implementation is not compliant with what real world code expects
|
||||
putDirectWithoutTransition(vm, vm.propertyNames->Proxy, ProxyConstructor::create(vm, ProxyConstructor::createStructure(vm, this, m_functionPrototype.get())), DontEnum);
|
||||
+#endif
|
||||
|
||||
|
||||
#define PUT_CONSTRUCTOR_FOR_SIMPLE_TYPE(capitalName, lowerName, properName, instanceType, jsName) \
|
|
@ -1,12 +0,0 @@
|
|||
diff -Naur qtwebkit/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp qtwebkit.new/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp
|
||||
--- qtwebkit/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp 2017-10-23 17:25:58.941518553 +0200
|
||||
+++ qtwebkit.new/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp 2017-10-23 17:27:44.223917497 +0200
|
||||
@@ -961,6 +961,8 @@
|
||||
FrameView* view = frame->view();
|
||||
ASSERT(view);
|
||||
view->resize(size);
|
||||
+ if (view->needsLayout())
|
||||
+ view->layout();
|
||||
view->adjustViewSize();
|
||||
}
|
||||
|
|
@ -1,9 +1,10 @@
|
|||
%undefine _annotated_build
|
||||
|
||||
%global qt_module qtwebkit
|
||||
|
||||
%global _hardened_build 1
|
||||
|
||||
%global prerel alpha2
|
||||
%global prerel alpha3
|
||||
%global prerel_tag -%{prerel}
|
||||
|
||||
## NOTE: Lots of files in various subdirectories have the same name (such as
|
||||
|
@ -15,35 +16,24 @@
|
|||
|
||||
Name: qt5-%{qt_module}
|
||||
Version: 5.212.0
|
||||
Release: 0.23.%{?prerel}%{?dist}
|
||||
Release: 0.43.%{?prerel}%{?dist}
|
||||
Summary: Qt5 - QtWebKit components
|
||||
|
||||
License: LGPLv2 and BSD
|
||||
URL: https://github.com/annulen/webkit
|
||||
Source0: %{url}/releases/download/%{qt_module}-%{version}%{?prerel_tag}/%{qt_module}-%{version}%{?prerel_tag}.tar.xz
|
||||
|
||||
# Upstream patch to fix pagewidth issue with trojita
|
||||
# https://github.com/annulen/webkit/issues/511
|
||||
# https://github.com/annulen/webkit/commit/6faf11215e1af27d35e921ae669aa0251a01a1ab
|
||||
# https://github.com/annulen/webkit/commit/76420459a13d9440b41864c93cb4ebb404bdab55
|
||||
Patch0: qt5-qtwebkit-5.212.0-alpha2-fix-pagewidth.patch
|
||||
|
||||
# Patch from Kevin Kofler to fix https://github.com/annulen/webkit/issues/573
|
||||
Patch1: qtwebkit-5.212.0-alpha2-fix-null-pointer-dereference.patch
|
||||
URL: https://github.com/qtwebkit/qtwebkit
|
||||
Source0: https://github.com/qtwebkit/qtwebkit/releases/download/%{qt_module}-%{version}%{?prerel_tag}/%{qt_module}-%{version}%{?prerel_tag}.tar.xz
|
||||
|
||||
# Patch for new CMake policy CMP0071 to explicitly use old behaviour.
|
||||
Patch2: qtwebkit-5.212.0_cmake_cmp0071.patch
|
||||
|
||||
# Patch to fix for missing source file.
|
||||
Patch3: qtwebkit-5.212.0_fix_missing_sources.patch
|
||||
|
||||
# disable ES6 Proxy
|
||||
Patch31: 0031-Disable-ES6-Proxy-object.patch
|
||||
Patch3: qtwebkit-missing-semicolons.patch
|
||||
|
||||
BuildRequires: bison
|
||||
BuildRequires: cmake
|
||||
BuildRequires: flex
|
||||
BuildRequires: pkgconfig(fontconfig)
|
||||
%if 0%{?rhel} != 8
|
||||
BuildRequires: pkgconfig(libwoff2dec)
|
||||
%endif
|
||||
BuildRequires: pkgconfig(gio-2.0)
|
||||
BuildRequires: pkgconfig(glib-2.0)
|
||||
BuildRequires: gperf
|
||||
|
@ -61,18 +51,22 @@ BuildRequires: pkgconfig(gl)
|
|||
BuildRequires: pkgconfig(gstreamer-gl-1.0)
|
||||
BuildRequires: pkgconfig(gstreamer-mpegts-1.0)
|
||||
BuildRequires: perl-generators
|
||||
BuildRequires: perl(File::Copy)
|
||||
BuildRequires: python2
|
||||
BuildRequires: qt5-qtbase-devel
|
||||
BuildRequires: pkgconfig(Qt5Quick)
|
||||
BuildRequires: qt5-qtdeclarative-devel
|
||||
%if ! 0%{?bootstrap}
|
||||
BuildRequires: pkgconfig(Qt5Location)
|
||||
BuildRequires: pkgconfig(Qt5Sensors)
|
||||
BuildRequires: pkgconfig(Qt5WebChannel)
|
||||
BuildRequires: qt5-qtlocation-devel
|
||||
BuildRequires: qt5-qtsensors-devel
|
||||
BuildRequires: qt5-qtwebchannel-devel
|
||||
%endif
|
||||
BuildRequires: pkgconfig(ruby)
|
||||
BuildRequires: rubygems
|
||||
BuildRequires: pkgconfig(sqlite3)
|
||||
BuildRequires: pkgconfig(zlib)
|
||||
# workaround bad embedded png files, https://bugzilla.redhat.com/1639422
|
||||
BuildRequires: findutils
|
||||
BuildRequires: pngcrush
|
||||
|
||||
BuildRequires: qt5-qtbase-private-devel
|
||||
%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
|
||||
|
@ -118,6 +112,13 @@ BuildArch: noarch
|
|||
%prep
|
||||
%autosetup -p1 -n %{qt_module}-%{version}%{?prerel_tag}
|
||||
|
||||
# find/fix pngs with "libpng warning: iCCP: known incorrect sRGB profile"
|
||||
find -name \*.png | xargs -n1 pngcrush -ow -fix
|
||||
|
||||
# ppc64le failed once with
|
||||
# make[2]: *** No rule to make target 'Source/WebCore/Resources/textAreaResizeCorner.png', needed by 'Source/WebKit/qrc_WebCore.cpp'. Stop.
|
||||
test -f Source/WebCore/Resources/textAreaResizeCorner.png
|
||||
|
||||
|
||||
%build
|
||||
# The following changes of optflags ietc. are adapted from webkitgtk4 package, which
|
||||
|
@ -175,12 +176,13 @@ cmake -DPORT=Qt \
|
|||
find %{buildroot} -name '*.la' -exec rm -f {} ';'
|
||||
|
||||
# fix pkgconfig files
|
||||
sed -i '/Name/a Description: Qt5 WebKit module' %{buildroot}%{_libdir}/pkgconfig/Qt5WebKit.pc
|
||||
sed -i "s,Cflags: -I%{_qt5_libdir}/qt5/../../include/qt5/Qt5WebKit,Cflags: -I%{_qt5_headerdir}/QtWebKit,g" %{buildroot}%{_libdir}/pkgconfig/Qt5WebKit.pc
|
||||
#sed -i '/Name/a Description: Qt5 WebKit module' %{buildroot}%{_libdir}/pkgconfig/Qt5WebKit.pc
|
||||
#sed -i "s,Cflags: -I%{_qt5_libdir}/qt5/../../include/qt5/Qt5WebKit,Cflags: -I%{_qt5_headerdir}/QtWebKit,g" %{buildroot}%{_libdir}/pkgconfig/Qt5WebKit.pc
|
||||
# strictly speaking, this isn't *wrong*, but can made more readable, so let's do that
|
||||
sed -i "s,Libs: -L%{_qt5_libdir}/qt5/../ -lQt5WebKit,Libs: -L%{_qt5_libdir} -lQt5WebKit ,g" %{buildroot}%{_libdir}/pkgconfig/Qt5WebKit.pc
|
||||
|
||||
sed -i '/Name/a Description: Qt5 WebKitWidgets module' %{buildroot}%{_libdir}/pkgconfig/Qt5WebKitWidgets.pc
|
||||
sed -i "s,Cflags: -I%{_qt5_libdir}/qt5/../../include/qt5/Qt5WebKitWidgets,Cflags: -I%{_qt5_headerdir}/QtWebKitWidgets,g" %{buildroot}%{_libdir}/pkgconfig/Qt5WebKitWidgets.pc
|
||||
#sed -i '/Name/a Description: Qt5 WebKitWidgets module' %{buildroot}%{_libdir}/pkgconfig/Qt5WebKitWidgets.pc
|
||||
#sed -i "s,Cflags: -I%{_qt5_libdir}/qt5/../../include/qt5/Qt5WebKitWidgets,Cflags: -I%{_qt5_headerdir}/QtWebKitWidgets,g" %{buildroot}%{_libdir}/pkgconfig/Qt5WebKitWidgets.pc
|
||||
sed -i "s,Libs: -L%{_qt5_libdir}/qt5/../ -lQt5WebKitWidgets,Libs: -L%{_qt5_libdir} -lQt5WebKitWidgets ,g" %{buildroot}%{_libdir}/pkgconfig/Qt5WebKitWidgets.pc
|
||||
|
||||
# Finally, copy over and rename various files for %%license inclusion
|
||||
|
@ -200,22 +202,24 @@ sed -i "s,Libs: -L%{_qt5_libdir}/qt5/../ -lQt5WebKitWidgets,Libs: -L%{_qt5_libdi
|
|||
%add_to_license_files Source/WTF/wtf/dtoa/LICENSE
|
||||
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
%check
|
||||
# verify Qt5WebKit cflags non-use of -I/.../Qt5WebKit
|
||||
export PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig
|
||||
test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)"
|
||||
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
%ldconfig_scriptlets
|
||||
|
||||
%files
|
||||
%license LICENSE.LGPLv21 _license_files/*
|
||||
%{_qt5_libdir}/libQt5WebKit.so.5*
|
||||
%{_qt5_libdir}/libQt5WebKitWidgets.so.5*
|
||||
%{_qt5_libexecdir}/QtWebDatabaseProcess
|
||||
%{_qt5_libexecdir}/QtWebNetworkProcess
|
||||
%{_qt5_libexecdir}/QtWebPluginProcess
|
||||
%{_qt5_libexecdir}/QtWebProcess
|
||||
%{_qt5_libexecdir}/QtWebStorageProcess
|
||||
%{_qt5_archdatadir}/qml/QtWebKit/
|
||||
|
||||
|
||||
%files devel
|
||||
%{_qt5_headerdir}/Qt*/
|
||||
%{_qt5_libdir}/libQt5*.so
|
||||
|
@ -232,6 +236,67 @@ sed -i "s,Libs: -L%{_qt5_libdir}/qt5/../ -lQt5WebKitWidgets,Libs: -L%{_qt5_libdi
|
|||
|
||||
|
||||
%changelog
|
||||
* Sun Apr 05 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.212.0-0.43.alpha3
|
||||
- rebuild (qt5)
|
||||
|
||||
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.212.0-0.42.alpha3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Mon Dec 09 2019 Jan Grulich <jgrulich@redhat.com> - 5.212.0-0.41.alpha3
|
||||
- rebuild (qt5)
|
||||
|
||||
* Tue Sep 24 2019 Jan Grulich <jgrulich@redhat.com> - 5.212.0-0.40.alpha3
|
||||
- rebuild (qt5)
|
||||
|
||||
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.212.0-0.39.alpha3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Tue Jul 16 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.212.0-0.38.alpha3
|
||||
- rebuild
|
||||
|
||||
* Tue Jul 02 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.212.0-0.37.alpha3
|
||||
- 5.212.0 alpha 3
|
||||
|
||||
* Tue Jun 11 2019 Jan Grulich <jgrulich@redhat.com> - 5.212.0-0.36.alpha2
|
||||
- rebuild (qt5)
|
||||
|
||||
* Tue Jun 04 2019 Jan Grulich <jgrulich@redhat.com> - 5.212.0-0.35.alpha2
|
||||
- rebuild (qt5)
|
||||
|
||||
* Fri Feb 15 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.212.0-0.34.alpha2
|
||||
- rebuild (qt5)
|
||||
|
||||
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.212.0-0.33.alpha2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Wed Jan 23 2019 Pete Walter <pwalter@fedoraproject.org> - 5.212.0-0.32.alpha2
|
||||
- Rebuild for ICU 63
|
||||
|
||||
* Tue Dec 11 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.212.0-0.31.alpha
|
||||
- rebuild (qt5)
|
||||
|
||||
* Sat Nov 24 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.212.0-0.30.alpha
|
||||
- QtWebkit bundles malformed PNG files (#1639422)
|
||||
|
||||
* Fri Sep 21 2018 Jan Grulich <jgrulich@redhat.com> - 5.212.0-0.29.alpha2
|
||||
- rebuild (qt5)
|
||||
|
||||
* Tue Aug 21 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.212.0-0.28.alpha2
|
||||
- revert to real package names for core qt5 deps
|
||||
|
||||
* Wed Jul 25 2018 Christian Dersch <lupinix@fedoraproject.org> - 5.212.0-0.27.alpha2
|
||||
- Disable annobin for now, workaround for RHBZ #1608549
|
||||
|
||||
* Tue Jul 24 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.212.0-0.26.alpha2
|
||||
- backport some pkgconfig-related upstream fixes
|
||||
- use %%ldconfig_scriptlets
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.212.0-0.25.alpha2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Tue Jul 10 2018 Pete Walter <pwalter@fedoraproject.org> - 5.212.0-0.24.alpha2
|
||||
- Rebuild for ICU 62
|
||||
|
||||
* Wed Jun 20 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.212.0-0.23.alpha2
|
||||
- rebuild (qt5)
|
||||
|
||||
|
|
|
@ -1,15 +0,0 @@
|
|||
diff -ur qtwebkit-5.212.0-alpha2/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp qtwebkit-5.212.0-alpha2-fix-null-pointer-dereference/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp
|
||||
--- qtwebkit-5.212.0-alpha2/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp 2017-06-09 16:11:36.000000000 +0200
|
||||
+++ qtwebkit-5.212.0-alpha2-fix-null-pointer-dereference/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp 2017-10-24 21:44:40.504943501 +0200
|
||||
@@ -390,7 +390,10 @@
|
||||
|
||||
QString QWebPageAdapter::selectedHtml() const
|
||||
{
|
||||
- return page->focusController().focusedOrMainFrame().editor().selectedRange()->toHTML();
|
||||
+ RefPtr<Range> range = page->focusController().focusedOrMainFrame().editor().selectedRange();
|
||||
+ if (!range)
|
||||
+ return QString();
|
||||
+ return range->toHTML();
|
||||
}
|
||||
|
||||
bool QWebPageAdapter::isContentEditable() const
|
|
@ -1,20 +0,0 @@
|
|||
Index: qtwebkit-5.212.0-alpha2/Source/WebKit/PlatformQt.cmake
|
||||
===================================================================
|
||||
--- qtwebkit-5.212.0-alpha2.orig/Source/WebKit/PlatformQt.cmake
|
||||
+++ qtwebkit-5.212.0-alpha2/Source/WebKit/PlatformQt.cmake
|
||||
@@ -786,6 +786,7 @@ if (COMPILER_IS_GCC_OR_CLANG)
|
||||
set_source_files_properties(
|
||||
qt/Api/qwebdatabase.cpp
|
||||
qt/Api/qwebelement.cpp
|
||||
+ qt/Api/qwebfullscreenrequest.cpp
|
||||
qt/Api/qwebhistory.cpp
|
||||
qt/Api/qwebhistoryinterface.cpp
|
||||
qt/Api/qwebpluginfactory.cpp
|
||||
@@ -795,7 +796,6 @@ if (COMPILER_IS_GCC_OR_CLANG)
|
||||
|
||||
qt/WidgetApi/qgraphicswebview.cpp
|
||||
qt/WidgetApi/qwebframe.cpp
|
||||
- qt/WidgetApi/qwebfullscreenrequest.cpp
|
||||
qt/WidgetApi/qwebinspector.cpp
|
||||
qt/WidgetApi/qwebpage.cpp
|
||||
qt/WidgetApi/qwebview.cpp
|
|
@ -0,0 +1,28 @@
|
|||
diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
|
||||
index 1bca2d0..19355f1 100644
|
||||
--- a/Source/WebCore/dom/Document.cpp
|
||||
+++ b/Source/WebCore/dom/Document.cpp
|
||||
@@ -4407,12 +4407,12 @@ static bool isValidNameNonASCII(const UChar* characters, unsigned length)
|
||||
unsigned i = 0;
|
||||
|
||||
UChar32 c;
|
||||
- U16_NEXT(characters, i, length, c)
|
||||
+ U16_NEXT(characters, i, length, c);
|
||||
if (!isValidNameStart(c))
|
||||
return false;
|
||||
|
||||
while (i < length) {
|
||||
- U16_NEXT(characters, i, length, c)
|
||||
+ U16_NEXT(characters, i, length, c);
|
||||
if (!isValidNamePart(c))
|
||||
return false;
|
||||
}
|
||||
@@ -4474,7 +4474,7 @@ bool Document::parseQualifiedName(const String& qualifiedName, String& prefix, S
|
||||
|
||||
for (unsigned i = 0; i < length;) {
|
||||
UChar32 c;
|
||||
- U16_NEXT(qualifiedName, i, length, c)
|
||||
+ U16_NEXT(qualifiedName, i, length, c);
|
||||
if (c == ':') {
|
||||
if (sawColon) {
|
||||
ec = NAMESPACE_ERR;
|
2
sources
2
sources
|
@ -1 +1 @@
|
|||
SHA512 (qtwebkit-5.212.0-alpha2.tar.xz) = b15985aab20c5618dc1f71a0d91f02dbed993516272090a4a12990714bf4c9554ccbdcf9d6a143bf46fcc2c170f691e571114d61686fe49791f8d5c540785758
|
||||
SHA512 (qtwebkit-5.212.0-alpha3.tar.xz) = 38794514b886de3fa63a41277c2bcbb970e87a12070962b527e3898466cf7ad3b65ce4588669498415d365310b37729e81aabb457808fe11120558ef8e35445f
|
||||
|
|
Loading…
Reference in New Issue