Compare commits

...

4 Commits

Author SHA1 Message Date
Than Ngo 4e334f7b15 workaround, disable parallel compilation as it fails to compile in brew 2015-03-19 15:18:57 +01:00
Than Ngo 2351fafbe3 fix build failure with new gcc5 2015-03-18 17:29:23 +01:00
Jan Grulich 0c30f11c7a Try to use 'make -j2' to make sure it builds 2015-03-04 19:06:54 +01:00
Jan Grulich 39f3d79b5f Rebuild (gcc5) 2015-03-04 11:11:03 +01:00
2 changed files with 28 additions and 2 deletions

14
qt5-qtwebkit-gcc5-patch Normal file
View File

@ -0,0 +1,14 @@
diff -up qtwebkit-opensource-src-5.4.0/Source/JavaScriptCore/runtime/JSObject.cpp.than qtwebkit-opensource-src-5.4.0/Source/JavaScriptCore/runtime/JSObject.cpp
--- qtwebkit-opensource-src-5.4.0/Source/JavaScriptCore/runtime/JSObject.cpp.than 2015-03-18 10:24:38.683352327 -0400
+++ qtwebkit-opensource-src-5.4.0/Source/JavaScriptCore/runtime/JSObject.cpp 2015-03-18 10:25:21.953352327 -0400
@@ -1909,6 +1909,10 @@ void JSObject::putByIndexBeyondVectorLen
}
}
+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<ContiguousShape>(ExecState* exec, unsigned i, JSValue value);
+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<DoubleShape>(ExecState* exec, unsigned i, JSValue value);
+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<Int32Shape>(ExecState* exec, unsigned i, JSValue value);
+
void JSObject::putByIndexBeyondVectorLengthWithArrayStorage(ExecState* exec, unsigned i, JSValue value, bool shouldThrow, ArrayStorage* storage)
{
VM& vm = exec->vm();

View File

@ -13,7 +13,7 @@
Summary: Qt5 - QtWebKit components
Name: qt5-qtwebkit
Version: 5.4.0
Release: 4%{?dist}
Release: 6%{?dist}
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
# See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html
@ -51,6 +51,9 @@ Patch8: qtwebkit-opensource-src-5.2.1-no_rpath.patch
# fix GMutexLocker build issue
Patch9: qtwebkit-opensource-src-5.4.0-mutexlocker.patch
# fix gcc5 template issue
Patch10: qt5-qtwebkit-gcc5-patch
%if 0%{?system_angle}
BuildRequires: angleproject-devel angleproject-static
%endif
@ -128,6 +131,7 @@ BuildArch: noarch
%patch7 -p1 -b .aarch64
%patch8 -p1 -b .no_rpath
%patch9 -p1 -b .MutexLocker
%patch10 -p1 -b .gcc5-template
echo "nuke bundled code..."
# nuke bundled code
@ -151,7 +155,9 @@ pushd %{_target_platform}
DEFINES+=ENABLE_JIT=0 DEFINES+=ENABLE_YARR_JIT=0
%endif
make %{?_smp_mflags}
# workaround, disable parallel compilation as it fails to compile in brew
# make %{?_smp_mflags}
make -j2
%if 0%{?docs}
make %{?_smp_mflags} docs
@ -207,6 +213,12 @@ popd
%changelog
* Wed Mar 18 2015 Than Ngo <than@redhat.com> 5.4.0-6
- fix build failure with new gcc5
* Wed Mar 04 2015 Jan Grulich <jgrulich@redhat.com> 5.4.0-5
- rebuild (gcc5)
* Tue Feb 17 2015 Than Ngo <than@redhat.com> 5.4.0-4
- fix GMutexLocker build problem