rpms/webkitgtk/devel webkit-1.1.8-atomic-word.patch, NONE, 1.1 webkitgtk.spec, 1.6, 1.7
Dennis Gilmore
ausil at fedoraproject.org
Sat Jun 13 16:54:23 UTC 2009
Author: ausil
Update of /cvs/pkgs/rpms/webkitgtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25544
Modified Files:
webkitgtk.spec
Added Files:
webkit-1.1.8-atomic-word.patch
Log Message:
attomic word is not always an int
webkit-1.1.8-atomic-word.patch:
--- NEW FILE webkit-1.1.8-atomic-word.patch ---
diff -uNr webkit-1.1.8-orig/JavaScriptCore/wtf/Platform.h webkit-1.1.8/JavaScriptCore/wtf/Platform.h
--- webkit-1.1.8-orig/JavaScriptCore/wtf/Platform.h 2009-05-27 11:32:36.000000000 -0500
+++ webkit-1.1.8/JavaScriptCore/wtf/Platform.h 2009-06-13 11:44:36.000000000 -0500
@@ -230,10 +230,17 @@
#endif
/* PLATFORM(SPARC64) */
-#if defined(__sparc64__)
-#define WTF_PLATFORM_SPARC64 1
+#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)
We can not determine the endianess at compile time. For
diff -uNr webkit-1.1.8-orig/JavaScriptCore/wtf/Threading.h webkit-1.1.8/JavaScriptCore/wtf/Threading.h
--- webkit-1.1.8-orig/JavaScriptCore/wtf/Threading.h 2009-05-14 10:25:19.000000000 -0500
+++ webkit-1.1.8/JavaScriptCore/wtf/Threading.h 2009-06-13 11:42:52.000000000 -0500
@@ -207,14 +207,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
class ThreadSafeSharedBase : Noncopyable {
public:
- ThreadSafeSharedBase(int initialRefCount = 1)
+ ThreadSafeSharedBase(_Atomic_word initialRefCount = 1)
: m_refCount(initialRefCount)
{
}
@@ -234,23 +234,23 @@
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);
}
protected:
- // Returns whether the pointer should be freed or not.
+x s // Returns whether the pointer should be freed or not.
bool derefBase()
{
#if USE(LOCKFREE_THREADSAFESHARED)
if (atomicDecrement(&m_refCount) <= 0)
return true;
#else
- int refCount;
+ _Atomic_word refCount;
{
MutexLocker locker(m_mutex);
--m_refCount;
@@ -266,7 +266,7 @@
template<class T>
friend class CrossThreadRefCounted;
- int m_refCount;
+ _Atomic_word m_refCount;
#if !USE(LOCKFREE_THREADSAFESHARED)
mutable Mutex m_mutex;
#endif
@@ -274,7 +274,7 @@
template<class T> class ThreadSafeShared : public ThreadSafeSharedBase {
public:
- ThreadSafeShared(int initialRefCount = 1)
+ ThreadSafeShared(_Atomic_word initialRefCount = 1)
: ThreadSafeSharedBase(initialRefCount)
{
}
Index: webkitgtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/webkitgtk/devel/webkitgtk.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- webkitgtk.spec 29 May 2009 17:43:28 -0000 1.6
+++ webkitgtk.spec 13 Jun 2009 16:53:53 -0000 1.7
@@ -35,7 +35,7 @@
Name: webkitgtk
Version: 1.1.8
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: GTK+ Web content engine library
Provides: WebKit-gtk = %{version}-%{release}
@@ -46,6 +46,7 @@ License: LGPLv2+ and BSD
URL: http://www.webkitgtk.org/
Source0: http://www.webkitgtk.org/webkit-%{version}.tar.gz
+Patch0: webkit-1.1.8-atomic-word.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -108,7 +109,7 @@ LICENSE, README, and AUTHORS files.
%prep
%setup -qn "webkit-%{version}"
-
+%patch0 -p1
%build
%configure \
@@ -127,7 +128,6 @@ make %{?_smp_mflags}
%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
-
install -d -m 755 %{buildroot}%{_libexecdir}/%{name}
install -m 755 Programs/GtkLauncher %{buildroot}%{_libexecdir}/%{name}
%find_lang webkit
@@ -182,6 +182,9 @@ rm -rf %{buildroot}
%changelog
+* Sat Jun 13 2009 Dennis Gilmore <dennis at ausil.us> - 1.1.8-2
+- _atomic_word is not always an int
+
* Fri May 29 2009 Peter Gordon <peter at thecodergeek.com> - 1.1.8-1
- Update to new upstream release (1.1.8)
More information about the fedora-extras-commits
mailing list