fix build failure with new gcc5
This commit is contained in:
parent
d23817305e
commit
afaa566e89
14
qt5-qtwebkit-gcc5-patch
Normal file
14
qt5-qtwebkit-gcc5-patch
Normal 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();
|
@ -13,7 +13,7 @@
|
|||||||
Summary: Qt5 - QtWebKit components
|
Summary: Qt5 - QtWebKit components
|
||||||
Name: qt5-qtwebkit
|
Name: qt5-qtwebkit
|
||||||
Version: 5.4.1
|
Version: 5.4.1
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
|
|
||||||
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
|
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
|
||||||
# See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html
|
# 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
|
# fix GMutexLocker build issue
|
||||||
Patch9: qtwebkit-opensource-src-5.4.0-mutexlocker.patch
|
Patch9: qtwebkit-opensource-src-5.4.0-mutexlocker.patch
|
||||||
|
|
||||||
|
# fix gcc5 template issue
|
||||||
|
Patch10: qt5-qtwebkit-gcc5-patch
|
||||||
|
|
||||||
%if 0%{?system_angle}
|
%if 0%{?system_angle}
|
||||||
BuildRequires: angleproject-devel angleproject-static
|
BuildRequires: angleproject-devel angleproject-static
|
||||||
%endif
|
%endif
|
||||||
@ -128,6 +131,7 @@ BuildArch: noarch
|
|||||||
%patch7 -p1 -b .aarch64
|
%patch7 -p1 -b .aarch64
|
||||||
%patch8 -p1 -b .no_rpath
|
%patch8 -p1 -b .no_rpath
|
||||||
%patch9 -p1 -b .MutexLocker
|
%patch9 -p1 -b .MutexLocker
|
||||||
|
%patch10 -p1 -b .gcc5-template
|
||||||
|
|
||||||
echo "nuke bundled code..."
|
echo "nuke bundled code..."
|
||||||
# nuke bundled code
|
# nuke bundled code
|
||||||
@ -207,6 +211,9 @@ popd
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Mar 18 2015 Than Ngo <than@redhat.com> - 5.4.1-3
|
||||||
|
- fix build failure with new gcc5
|
||||||
|
|
||||||
* Fri Feb 27 2015 Rex Dieter <rdieter@fedoraproject.org> - 5.4.1-2
|
* Fri Feb 27 2015 Rex Dieter <rdieter@fedoraproject.org> - 5.4.1-2
|
||||||
- rebuild (gcc5)
|
- rebuild (gcc5)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user