From 91a70f3e34bcc154b2c14830edca33b98d0e17d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
Date: Mon, 13 Dec 2010 08:31:15 +0100
Subject: [PATCH] - Add back updated s390(x) patch

Conflicts:

	webkitgtk.spec
---
 webkit-1.3.1-s390.patch => webkit-1.3.4-s390.patch | 14 +++++++-------
 webkitgtk.spec                                     |  5 +++++
 2 files changed, 12 insertions(+), 7 deletions(-)
 rename webkit-1.3.1-s390.patch => webkit-1.3.4-s390.patch (58%)

diff --git a/webkit-1.3.1-s390.patch b/webkit-1.3.4-s390.patch
similarity index 58%
rename from webkit-1.3.1-s390.patch
rename to webkit-1.3.4-s390.patch
index 7a69d97..95a7934 100644
--- a/webkit-1.3.1-s390.patch
+++ b/webkit-1.3.4-s390.patch
@@ -1,7 +1,7 @@
-diff -up webkit-1.3.1/JavaScriptCore/wtf/Platform.h.s390 webkit-1.3.1/JavaScriptCore/wtf/Platform.h
---- webkit-1.3.1/JavaScriptCore/wtf/Platform.h.s390	2010-05-24 15:53:11.000000000 +0200
-+++ webkit-1.3.1/JavaScriptCore/wtf/Platform.h	2010-06-14 15:24:18.000000000 +0200
-@@ -178,6 +178,18 @@
+diff -up webkit-1.3.4/JavaScriptCore/wtf/Platform.h.orig webkit-1.3.4/JavaScriptCore/wtf/Platform.h
+--- webkit-1.3.4/JavaScriptCore/wtf/Platform.h.orig	2010-10-13 13:54:49.000000000 +0200
++++ webkit-1.3.4/JavaScriptCore/wtf/Platform.h	2010-10-13 13:58:08.000000000 +0200
+@@ -188,6 +188,18 @@
  #define WTF_CPU_SPARC 1
  #endif
  
@@ -20,11 +20,11 @@ diff -up webkit-1.3.1/JavaScriptCore/wtf/Platform.h.s390 webkit-1.3.1/JavaScript
  /* CPU(X86) - i386 / x86 32-bit */
  #if   defined(__i386__) \
      || defined(i386)     \
-@@ -899,6 +911,7 @@
+@@ -925,6 +937,7 @@
  #if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS))) \
      || (CPU(IA64) && !CPU(IA64_32)) \
      || CPU(ALPHA) \
 +    || CPU(S390X) \
-     || CPU(SPARC64)
+     || CPU(SPARC64) \
+     || CPU(PPC64)
  #define WTF_USE_JSVALUE64 1
- #elif CPU(ARM) || CPU(PPC64) || CPU(MIPS)
diff --git a/webkitgtk.spec b/webkitgtk.spec
index 7adbdcb..87a5b05 100644
--- a/webkitgtk.spec
+++ b/webkitgtk.spec
@@ -55,6 +55,7 @@ Source0:	http://www.webkitgtk.org/webkit-%{version}.tar.gz
 ## bug. :)
 Patch1: 	webkit-1.3.4-no-execmem.patch
 Patch2: 	webkit-1.1.14-nspluginwrapper.patch
+Patch3: 	webkit-1.3.4-s390.patch
 
 BuildRequires:	bison
 BuildRequires:	chrpath
@@ -117,6 +118,7 @@ LICENSE, README, and AUTHORS files.
 %setup -qn "webkit-%{version}"
 %patch1 -p1 -b .no-execmem
 %patch2 -p1 -b .nspluginwrapper
+%patch3 -p1 -b .s390
 
 %build
 CFLAGS="%optflags -DLIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY" %configure							\
@@ -208,6 +210,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
 
 
 %changelog
+* Mon Dec 13 2010 Dan Horák <dan[at]danny.cz> - 1.3.6-2
+- Add back updated s390(x) patch
+
 * Mon Nov 08 2010 Kevin Fenzi <kevin@tummy.com> - 1.3.6-1
 - Update to 1.3.6