parent
b59d810cc2
commit
9648047c7c
1
.gitignore
vendored
1
.gitignore
vendored
@ -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
|
||||
|
@ -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.44.%{?prerel}%{?dist}
|
||||
Summary: Qt5 - QtWebKit components
|
||||
|
||||
License: LGPLv2 and BSD
|
||||
@ -25,7 +25,6 @@ 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
|
||||
|
||||
BuildRequires: bison
|
||||
BuildRequires: cmake
|
||||
@ -52,7 +51,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}
|
||||
@ -146,7 +145,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,10 +158,8 @@ 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
|
||||
|
||||
@ -236,6 +234,10 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)"
|
||||
|
||||
|
||||
%changelog
|
||||
* 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)
|
||||
|
||||
|
@ -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;
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (qtwebkit-5.212.0-alpha3.tar.xz) = 38794514b886de3fa63a41277c2bcbb970e87a12070962b527e3898466cf7ad3b65ce4588669498415d365310b37729e81aabb457808fe11120558ef8e35445f
|
||||
SHA512 (qtwebkit-5.212.0-alpha4.tar.xz) = 33f11270bd030599beff9c1983a6c5ff2d61f407cc8a6825f7f405d46f9184c720fc7f60c7359f08f828db96a2170092875066a0d5c0a21ff09bc48a2603fbf6
|
||||
|
Loading…
x
Reference in New Issue
Block a user