rdieter pushed to qt5-qtwebkit (el6). "Merge branch 'master' into f22"

[notifications at fedoraproject.org]

>From ef1e1f5020e0626b48e366ec4fd7ac3c52fe8845 Mon Sep 17 00:00:00 2001
From: Than Ngo <than at redhat.com>
Date: Wed, 18 Mar 2015 17:55:54 +0100
Subject: fix build failure with new gcc5


diff --git a/qt5-qtwebkit-gcc5-patch b/qt5-qtwebkit-gcc5-patch
new file mode 100644
index 0000000..e00accd
--- /dev/null
+++ b/qt5-qtwebkit-gcc5-patch
@@ -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();
-- 
cgit v0.10.2


>From c88e8bfee63bc92eeaec68cf3486a541ee10e24c Mon Sep 17 00:00:00 2001
From: Than Ngo <than at redhat.com>
Date: Wed, 18 Mar 2015 17:57:02 +0100
Subject: fix build failure with new gcc5


diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec
index 415510d..9012cbd 100644
--- a/qt5-qtwebkit.spec
+++ b/qt5-qtwebkit.spec
@@ -13,7 +13,7 @@
 Summary: Qt5 - QtWebKit components
 Name:    qt5-qtwebkit
 Version: 5.4.1
-Release: 2%{?dist}
+Release: 3%{?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
@@ -207,6 +211,9 @@ popd
 
 
 %changelog
+* Wed Mar 18 2015 Than Ngo <than at redhat.com> - 5.4.1-3
+- fix build failure with new gcc5
+
 * Fri Feb 27 2015 Rex Dieter <rdieter at fedoraproject.org> - 5.4.1-2
 - rebuild (gcc5)
 
-- 
cgit v0.10.2


>From 96d817a1b0c9472c77ddf53fb174ef2f9d9847fd Mon Sep 17 00:00:00 2001
From: Than Ngo <than at redhat.com>
Date: Thu, 19 Mar 2015 13:25:24 +0100
Subject: workaround, disable parallel compilation as it fails to compile in
 brew


diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec
index 9012cbd..849bf11 100644
--- a/qt5-qtwebkit.spec
+++ b/qt5-qtwebkit.spec
@@ -155,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
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/qt5-qtwebkit.git/commit/?h=el6&id=18a859a2016655306f23ffc4df8faafd07230eaf