[webkitgtk3] Update to 2.4.5

[Tomas Popela]

commit a43fec5ce60b36cbb165f22c1b43e12d21119c5e
Author: Tomas Popela <tpopela at redhat.com>
Date:   Tue Aug 26 12:58:01 2014 +0200

    Update to 2.4.5

 sources                                            |    2 +-
 ...C32.patch => webkitgtk-2.4.5-cloop_fix_32.patch |   12 ++++----
 webkitgtk3.spec                                    |   28 +++++++++----------
 3 files changed, 20 insertions(+), 22 deletions(-)
---
diff --git a/sources b/sources
index f691369..6b4c673 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-79edd28d32172abc17a8861622cc274f  webkitgtk-2.4.4.tar.xz
+c2e1687bb0314a0948fbf78e2d1e931f  webkitgtk-2.4.5.tar.xz
diff --git a/webkit-2.1.90-double2intsPPC32.patch b/webkitgtk-2.4.5-cloop_fix_32.patch
similarity index 54%
rename from webkit-2.1.90-double2intsPPC32.patch
rename to webkitgtk-2.4.5-cloop_fix_32.patch
index b904490..96c53ad 100644
--- a/webkit-2.1.90-double2intsPPC32.patch
+++ b/webkitgtk-2.4.5-cloop_fix_32.patch
@@ -1,6 +1,6 @@
-diff -up webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.double2intsPPC32 webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
---- webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.double2intsPPC32	2013-08-28 21:06:29.000000000 +0200
-+++ webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm	2013-09-12 15:32:34.000000000 +0200
+diff -up webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.cloop_fix_32 webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
+--- webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.cloop_fix_32	2013-08-28 21:06:29.000000000 +0200
++++ webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm	2013-09-12 15:32:34.000000000 +0200
 @@ -1679,7 +1679,7 @@ _llint_op_next_pname:
      loadi 20[PC], t2
      loadi PayloadOffset[cfr, t2, 8], t2
@@ -10,9 +10,9 @@ diff -up webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter32_64
      addi 1, t0
      storei t0, PayloadOffset[cfr, t1, 8]
      loadi 4[PC], t1
-diff -up webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.double2intsPPC32 webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter.asm
---- webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.double2intsPPC32	2013-08-28 21:06:29.000000000 +0200
-+++ webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter.asm	2013-09-12 15:32:34.000000000 +0200
+diff -up webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.cloop_fix_32 webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter.asm
+--- webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.cloop_fix_32	2013-08-28 21:06:29.000000000 +0200
++++ webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter.asm	2013-09-12 15:32:34.000000000 +0200
 @@ -276,13 +276,13 @@ macro assertNotConstant(index)
  end
  
diff --git a/webkitgtk3.spec b/webkitgtk3.spec
index 2f0e97c..2da9831 100644
--- a/webkitgtk3.spec
+++ b/webkitgtk3.spec
@@ -6,8 +6,8 @@
         cp -p %1  %{buildroot}%{_pkgdocdir}/$(echo '%1' | sed -e 's!/!.!g')
 
 Name:           webkitgtk3
-Version:        2.4.4
-Release:        5%{?dist}
+Version:        2.4.5
+Release:        1%{?dist}
 Summary:        GTK+ Web content engine library
 
 Group:          Development/Libraries
@@ -17,12 +17,10 @@ URL:            http://www.webkitgtk.org/
 Source0:        http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
 
 Patch0:         webkit-1.1.14-nspluginwrapper.patch
-# https://bugs.webkit.org/show_bug.cgi?id=103128
-Patch4:         webkit-2.1.90-double2intsPPC32.patch
-Patch10:        webkitgtk-aarch64.patch
-Patch11:        webkitgtk-2.4.1-cloop_fix.patch
-Patch12:        webkitgtk-2.4.1-ppc64_align.patch
-Patch13:        webkitgtk-2.4.2-ppc64le.patch
+Patch1:         webkitgtk-aarch64.patch
+Patch2:         webkitgtk-2.4.1-cloop_fix.patch
+Patch3:         webkitgtk-2.4.5-cloop_fix_32.patch
+Patch4:         webkitgtk-2.4.1-ppc64_align.patch
 
 BuildRequires:  at-spi2-core-devel
 BuildRequires:  bison
@@ -99,18 +97,15 @@ This package contains developer documentation for %{name}.
 %prep
 %setup -qn "webkitgtk-%{version}"
 %patch0 -p1 -b .nspluginwrapper
-%patch11 -p1 -b .cloop_fix
+%patch2 -p1 -b .cloop_fix
 %ifarch ppc s390
-%patch4 -p1 -b .double2intsPPC32
+%patch3 -p1 -b .cloop_fix_32
 %endif
 %ifarch aarch64
-%patch10 -p1 -b .aarch64
+%patch1 -p1 -b .aarch64
 %endif
 %ifarch %{power64} aarch64 ppc
-%patch12 -p1 -b .ppc64_align
-%endif
-%ifarch %{power64}
-%patch13 -p1 -b .ppc64le
+%patch4 -p1 -b .ppc64_align
 %endif
 
 %build
@@ -235,6 +230,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete
 %{_datadir}/gtk-doc/html/webkitdomgtk
 
 %changelog
+* Tue Aug 26 2014 Tomas Popela <tpopela at redhat.com> - 2.4.5-1
+- Update to 2.4.5
+
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild