1.1.14
This commit is contained in:
Matthias Clasen
parent
d45ccd2bd0
commit
a175f2694b
@ -1 +1 @@
|
||||
webkit-1.1.13.tar.gz
|
||||
webkit-1.1.14.tar.gz
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
627d5ac4b2c7a967e5a5ccb175e459ea webkit-1.1.13.tar.gz
|
||||
bff87d1ddc562223cb99201950d7e138 webkit-1.1.14.tar.gz
|
||||
|
||||
75
webkit-1.1.14-atomic-word.patch
Normal file
75
webkit-1.1.14-atomic-word.patch
Normal file
@ -0,0 +1,75 @@
|
||||
diff -up webkit-1.1.14/JavaScriptCore/wtf/Platform.h.atomic-word webkit-1.1.14/JavaScriptCore/wtf/Platform.h
|
||||
--- webkit-1.1.14/JavaScriptCore/wtf/Platform.h.atomic-word 2009-09-04 14:51:45.000000000 -0400
|
||||
+++ webkit-1.1.14/JavaScriptCore/wtf/Platform.h 2009-09-07 21:52:29.696143904 -0400
|
||||
@@ -282,9 +282,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(WINCE) && PLATFORM(QT)
|
||||
diff -up webkit-1.1.14/JavaScriptCore/wtf/Threading.h.atomic-word webkit-1.1.14/JavaScriptCore/wtf/Threading.h
|
||||
--- webkit-1.1.14/JavaScriptCore/wtf/Threading.h.atomic-word 2009-09-04 08:30:57.000000000 -0400
|
||||
+++ webkit-1.1.14/JavaScriptCore/wtf/Threading.h 2009-09-07 21:59:39.149138812 -0400
|
||||
@@ -231,14 +231,14 @@ inline int atomicDecrement(int volatile*
|
||||
#elif COMPILER(GCC)
|
||||
#define WTF_USE_LOCKFREE_THREADSAFESHARED 1
|
||||
|
||||
-inline int atomicIncrement(int volatile* addend) { return __gnu_cxx::__exchange_and_add(addend, 1) + 1; }
|
||||
-inline int atomicDecrement(int volatile* addend) { return __gnu_cxx::__exchange_and_add(addend, -1) - 1; }
|
||||
+inline int atomicIncrement(_Atomic_word volatile* addend) { return __gnu_cxx::__exchange_and_add(addend, 1) + 1; }
|
||||
+inline int atomicDecrement(_Atomic_word volatile* addend) { return __gnu_cxx::__exchange_and_add(addend, -1) - 1; }
|
||||
|
||||
#endif
|
||||
|
||||
class ThreadSafeSharedBase : public Noncopyable {
|
||||
public:
|
||||
- ThreadSafeSharedBase(int initialRefCount = 1)
|
||||
+ ThreadSafeSharedBase(_Atomic_word initialRefCount = 1)
|
||||
: m_refCount(initialRefCount)
|
||||
{
|
||||
}
|
||||
@@ -258,12 +258,12 @@ public:
|
||||
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:
|
||||
@@ -290,7 +290,7 @@ private:
|
||||
template<class T>
|
||||
friend class CrossThreadRefCounted;
|
||||
|
||||
- int m_refCount;
|
||||
+ _Atomic_word m_refCount;
|
||||
#if !USE(LOCKFREE_THREADSAFESHARED)
|
||||
mutable Mutex m_mutex;
|
||||
#endif
|
||||
@@ -298,7 +298,7 @@ private:
|
||||
|
||||
template<class T> class ThreadSafeShared : public ThreadSafeSharedBase {
|
||||
public:
|
||||
- ThreadSafeShared(int initialRefCount = 1)
|
||||
+ ThreadSafeShared(_Atomic_word initialRefCount = 1)
|
||||
: ThreadSafeSharedBase(initialRefCount)
|
||||
{
|
||||
}
|
||||
@ -34,7 +34,7 @@
|
||||
%bcond_with wml
|
||||
|
||||
Name: webkitgtk
|
||||
Version: 1.1.13
|
||||
Version: 1.1.14
|
||||
Release: 1%{?dist}
|
||||
Summary: GTK+ Web content engine library
|
||||
|
||||
@ -47,7 +47,7 @@ URL: http://www.webkitgtk.org/
|
||||
|
||||
Source0: http://www.webkitgtk.org/webkit-%{version}.tar.gz
|
||||
|
||||
Patch0: webkit-1.1.12-atomic-word.patch
|
||||
Patch0: webkit-1.1.14-atomic-word.patch
|
||||
Patch1: webkit-1.1.13-no-execmem.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
@ -59,11 +59,10 @@ BuildRequires: flex
|
||||
BuildRequires: geoclue-devel
|
||||
BuildRequires: gettext
|
||||
BuildRequires: gperf
|
||||
BuildRequires: gnome-keyring-devel
|
||||
BuildRequires: gstreamer-devel
|
||||
BuildRequires: gstreamer-plugins-base-devel
|
||||
BuildRequires: gtk2-devel
|
||||
BuildRequires: libsoup-devel >= 2.27.4
|
||||
BuildRequires: libsoup-devel >= 2.27.91
|
||||
BuildRequires: libicu-devel
|
||||
BuildRequires: libjpeg-devel
|
||||
BuildRequires: libxslt-devel
|
||||
@ -111,11 +110,11 @@ LICENSE, README, and AUTHORS files.
|
||||
|
||||
%prep
|
||||
%setup -qn "webkit-%{version}"
|
||||
%patch0 -p1
|
||||
%patch0 -p1 -b .atomic-word
|
||||
%patch1 -p1 -b .no-execmem
|
||||
|
||||
%build
|
||||
%configure \
|
||||
CFLAGS="%optflags -DLIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY" %configure \
|
||||
--enable-gnomekeyring \
|
||||
--enable-geolocation \
|
||||
%{?with_3dtransforms: --enable-3D-transforms } \
|
||||
@ -124,7 +123,7 @@ LICENSE, README, and AUTHORS files.
|
||||
%{?with_pango: --with-font-backend=pango } \
|
||||
%{?with_svg: --enable-svg-filters } \
|
||||
%{?with_wml: --enable-wml }
|
||||
|
||||
|
||||
make %{?_smp_mflags}
|
||||
|
||||
|
||||
@ -153,7 +152,7 @@ install -m 755 Programs/GtkLauncher %{buildroot}%{_libexecdir}/%{name}
|
||||
%add_to_doc_files WebKit/gtk/po/README
|
||||
|
||||
%add_to_doc_files JavaScriptCore/AUTHORS
|
||||
%add_to_doc_files JavaScriptCore/pcre/AUTHORS
|
||||
%add_to_doc_files JavaScriptCore/pcre/AUTHORS
|
||||
|
||||
%add_to_doc_files JavaScriptCore/THANKS
|
||||
|
||||
@ -189,6 +188,9 @@ rm -rf %{buildroot}
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Sep 7 2009 Matthias Clasen <mclasen@redhat.com> - 1.1.14-1
|
||||
- Update to 1.1.14
|
||||
|
||||
* Tue Aug 25 2009 Matthias Clasen <mclasen@redhat.com> - 1.1.13-1
|
||||
- Update to 1.1.13
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user