Rebuild (qt5)

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -1,3 +1,4 @@
 /qtwebkit-opensource-src-5.9.0.tar.xz
 /qtwebkit-5.212.0-alpha2.tar.xz
 /qtwebkit-5.212.0-alpha3.tar.xz
+/qtwebkit-5.212.0-alpha4.tar.xz

qt5-qtwebkit.spec

@@ -4,7 +4,7 @@
 
 %global _hardened_build 1
 
-%global prerel alpha3
+%global prerel alpha4
 %global prerel_tag -%{prerel}
 
 ## NOTE: Lots of files in various subdirectories have the same name (such as
@@ -16,7 +16,7 @@
 
 Name:           qt5-%{qt_module}
 Version:        5.212.0
-Release:        0.43.%{?prerel}%{?dist}
+Release:        0.53.%{?prerel}%{?dist}
 Summary:        Qt5 - QtWebKit components
 
 License:        LGPLv2 and BSD
@@ -25,7 +25,8 @@ Source0:        https://github.com/qtwebkit/qtwebkit/releases/download/%{qt_modu
 
 # Patch for new CMake policy CMP0071 to explicitly use old behaviour.
 Patch2:         qtwebkit-5.212.0_cmake_cmp0071.patch
-Patch3:         qtwebkit-missing-semicolons.patch
+Patch3:         qtwebkit-5.212.0-json.patch
+Patch4:         qtwebkit-bison37.patch
 
 BuildRequires:  bison
 BuildRequires:  cmake
@@ -52,7 +53,7 @@ BuildRequires:  pkgconfig(gstreamer-gl-1.0)
 BuildRequires:  pkgconfig(gstreamer-mpegts-1.0)
 BuildRequires:  perl-generators
 BuildRequires:  perl(File::Copy)
-BuildRequires:  python2
+BuildRequires:  python3
 BuildRequires:  qt5-qtbase-devel
 BuildRequires:  qt5-qtdeclarative-devel
 %if ! 0%{?bootstrap}
@@ -121,6 +122,12 @@ test -f Source/WebCore/Resources/textAreaResizeCorner.png
 
 
 %build
+# QT is known not to work properly with LTO at this point.  Some of the issues
+# are being worked on upstream and disabling LTO should be re-evaluated as
+# we update this change.  Until such time...
+# Disable LTO
+%define _lto_cflags %{nil}
+
 # The following changes of optflags ietc. are adapted from webkitgtk4 package, which
 # is mostly similar to this one...
 #
@@ -146,7 +153,8 @@ CXXFLAGS="${CXXFLAGS:-%optflags} -fpermissive" ; export CXXFLAGS ;
 %{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;}
 # We cannot use default cmake macro here as it overwrites some settings queried
 # by qtwebkit cmake from qmake
-cmake -DPORT=Qt \
+%cmake \
+       -DPORT=Qt \
        -DCMAKE_BUILD_TYPE=Release \
        -DENABLE_TOOLS=OFF \
        -DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \
@@ -158,12 +166,10 @@ cmake -DPORT=Qt \
 %ifarch s390 s390x ppc %{power64}
        -DUSE_SYSTEM_MALLOC=ON \
 %endif
-%if 0%{?docs}
-       -DGENERATE_DOCUMENTATION=ON \
-%endif
-       .
+       %{?docs:-DGENERATE_DOCUMENTATION=ON} \
+       -DPYTHON_EXECUTABLE:PATH="%{__python3}"
 
-%make_build
+%cmake_build
 
 %if 0%{?docs}
 %make_build docs
@@ -171,7 +177,7 @@ cmake -DPORT=Qt \
 
 
 %install
-%make_install
+%cmake_install
 
 find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
@@ -236,6 +242,38 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)"
 
 
 %changelog
+* Fri Nov 20 13:29:15 CET 2020 Jan Grulich <jgrulich@redhat.com> - 5.212.0-0.53.alpha4
+- Rebuild (qt5)
+
+* Fri Sep 11 2020 Jan Grulich <jgrulich@redhat.com> - 5.212.0-0.52.alpha4
+- rebuild (qt5)
+
+* Thu Aug 27 2020 Than Ngo <than@redhat.com> - 5.212.0-0.51.alpha4
+- Fixed #1863719, FTBFS
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.212.0-0.50.alpha4
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.212.0-0.49.alpha4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jul 01 2020 Jeff Law <law@redhat.com> - 5.212.0-0.48.alpha4
+- Disable LTO
+
+* Wed Jun 03 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.212.0-0.47.alpha4
+- rebuild (python39)
+
+* Sun May 17 2020 Pete Walter <pwalter@fedoraproject.org> - 5.212.0-0.46.alpha4
+- Rebuild for ICU 67
+
+* Sat May 16 2020 Pete Walter <pwalter@fedoraproject.org> - 5.212.0-0.45.alpha4
+- Rebuild for ICU 67
+
+* Fri Apr 24 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.212.0-0.44.alpha4
+- 5.212.0-alpha4
+- use python3 (#1807535)
+
 * Sun Apr 05 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.212.0-0.43.alpha3
 - rebuild (qt5)
 

qtwebkit-5.212.0-json.patch

@@ -0,0 +1,12 @@
+diff -up qtwebkit-5.212.0-alpha4/Source/JavaScriptCore/generate-bytecode-files.me qtwebkit-5.212.0-alpha4/Source/JavaScriptCore/generate-bytecode-files
+--- qtwebkit-5.212.0-alpha4/Source/JavaScriptCore/generate-bytecode-files.me	2020-08-27 13:50:06.506653244 +0200
++++ qtwebkit-5.212.0-alpha4/Source/JavaScriptCore/generate-bytecode-files	2020-08-27 14:00:52.802018893 +0200
+@@ -163,7 +163,7 @@ if __name__ == "__main__":
+         initBytecodesFile = openOrExit(initASMFileName, "w")
+ 
+     try:
+-        bytecodeSections = json.load(bytecodeFile, encoding = "utf-8")
++        bytecodeSections = json.load(bytecodeFile)
+     except:
+         print("Unexpected error parsing {0}: {1}".format(bytecodeJSONFile, sys.exc_info()))
+ 

qtwebkit-bison37.patch

@@ -0,0 +1,39 @@
+Description: let Bison generate the header directly
+ 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.
+Author: Dmitry Shachnev <mitya57@debian.org>
+Forwarded: not-yet
+Last-Update: 2020-08-04
+
+--- a/Source/WebCore/css/makegrammar.pl
++++ b/Source/WebCore/css/makegrammar.pl
+@@ -73,25 +73,6 @@ if ($suffix eq ".y.in") {
+ }
+ 
+ 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 (<HPP>) {
+-    print HEADER;
+-}
+-close HPP;
+-
+-print HEADER "#endif\n";
+-close HEADER;
+-
+-unlink("$fileBase.cpp.h");
+-unlink("$fileBase.hpp");
+-

qtwebkit-missing-semicolons.patch

@@ -1,28 +0,0 @@
-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;

sources

@@ -1 +1 @@
-SHA512 (qtwebkit-5.212.0-alpha3.tar.xz) = 38794514b886de3fa63a41277c2bcbb970e87a12070962b527e3898466cf7ad3b65ce4588669498415d365310b37729e81aabb457808fe11120558ef8e35445f
+SHA512 (qtwebkit-5.212.0-alpha4.tar.xz) = 33f11270bd030599beff9c1983a6c5ff2d61f407cc8a6825f7f405d46f9184c720fc7f60c7359f08f828db96a2170092875066a0d5c0a21ff09bc48a2603fbf6