[webkitgtk3] Update to 2.1.1

[Tomas Popela]

commit 8c177ca22ac8ba9a2eb11a71fa96144a33d0068a
Author: Tomas Popela <tpopela at redhat.com>
Date:   Mon Jun 3 11:33:38 2013 +0200

    Update to 2.1.1

 .gitignore                       |    1 +
 sources                          |    2 +-
 webkit-1.11.2-Double2Ints.patch  |   21 ------------
 webkit-1.11.2-yarr.patch         |   12 -------
 webkitgtk-1.11.5-libatomic.patch |   63 --------------------------------------
 webkitgtk-2.1.1-yarr.patch       |   12 +++++++
 webkitgtk3.spec                  |   24 +++++---------
 7 files changed, 23 insertions(+), 112 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ee6b32d..6d7c2d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,4 @@ webkit-1.3.3.tar.gz
 /webkitgtk-2.0.0.tar.xz
 /webkitgtk-2.0.1.tar.xz
 /webkitgtk-2.0.2.tar.xz
+/webkitgtk-2.1.1.tar.xz
diff --git a/sources b/sources
index 6a46942..a0ac1a9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a4024f4b33d829ec1034179e94f9cab6  webkitgtk-2.0.2.tar.xz
+a460cdcd09c7a07f5e63cfe5780f545a  webkitgtk-2.1.1.tar.xz
diff --git a/webkitgtk-2.1.1-yarr.patch b/webkitgtk-2.1.1-yarr.patch
new file mode 100644
index 0000000..6752c20
--- /dev/null
+++ b/webkitgtk-2.1.1-yarr.patch
@@ -0,0 +1,12 @@
+diff -up webkitgtk-2.1.1/Source/WTF/wtf/Platform.h.yarr webkitgtk-2.1.1/Source/WTF/wtf/Platform.h
+--- webkitgtk-2.1.1/Source/WTF/wtf/Platform.h.yarr	2013-05-29 15:41:14.572995439 +0200
++++ webkitgtk-2.1.1/Source/WTF/wtf/Platform.h	2013-05-29 15:42:04.434993292 +0200
+@@ -823,7 +823,7 @@
+ #define ENABLE_REGEXP_TRACING 0
+ 
+ /* Yet Another Regex Runtime - turned on by default for JIT enabled ports. */
+-#if !defined(ENABLE_YARR_JIT) && (ENABLE(JIT) || ENABLE(LLINT_C_LOOP)) && !(OS(QNX) && PLATFORM(QT))
++#if !defined(ENABLE_YARR_JIT) && ENABLE(JIT) && ENABLE(LLINT_C_LOOP) && !(OS(QNX) && PLATFORM(QT))
+ #define ENABLE_YARR_JIT 1
+ 
+ /* Setting this flag compares JIT results with interpreter results. */
diff --git a/webkitgtk3.spec b/webkitgtk3.spec
index 6c4059e..98a0574 100644
--- a/webkitgtk3.spec
+++ b/webkitgtk3.spec
@@ -6,7 +6,7 @@
         cp -p %1  %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g')
 
 Name:           webkitgtk3
-Version:        2.0.2
+Version:        2.1.1
 Release:        1%{?dist}
 Summary:        GTK+ Web content engine library
 
@@ -19,10 +19,8 @@ Source0:        http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
 Patch0:         webkit-1.1.14-nspluginwrapper.patch
 # workarounds for non-JIT arches
 # https://bugs.webkit.org/show_bug.cgi?id=104270
-Patch1:         webkit-1.11.2-yarr.patch
+Patch1:         webkitgtk-2.1.1-yarr.patch
 # https://bugs.webkit.org/show_bug.cgi?id=103128
-Patch2:         webkit-1.11.2-Double2Ints.patch
-Patch3:         webkitgtk-1.11.5-libatomic.patch
 Patch4:         webkit-1.11.90-double2intsPPC32.patch
 
 BuildRequires:  bison
@@ -57,10 +55,6 @@ BuildRequires:  perl-Switch
 BuildRequires:  ruby
 BuildRequires:  mesa-libGL-devel
 
-%ifarch ppc
-BuildRequires:  libatomic
-%endif
-
 %description
 WebKitGTK+ is the port of the portable web rendering engine WebKit to the
 GTK+ platform.
@@ -100,11 +94,6 @@ This package contains developer documentation for %{name}.
 %setup -qn "webkitgtk-%{version}"
 %patch0 -p1 -b .nspluginwrapper
 %patch1 -p1 -b .yarr
-%patch2 -p1 -b .double2ints
-%ifarch ppc
-%patch3 -p1 -b .libatomic
-%endif
-# required for 32-bit big-endians
 %ifarch ppc s390
 %patch4 -p1 -b .double2intsPPC32
 %endif
@@ -143,6 +132,7 @@ mkdir -p DerivedSources/ANGLE
 mkdir -p DerivedSources/WebKit2
 mkdir -p DerivedSources/webkitdom/
 mkdir -p DerivedSources/InjectedBundle
+mkdir -p DerivedSources/Platform
 
 make %{_smp_mflags} V=1
 
@@ -197,7 +187,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %{_libdir}/libwebkitgtk-3.0.so.*
 %{_libdir}/libjavascriptcoregtk-3.0.so.*
 %{_libdir}/girepository-1.0/WebKit-3.0.typelib
-%{_libdir}/girepository-1.0/JSCore-3.0.typelib
+%{_libdir}/girepository-1.0/JavaScriptCore-3.0.typelib
 %dir %{_libexecdir}/%{name}
 %{_libexecdir}/%{name}/GtkLauncher
 %{_datadir}/webkitgtk-3.0
@@ -221,7 +211,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %{_libdir}/pkgconfig/javascriptcoregtk-3.0.pc
 %{_datadir}/gir-1.0/WebKit-3.0.gir
 %{_datadir}/gir-1.0/WebKit2-3.0.gir
-%{_datadir}/gir-1.0/JSCore-3.0.gir
+%{_datadir}/gir-1.0/JavaScriptCore-3.0.gir
 
 %files doc
 %dir %{_datadir}/gtk-doc
@@ -231,6 +221,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 
 
 %changelog
+* Mon Jun 3 2013 Tomas Popela <tpopela at redhat.com> - 2.1.1-1
+- Update to 2.1.1
+- Drop unused patches
+
 * Mon May 13 2013 Tomas Popela <tpopela at redhat.com> - 2.0.2-1
 - Update to 2.0.2