diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index d31caf2..3239028 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -12,7 +12,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.2.0 -Release: 0.5.%{pre}%{?dist} +Release: 0.6.%{pre}%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -44,6 +44,10 @@ Patch6: webkit-commit-142567.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} @@ -113,6 +117,7 @@ BuildArch: noarch #patch5 -p1 -b .system_angle %patch6 -p1 -b .svn142567 %endif +%patch10 -p1 -b .nojit echo "nuke bundled code..." # nuke bundled code @@ -127,7 +132,12 @@ mv Source/ThirdParty/ANGLE/ \ %build -%{_qt5_qmake} %{?system_angle:DEFINES+=USE_SYSTEM_ANGLE=1} +%{_qt5_qmake} %{?system_angle:DEFINES+=USE_SYSTEM_ANGLE=1} \ +%ifnarch %{arm} %{ix86} x86_64 + DEFINES+=ENABLE_JIT=0 DEFINES+=ENABLE_YARR_JIT=0 +%else + %{nil} +%endif make %{?_smp_mflags} @@ -196,6 +206,9 @@ popd %changelog +* Thu Nov 28 2013 Dan HorĂ¡k 5.2.0-0.6.beta1 +- disable JIT on secondary arches, fix build with JIT disabled (#1034940) + * Mon Nov 25 2013 Rex Dieter 5.2.0-0.5.beta1 - enable -doc only on primary archs (allow secondary bootstrap) diff --git a/qtwebkit-opensource-src-5.2.0-beta1-nojit.patch b/qtwebkit-opensource-src-5.2.0-beta1-nojit.patch new file mode 100644 index 0000000..00f5074 --- /dev/null +++ b/qtwebkit-opensource-src-5.2.0-beta1-nojit.patch @@ -0,0 +1,16 @@ +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