Hello community, here is the log from the commit of package libqt5-qtwebkit for openSUSE:Factory checked in at 2013-11-29 07:03:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtwebkit (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtwebkit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libqt5-qtwebkit" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtwebkit/libqt5-qtwebkit.changes 2013-11-18 10:53:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libqt5-qtwebkit.new/libqt5-qtwebkit.changes 2013-11-29 07:03:03.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Nov 28 16:41:03 CET 2013 - ro@suse.de + +- fix-no-jit-build.patch: + fix build on ppc and s390 by disabling JIT + +------------------------------------------------------------------- New: ---- fix-no-jit-build.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtwebkit.spec ++++++ --- /var/tmp/diff_new_pack.4LRiJr/_old 2013-11-29 07:03:04.000000000 +0100 +++ /var/tmp/diff_new_pack.4LRiJr/_new 2013-11-29 07:03:04.000000000 +0100 @@ -58,6 +58,8 @@ Patch4: aarch64-support.patch # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch130: no-Werror-rpath.diff +# PATCH-FIX-UPSTREAM fix build with disabled jit +Patch131: fix-no-jit-build.patch BuildRequires: bison BuildRequires: flex BuildRequires: gperf @@ -84,6 +86,7 @@ %patch3 -p1 %patch4 -p1 %patch130 -p1 +%patch131 %package -n %libname Summary: Qt 5 WebKit Library @@ -190,7 +193,11 @@ export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -DOPENSSL_LOAD_CONF" export LDFLAGS="$LDFLAGS -Wl,--reduce-memory-overheads -Wl,--no-keep-memory -Wl,--as-needed" +%ifarch ppc ppc64 s390 s390x +qmake DEFINES+=ENABLE_JIT=0 DEFINES+=ENABLE_YARR_JIT=0 DEFINES+=ENABLE_ASSEMBLER=0 +%else qmake +%endif make %install ++++++ fix-no-jit-build.patch ++++++ --- Source/JavaScriptCore/bytecode/CodeBlock.cpp +++ Source/JavaScriptCore/bytecode/CodeBlock.cpp @@ -2948,7 +2948,11 @@ unsigned CodeBlock::numberOfDFGCompiles() { ASSERT(JITCode::isBaselineCode(getJITType())); +#if ENABLE(JIT) return (JITCode::isOptimizingJIT(replacement()->getJITType()) ? 1 : 0) + m_reoptimizationRetryCounter; +#else + return m_reoptimizationRetryCounter; +#endif } int32_t CodeBlock::codeTypeThresholdMultiplier() const -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org