rpms/webkitgtk/F-12 webkit-1.1.15.4-sparc.patch, NONE, 1.1 webkitgtk.spec, 1.28, 1.29

Tom Callaway spot at fedoraproject.org
Tue Mar 23 12:20:03 UTC 2010


Author: spot

Update of /cvs/pkgs/rpms/webkitgtk/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv16197/F-12

Modified Files:
	webkitgtk.spec 
Added Files:
	webkit-1.1.15.4-sparc.patch 
Log Message:
fix for sparc handling

webkit-1.1.15.4-sparc.patch:
 Platform.h |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE webkit-1.1.15.4-sparc.patch ---
diff -up webkit-1.1.15.4/JavaScriptCore/wtf/Platform.h.sparc webkit-1.1.15.4/JavaScriptCore/wtf/Platform.h
--- webkit-1.1.15.4/JavaScriptCore/wtf/Platform.h.sparc	2009-10-01 15:06:02.000000000 -0400
+++ webkit-1.1.15.4/JavaScriptCore/wtf/Platform.h	2010-03-22 13:27:50.011061289 -0400
@@ -301,8 +301,12 @@
 #if defined(__sparc__) && defined(__arch64__) || defined (__sparcv9)
 #define WTF_PLATFORM_SPARC64 1
 #define WTF_PLATFORM_BIG_ENDIAN 1
+#elif defined(__sparc__) /*PLATFORM(SPARC) */
+#define WTF_PLATFORM_SPARC 1
+#define WTF_PLATFORM_BIG_ENDIAN 1
 #endif
 
+
 /* PLATFORM(WINCE) && PLATFORM(QT)
    We can not determine the endianess at compile time. For
    Qt for Windows CE the endianess is specified in the
@@ -630,7 +634,7 @@
 #endif
 
 #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
-#if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX))
+#if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX)) || PLATFORM(SPARC64)
 #define WTF_USE_JSVALUE64 1
 #elif PLATFORM(ARM) || PLATFORM(PPC64)
 #define WTF_USE_JSVALUE32 1


Index: webkitgtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/webkitgtk/F-12/webkitgtk.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- webkitgtk.spec	24 Feb 2010 03:59:19 -0000	1.28
+++ webkitgtk.spec	23 Mar 2010 12:20:03 -0000	1.29
@@ -35,7 +35,7 @@
 
 Name:		webkitgtk
 Version:	1.1.15.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	GTK+ Web content engine library
 
 Provides:	WebKit-gtk = %{version}-%{release}
@@ -47,8 +47,9 @@ URL:		http://www.webkitgtk.org/
 
 Source0:	http://www.webkitgtk.org/webkit-%{version}.tar.gz
 
-# submitted upstream https://bugs.webkit.org/show_bug.cgi?id=35326
-Patch0: 	webkit-1.1.15.4-atomic-word.patch
+# Fix for sparc/sparc64
+# Derived from: https://bugs.webkit.org/show_bug.cgi?id=35429
+Patch0: 	webkit-1.1.15.4-sparc.patch
 
 ## See: https://bugzilla.redhat.com/show_bug.cgi?id=516057
 ## FIXME: We forcibly disable the JIT compiler for the time being.
@@ -119,7 +120,7 @@ LICENSE, README, and AUTHORS files.
 
 %prep
 %setup -qn "webkit-%{version}"
-%patch0 -p1 -b .atomic-word
+%patch0 -p1 -b .sparc
 # %patch1 -p1 -b .no-execmem
 %patch2 -p1 -b .nspluginwrapper
 
@@ -198,6 +199,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Mar 23 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1.15.4-3
+- fixup sparc handling
+
 * Tue Feb 23 2010 Dennis Gilmore <dennis at ausil.us> - 1.1.15.4-2
 - update sparc64 attomic word patch
 



More information about the scm-commits mailing list