rpms/webkitgtk/devel webkit-1.3.1-s390.patch, NONE, 1.1 webkitgtk.spec, 1.47, 1.48

[Dan Horák]

Author: sharkcz

Update of /cvs/pkgs/rpms/webkitgtk/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv17616

Modified Files:
	webkitgtk.spec 
Added Files:
	webkit-1.3.1-s390.patch 
Log Message:
* Tue Jul 20 2010 Dan Horák <dan[at]danny.cz> - 1.3.2-4
- Fix build on s390(x)


webkit-1.3.1-s390.patch:
 Platform.h |   13 +++++++++++++
 1 file changed, 13 insertions(+)

--- NEW FILE webkit-1.3.1-s390.patch ---
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 @@
 #define WTF_CPU_SPARC 1
 #endif
 
+/* CPU(S390X) - S390 64-bit */
+#if defined(__s390x__)
+#define WTF_CPU_S390X 1
+#define WTF_CPU_BIG_ENDIAN 1
+#endif
+
+/* CPU(S390) - S390 32-bit */
+#if defined(__s390__)
+#define WTF_CPU_S390 1
+#define WTF_CPU_BIG_ENDIAN 1
+#endif
+
 /* CPU(X86) - i386 / x86 32-bit */
 #if   defined(__i386__) \
     || defined(i386)     \
@@ -899,6 +911,7 @@
 #if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS))) \
     || (CPU(IA64) && !CPU(IA64_32)) \
     || CPU(ALPHA) \
+    || CPU(S390X) \
     || CPU(SPARC64)
 #define WTF_USE_JSVALUE64 1
 #elif CPU(ARM) || CPU(PPC64) || CPU(MIPS)


Index: webkitgtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/webkitgtk/devel/webkitgtk.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- webkitgtk.spec	15 Jul 2010 18:58:52 -0000	1.47
+++ webkitgtk.spec	20 Jul 2010 19:23:38 -0000	1.48
@@ -35,7 +35,7 @@
 
 Name:		webkitgtk
 Version:	1.3.2
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	GTK+ Web content engine library
 
 Provides:	WebKit-gtk = %{version}-%{release}
@@ -55,6 +55,7 @@ Source0:	http://www.webkitgtk.org/webkit
 ## bug. :)
 #Patch1: 	webkit-1.1.13-no-execmem.patch
 Patch2: 	webkit-1.1.14-nspluginwrapper.patch
+Patch3:		webkit-1.3.1-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							\
@@ -201,6 +203,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Jul 20 2010 Dan Horák <dan[at]danny.cz> - 1.3.2-4
+- Fix build on s390(x)
+
 * Thu Jul 15 2010 Colin Walters <walters at verbum.org> - 1.3.2-3
 - Rebuild with new gobject-introspection