rpms/webkitgtk3/devel webkit-1.3.3-s390.patch, NONE, 1.1 webkitgtk3.spec, 1.2, 1.3

Dan Horák sharkcz at fedoraproject.org
Wed Jul 21 11:13:19 UTC 2010


Author: sharkcz

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

Modified Files:
	webkitgtk3.spec 
Added Files:
	webkit-1.3.3-s390.patch 
Log Message:
* Wed Jul 21 2010 Dan Horák <dan[at]danny.cz> - 1.3.3-3
- Fix build on s390(x)


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

--- NEW FILE webkit-1.3.3-s390.patch ---
diff -up webkit-1.3.3/JavaScriptCore/wtf/Platform.h.s390 webkit-1.3.3/JavaScriptCore/wtf/Platform.h
--- webkit-1.3.3/JavaScriptCore/wtf/Platform.h.s390	2010-07-12 09:25:39.000000000 +0200
+++ webkit-1.3.3/JavaScriptCore/wtf/Platform.h	2010-07-21 11:55:17.000000000 +0200
@@ -181,6 +181,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)     \
@@ -907,6 +919,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_TRADITIONAL) || CPU(PPC64) || CPU(MIPS)


Index: webkitgtk3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/webkitgtk3/devel/webkitgtk3.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- webkitgtk3.spec	15 Jul 2010 18:59:07 -0000	1.2
+++ webkitgtk3.spec	21 Jul 2010 11:13:18 -0000	1.3
@@ -7,7 +7,7 @@
 
 Name:           webkitgtk3
 Version:        1.3.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GTK+ Web content engine library
 
 Group:          Development/Libraries
@@ -17,6 +17,7 @@ URL:            http://www.webkitgtk.org
 Source0:        http://www.webkitgtk.org/webkit-%{version}.tar.gz
 
 Patch0:         webkit-1.1.14-nspluginwrapper.patch
+Patch1:         webkit-1.3.3-s390.patch
 
 BuildRequires:  bison
 BuildRequires:  chrpath
@@ -66,6 +67,7 @@ files for developing applications that u
 %prep
 %setup -qn "webkit-%{version}"
 %patch0 -p1 -b .nspluginwrapper
+%patch1 -p1 -b .s390
 
 %build
 CFLAGS="%{optflags} -DLIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY" %configure                                                   \
@@ -132,6 +134,9 @@ install -m 755 Programs/GtkLauncher %{bu
 
 
 %changelog
+* Wed Jul 21 2010 Dan Horák <dan[at]danny.cz> - 1.3.3-3
+- Fix build on s390(x)
+
 * Thu Jul 15 2010 Colin Walters <walters at verbum.org> - 1.3.3-2
 - Rebuild with new gobject-introspection
 



More information about the scm-commits mailing list