Update to 5.3.0
This commit is contained in:
Jan Grulich
parent
4417a9d361
commit
a9268dc6a1
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +1,2 @@
|
||||
/qtwebkit-opensource-src-5.2.1.tar.xz
|
||||
/qtwebkit-opensource-src-5.3.0.tar.xz
|
||||
|
||||
@ -1,48 +1,13 @@
|
||||
Index: qtwebkit-opensource-src-5.2.0/Source/WTF/wtf/dtoa/utils.h
|
||||
===================================================================
|
||||
--- qtwebkit-opensource-src-5.2.0.orig/Source/WTF/wtf/dtoa/utils.h
|
||||
+++ qtwebkit-opensource-src-5.2.0/Source/WTF/wtf/dtoa/utils.h
|
||||
@@ -49,7 +49,7 @@
|
||||
defined(__ARMEL__) || \
|
||||
defined(_MIPS_ARCH_MIPS32R2)
|
||||
#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
|
||||
-#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA)
|
||||
+#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA) || CPU(AARCH64)
|
||||
#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
|
||||
#elif defined(_M_IX86) || defined(__i386__)
|
||||
#if defined(_WIN32)
|
||||
Index: qtwebkit-opensource-src-5.2.0/Source/WTF/wtf/Platform.h
|
||||
===================================================================
|
||||
--- qtwebkit-opensource-src-5.2.0.orig/Source/WTF/wtf/Platform.h
|
||||
+++ qtwebkit-opensource-src-5.2.0/Source/WTF/wtf/Platform.h
|
||||
@@ -167,6 +167,11 @@
|
||||
#define WTF_CPU_X86_64 1
|
||||
diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
|
||||
index 4594ec8..639f28f 100644
|
||||
--- a/Source/WTF/wtf/Platform.h
|
||||
+++ b/Source/WTF/wtf/Platform.h
|
||||
@@ -342,7 +342,7 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
+/* CPU(AARCH64) - AArch64 */
|
||||
+#if defined(__aarch64__)
|
||||
+#define WTF_CPU_AARCH64 1
|
||||
+#endif
|
||||
+
|
||||
/* CPU(ARM) - ARM, any version*/
|
||||
#define WTF_ARM_ARCH_AT_LEAST(N) (CPU(ARM) && WTF_ARM_ARCH_VERSION >= N)
|
||||
|
||||
@@ -322,7 +327,7 @@
|
||||
|
||||
#endif /* ARM */
|
||||
|
||||
-#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(SPARC)
|
||||
+#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(SPARC) || CPU(AARCH64)
|
||||
-#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(SPARC) || CPU(MIPS64)
|
||||
+#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(SPARC) || CPU(MIPS64) || CPU(AARCH64)
|
||||
#define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
|
||||
#endif
|
||||
|
||||
@@ -725,7 +730,8 @@
|
||||
|| CPU(ALPHA) \
|
||||
|| CPU(SPARC64) \
|
||||
|| CPU(S390X) \
|
||||
- || CPU(PPC64)
|
||||
+ || CPU(PPC64) \
|
||||
+ || CPU(AARCH64)
|
||||
#define WTF_USE_JSVALUE64 1
|
||||
#else
|
||||
#define WTF_USE_JSVALUE32_64 1
|
||||
|
||||
@ -10,17 +10,17 @@
|
||||
|
||||
Summary: Qt5 - QtWebKit components
|
||||
Name: qt5-qtwebkit
|
||||
Version: 5.2.1
|
||||
Release: 4%{?dist}
|
||||
Version: 5.3.0
|
||||
Release: 1%{?dist}
|
||||
|
||||
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
|
||||
# See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html
|
||||
License: LGPLv2 with exceptions or GPLv3 with exceptions
|
||||
Url: http://qt-project.org/
|
||||
%if 0%{?pre:1}
|
||||
Source0: http://download.qt-project.org/development_releases/qt/5.2/%{version}-%{pre}/submodules/%{qt_module}-opensource-src-%{version}-%{pre}.tar.xz
|
||||
Source0: http://download.qt-project.org/development_releases/qt/5.3/%{version}-%{pre}/submodules/%{qt_module}-opensource-src-%{version}-%{pre}.tar.xz
|
||||
%else
|
||||
Source0: http://download.qt-project.org/official_releases/qt/5.2/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz
|
||||
Source0: http://download.qt-project.org/official_releases/qt/5.3/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz
|
||||
%endif
|
||||
|
||||
# Search /usr/lib{,64}/mozilla/plugins-wrapped for browser plugins too
|
||||
@ -50,10 +50,6 @@ Patch8: qtwebkit-opensource-src-5.2.1-no_rpath.patch
|
||||
BuildRequires: angleproject-devel angleproject-static
|
||||
%endif
|
||||
|
||||
# fix build with JIT disabled
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1034940
|
||||
Patch10: qtwebkit-opensource-src-5.2.0-beta1-nojit.patch
|
||||
|
||||
BuildRequires: qt5-qtbase-devel >= %{version}
|
||||
BuildRequires: qt5-qtdeclarative-devel >= %{version}
|
||||
BuildRequires: qt5-qtlocation-devel
|
||||
@ -126,7 +122,6 @@ BuildArch: noarch
|
||||
%endif
|
||||
%patch7 -p1 -b .aarch64
|
||||
%patch8 -p1 -b .no_rpath
|
||||
%patch10 -p1 -b .nojit
|
||||
|
||||
echo "nuke bundled code..."
|
||||
# nuke bundled code
|
||||
@ -203,6 +198,9 @@ popd
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed May 21 2014 Jan Grulich <jgrulich@redhat.com> 5.3.0-1
|
||||
- 5.3.0
|
||||
|
||||
* Mon May 05 2014 Rex Dieter <rdieter@fedoraproject.org> 5.2.1-4
|
||||
- use standard (same as qtbase) .prl sanitation
|
||||
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
diff -up qtwebkit-opensource-src-5.2.0-beta1/Source/JavaScriptCore/bytecode/CodeBlock.cpp.nojit qtwebkit-opensource-src-5.2.0-beta1/Source/JavaScriptCore/bytecode/CodeBlock.cpp
|
||||
--- qtwebkit-opensource-src-5.2.0-beta1/Source/JavaScriptCore/bytecode/CodeBlock.cpp.nojit 2013-11-28 15:43:39.169409385 -0500
|
||||
+++ qtwebkit-opensource-src-5.2.0-beta1/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2013-11-28 15:44:17.399410231 -0500
|
||||
@@ -2947,8 +2947,12 @@ void CodeBlock::countReoptimization()
|
||||
|
||||
unsigned CodeBlock::numberOfDFGCompiles()
|
||||
{
|
||||
+#if ENABLE(JIT)
|
||||
ASSERT(JITCode::isBaselineCode(getJITType()));
|
||||
return (JITCode::isOptimizingJIT(replacement()->getJITType()) ? 1 : 0) + m_reoptimizationRetryCounter;
|
||||
+#else
|
||||
+ return 0;
|
||||
+#endif
|
||||
}
|
||||
|
||||
int32_t CodeBlock::codeTypeThresholdMultiplier() const
|
||||
Loading…
Reference in New Issue
Block a user