rpms/WebKit/F-10 WebKit-r40351-sparc-linux.patch, NONE, 1.1 WebKit.spec, 1.23, 1.24

[Dennis Gilmore]

Author: ausil

Update of /cvs/pkgs/rpms/WebKit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22807

Modified Files:
	WebKit.spec 
Added Files:
	WebKit-r40351-sparc-linux.patch 
Log Message:
_Atomic_word is not always an int


WebKit-r40351-sparc-linux.patch:

--- NEW FILE WebKit-r40351-sparc-linux.patch ---
--- WebKit-r40351/JavaScriptCore/wtf/Threading.h.orig	2009-03-14 12:50:35.000000000 -0500
+++ WebKit-r40351/JavaScriptCore/wtf/Threading.h	2009-03-14 16:54:01.000000000 -0500
@@ -200,14 +200,14 @@
 #elif COMPILER(GCC)
 #define WTF_USE_LOCKFREE_THREADSAFESHARED 1
 
-inline void atomicIncrement(int volatile* addend) { __gnu_cxx::__atomic_add(addend, 1); }
-inline int atomicDecrement(int volatile* addend) { return __gnu_cxx::__exchange_and_add(addend, -1) - 1; }
+inline void atomicIncrement(_Atomic_word volatile* addend) { __gnu_cxx::__atomic_add(addend, 1); }
+inline _Atomic_word atomicDecrement(_Atomic_word volatile* addend) { return __gnu_cxx::__exchange_and_add(addend, -1) - 1; }
 
 #endif
 
 template<class T> class ThreadSafeShared : Noncopyable {
 public:
-    ThreadSafeShared(int initialRefCount = 1)
+    ThreadSafeShared(_Atomic_word initialRefCount = 1)
         : m_refCount(initialRefCount)
     {
     }
@@ -241,16 +241,16 @@
         return refCount() == 1;
     }
 
-    int refCount() const
+    _Atomic_word refCount() const
     {
 #if !USE(LOCKFREE_THREADSAFESHARED)
         MutexLocker locker(m_mutex);
 #endif
-        return static_cast<int const volatile &>(m_refCount);
+        return static_cast<_Atomic_word const volatile &>(m_refCount);
     }
 
 private:
-    int m_refCount;
+    _Atomic_word m_refCount;
 #if !USE(LOCKFREE_THREADSAFESHARED)
     mutable Mutex m_mutex;
 #endif
--- WebKit-r40351/JavaScriptCore/wtf/Platform.h.orig	2009-02-16 21:55:37.000000000 -0600
+++ WebKit-r40351/JavaScriptCore/wtf/Platform.h	2009-03-15 00:14:05.000000000 -0500
@@ -213,9 +213,16 @@
 #endif
 
 /* PLATFORM(SPARC64) */
-#if defined(__sparc64__)
+#if defined(__sparc64__) \
+    || defined(__sparc__) && defined(_arch64__)
 #define WTF_PLATFORM_SPARC64 1
 #define WTF_PLATFORM_BIG_ENDIAN 1
+#else 
+/* PLATFORM(SPARC) */
+#if defined(__sparc__)
+#define WTF_PLATFORM_SPARC 1
+#define WTF_PLATFORM_BIG_ENDIAN 1
+#endif
 #endif
 
 /* PLATFORM(WIN_CE) && PLATFORM(QT)


Index: WebKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/WebKit/F-10/WebKit.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- WebKit.spec	6 Feb 2009 20:32:41 -0000	1.23
+++ WebKit.spec	15 Mar 2009 07:12:14 -0000	1.24
@@ -40,7 +40,7 @@
 
 Name:		WebKit
 Version:	1.1.0
-Release:	0.16.svn%{svn_revision}%{?dist}
+Release:	0.17.svn%{svn_revision}%{?dist}
 Summary:	Web content engine library
 
 Group:		Development/Libraries
@@ -48,6 +48,7 @@
 URL:		http://webkit.org/
 
 Source0:	http://nightly.webkit.org/files/trunk/src/WebKit-r%{svn_revision}.tar.bz2
+Patch0:         WebKit-r40351-sparc-linux.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -122,7 +123,7 @@
 
 %prep
 %setup -qn "%{name}-r%{svn_revision}"
-
+%patch0 -p1
 
 %build
 ## We don't like pre-built binaries, especially ones for other OSes. =)
@@ -200,6 +201,9 @@
 
 
 %changelog
+* Sun Mar 15 2009 Dennis Gilmore <dennis at ausil.us> 1.1.0-0.17.svn40351
+- _Atomic_word is not always an int
+
 * Fri Jan 30 2009 Peter Gordon <peter at thecodergeek.com> 1.1.0-0.18.svn40351
 - Fix ownership of doc directory...this time without the oops (#473619).
 - Bump package version number to match that used in the configure/build