rpms/webkitgtk/F-12 webkit-1.1.12-atomic-word.patch, 1.2, 1.3 webkit-1.1.12-no-execmem.patch, 1.2, 1.3 webkit-1.1.13-no-execmem.patch, 1.2, 1.3 webkit-1.1.14-atomic-word.patch, 1.2, 1.3 webkit-1.1.22-icu44.patch, NONE, 1.1 webkit-1.1.22-s390.patch, NONE, 1.1 webkit-1.1.22-sparc.patch, NONE, 1.1
Rahul Sundaram
sundaram at fedoraproject.org
Thu Jun 3 12:59:43 UTC 2010
- Previous message: rpms/webkitgtk/F-12 Makefile, 1.2, 1.3 branch, 1.1, 1.2 sources, 1.14, 1.15 webkit-1.1.14-nspluginwrapper.patch, 1.1, 1.2 webkitgtk.spec, 1.31, 1.32 webkit-1.1.15.4-atomic-word.patch, 1.2, NONE webkit-1.1.15.4-s390x.patch, 1.1, NONE webkit-1.1.15.4-sparc.patch, 1.1, NONE
- Next message: rpms/emacs/F-12 emacs-23.1-spacing.patch, NONE, 1.1 emacs.spec, 1.155, 1.156
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: sundaram
Update of /cvs/pkgs/rpms/webkitgtk/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18917
Added Files:
webkit-1.1.12-atomic-word.patch webkit-1.1.12-no-execmem.patch
webkit-1.1.13-no-execmem.patch webkit-1.1.14-atomic-word.patch
webkit-1.1.22-icu44.patch webkit-1.1.22-s390.patch
webkit-1.1.22-sparc.patch
Log Message:
add rest of the patches
webkit-1.1.12-atomic-word.patch:
webkit-1.1.11/JavaScriptCore/wtf/Platform.h | 9 ++++++++-
webkit-1.1.12/JavaScriptCore/wtf/Threading.h | 14 +++++++-------
2 files changed, 15 insertions(+), 8 deletions(-)
Index: webkit-1.1.12-atomic-word.patch
===================================================================
RCS file: webkit-1.1.12-atomic-word.patch
diff -N webkit-1.1.12-atomic-word.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ webkit-1.1.12-atomic-word.patch 3 Jun 2010 12:59:42 -0000 1.3
@@ -0,0 +1,73 @@
+--- webkit-1.1.11/JavaScriptCore/wtf/Platform.h.orig 2009-07-14 13:01:51.000000000 -0500
++++ webkit-1.1.11/JavaScriptCore/wtf/Platform.h 2009-07-14 13:04:59.000000000 -0500
+@@ -272,9 +272,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)
+--- webkit-1.1.12/JavaScriptCore/wtf/Threading.h.orig 2009-07-20 05:05:08.000000000 -0500
++++ webkit-1.1.12/JavaScriptCore/wtf/Threading.h 2009-07-28 21:53:46.000000000 -0500
+@@ -229,14 +229,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 : public Noncopyable {
+ public:
+- ThreadSafeSharedBase(int initialRefCount = 1)
++ ThreadSafeSharedBase(_Atomic_word initialRefCount = 1)
+ : m_refCount(initialRefCount)
+ {
+ }
+@@ -256,12 +256,12 @@
+ 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:
+@@ -288,7 +288,7 @@
+ template<class T>
+ friend class CrossThreadRefCounted;
+
+- int m_refCount;
++ _Atomic_word m_refCount;
+ #if !USE(LOCKFREE_THREADSAFESHARED)
+ mutable Mutex m_mutex;
+ #endif
+@@ -296,7 +296,7 @@
+
+ template<class T> class ThreadSafeShared : public ThreadSafeSharedBase {
+ public:
+- ThreadSafeShared(int initialRefCount = 1)
++ ThreadSafeShared(_Atomic_word initialRefCount = 1)
+ : ThreadSafeSharedBase(initialRefCount)
+ {
+ }
webkit-1.1.12-no-execmem.patch:
Platform.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: webkit-1.1.12-no-execmem.patch
===================================================================
RCS file: webkit-1.1.12-no-execmem.patch
diff -N webkit-1.1.12-no-execmem.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ webkit-1.1.12-no-execmem.patch 3 Jun 2010 12:59:42 -0000 1.3
@@ -0,0 +1,12 @@
+diff -up ./JavaScriptCore/wtf/Platform.h.old ./JavaScriptCore/wtf/Platform.h
+--- ./JavaScriptCore/wtf/Platform.h.old 2009-08-22 15:00:39.306173267 -0700
++++ ./JavaScriptCore/wtf/Platform.h 2009-08-22 15:03:40.551182842 -0700
+@@ -675,7 +675,7 @@
+ #endif
+ /* Setting this flag prevents the assembler from using RWX memory; this may improve
+ security but currectly comes at a significant performance cost. */
+-#if PLATFORM(ARM)
++#if PLATFORM(ARM) || PLATFORM(X86) || PLATFORM(X86_64)
+ #define ENABLE_ASSEMBLER_WX_EXCLUSIVE 1
+ #else
+ #define ENABLE_ASSEMBLER_WX_EXCLUSIVE 0
webkit-1.1.13-no-execmem.patch:
Platform.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: webkit-1.1.13-no-execmem.patch
===================================================================
RCS file: webkit-1.1.13-no-execmem.patch
diff -N webkit-1.1.13-no-execmem.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ webkit-1.1.13-no-execmem.patch 3 Jun 2010 12:59:43 -0000 1.3
@@ -0,0 +1,12 @@
+diff -up webkit-1.1.13/JavaScriptCore/wtf/Platform.h.no-execmem webkit-1.1.13/JavaScriptCore/wtf/Platform.h
+--- webkit-1.1.13/JavaScriptCore/wtf/Platform.h.no-execmem 2009-08-25 09:27:08.517026703 -0400
++++ webkit-1.1.13/JavaScriptCore/wtf/Platform.h 2009-08-25 09:42:35.222265742 -0400
+@@ -724,7 +724,7 @@
+ #endif
+ /* Setting this flag prevents the assembler from using RWX memory; this may improve
+ security but currectly comes at a significant performance cost. */
+-#if PLATFORM(IPHONE)
++#if PLATFORM(IPHONE) || PLATFORM(X86) || PLATFORM(X86_64)
+ #define ENABLE_ASSEMBLER_WX_EXCLUSIVE 1
+ #else
+ #define ENABLE_ASSEMBLER_WX_EXCLUSIVE 0
webkit-1.1.14-atomic-word.patch:
Platform.h | 9 ++++++++-
Threading.h | 14 +++++++-------
2 files changed, 15 insertions(+), 8 deletions(-)
Index: webkit-1.1.14-atomic-word.patch
===================================================================
RCS file: webkit-1.1.14-atomic-word.patch
diff -N webkit-1.1.14-atomic-word.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ webkit-1.1.14-atomic-word.patch 3 Jun 2010 12:59:43 -0000 1.3
@@ -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)
+ {
+ }
webkit-1.1.22-icu44.patch:
TextBreakIteratorICU.cpp | 85 +++++++++++++++++++++++------------------------
1 file changed, 42 insertions(+), 43 deletions(-)
--- NEW FILE webkit-1.1.22-icu44.patch ---
2010-03-22 Darin Adler <darin at apple.com>
Reviewed by Dan Bernstein.
TextBreakIteratorICU.cpp is incompatible with new UBreakIterator type in ICU 4.4
https://bugs.webkit.org/show_bug.cgi?id=36381
* platform/text/TextBreakIteratorICU.cpp:
(WebCore::setUpIterator): Use reinterpret_cast instead of static_cast or relying
on conversion to void*.
(WebCore::textBreakFirst): Ditto.
(WebCore::textBreakLast): Ditto.
(WebCore::textBreakNext): Ditto.
(WebCore::textBreakPrevious): Ditto.
(WebCore::textBreakPreceding): Ditto.
(WebCore::textBreakFollowing): Ditto.
(WebCore::textBreakCurrent): Ditto.
(WebCore::isTextBreak): Ditto.
(WebCore::setUpIteratorWithRules): Ditto.
2010-03-22 Eric Carlson <eric.carlson at apple.com>
Index: /trunk/WebCore/platform/text/TextBreakIteratorICU.cpp
===================================================================
--- /trunk/WebCore/platform/text/TextBreakIteratorICU.cpp (revision 50977)
+++ /trunk/WebCore/platform/text/TextBreakIteratorICU.cpp (revision 56345)
@@ -25,5 +25,4 @@
#include "PlatformString.h"
#include "TextBreakIteratorInternalICU.h"
-
#include <unicode/ubrk.h>
#include <wtf/Assertions.h>
@@ -39,5 +38,5 @@
if (!createdIterator) {
UErrorCode openStatus = U_ZERO_ERROR;
- iterator = static_cast<TextBreakIterator*>(ubrk_open(type, currentTextBreakLocaleID(), 0, 0, &openStatus));
+ iterator = reinterpret_cast<TextBreakIterator*>(ubrk_open(type, currentTextBreakLocaleID(), 0, 0, &openStatus));
createdIterator = true;
ASSERT_WITH_MESSAGE(U_SUCCESS(openStatus), "ICU could not open a break iterator: %s (%d)", u_errorName(openStatus), openStatus);
@@ -47,5 +46,5 @@
UErrorCode setTextStatus = U_ZERO_ERROR;
- ubrk_setText(iterator, string, length, &setTextStatus);
+ ubrk_setText(reinterpret_cast<UBreakIterator*>(iterator), string, length, &setTextStatus);
if (U_FAILURE(setTextStatus))
return 0;
@@ -86,42 +85,42 @@
}
-int textBreakFirst(TextBreakIterator* bi)
-{
- return ubrk_first(bi);
-}
-
-int textBreakLast(TextBreakIterator* bi)
-{
- return ubrk_last(bi);
-}
-
-int textBreakNext(TextBreakIterator* bi)
-{
- return ubrk_next(bi);
-}
-
-int textBreakPrevious(TextBreakIterator* bi)
-{
- return ubrk_previous(bi);
-}
-
-int textBreakPreceding(TextBreakIterator* bi, int pos)
-{
- return ubrk_preceding(bi, pos);
-}
-
-int textBreakFollowing(TextBreakIterator* bi, int pos)
-{
- return ubrk_following(bi, pos);
-}
-
-int textBreakCurrent(TextBreakIterator* bi)
-{
- return ubrk_current(bi);
-}
-
-bool isTextBreak(TextBreakIterator* bi, int pos)
-{
- return ubrk_isBoundary(bi, pos);
+int textBreakFirst(TextBreakIterator* iterator)
+{
+ return ubrk_first(reinterpret_cast<UBreakIterator*>(iterator));
+}
+
+int textBreakLast(TextBreakIterator* iterator)
+{
+ return ubrk_last(reinterpret_cast<UBreakIterator*>(iterator));
+}
+
+int textBreakNext(TextBreakIterator* iterator)
+{
+ return ubrk_next(reinterpret_cast<UBreakIterator*>(iterator));
+}
+
+int textBreakPrevious(TextBreakIterator* iterator)
+{
+ return ubrk_previous(reinterpret_cast<UBreakIterator*>(iterator));
+}
+
+int textBreakPreceding(TextBreakIterator* iterator, int pos)
+{
+ return ubrk_preceding(reinterpret_cast<UBreakIterator*>(iterator), pos);
+}
+
+int textBreakFollowing(TextBreakIterator* iterator, int pos)
+{
+ return ubrk_following(reinterpret_cast<UBreakIterator*>(iterator), pos);
+}
+
+int textBreakCurrent(TextBreakIterator* iterator)
+{
+ return ubrk_current(reinterpret_cast<UBreakIterator*>(iterator));
+}
+
+bool isTextBreak(TextBreakIterator* iterator, int position)
+{
+ return ubrk_isBoundary(reinterpret_cast<UBreakIterator*>(iterator), position);
}
@@ -137,5 +136,5 @@
UErrorCode openStatus = U_ZERO_ERROR;
String rules(breakRules);
- iterator = static_cast<TextBreakIterator*>(ubrk_openRules(rules.characters(), rules.length(), 0, 0, &parseStatus, &openStatus));
+ iterator = reinterpret_cast<TextBreakIterator*>(ubrk_openRules(rules.characters(), rules.length(), 0, 0, &parseStatus, &openStatus));
createdIterator = true;
ASSERT_WITH_MESSAGE(U_SUCCESS(openStatus), "ICU could not open a break iterator: %s (%d)", u_errorName(openStatus), openStatus);
@@ -145,5 +144,5 @@
UErrorCode setTextStatus = U_ZERO_ERROR;
- ubrk_setText(iterator, string, length, &setTextStatus);
+ ubrk_setText(reinterpret_cast<UBreakIterator*>(iterator), string, length, &setTextStatus);
if (U_FAILURE(setTextStatus))
return 0;
webkit-1.1.22-s390.patch:
Platform.h | 13 +++++++++++++
1 file changed, 13 insertions(+)
--- NEW FILE webkit-1.1.22-s390.patch ---
diff -up webkit-1.1.22/JavaScriptCore/wtf/Platform.h.s390 webkit-1.1.22/JavaScriptCore/wtf/Platform.h
--- webkit-1.1.22/JavaScriptCore/wtf/Platform.h.s390 2010-03-31 15:07:04.000000000 +0200
+++ webkit-1.1.22/JavaScriptCore/wtf/Platform.h 2010-03-31 15:09:00.000000000 +0200
@@ -145,6 +145,18 @@
#define WTF_CPU_SPARC
#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) \
@@ -831,6 +843,7 @@
#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS))) \
|| CPU(IA64) \
|| CPU(ALPHA) \
+ || CPU(S390X) \
|| CPU(SPARC64)
#define WTF_USE_JSVALUE64 1
#elif CPU(ARM) || CPU(PPC64)
webkit-1.1.22-sparc.patch:
Platform.h | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
--- NEW FILE webkit-1.1.22-sparc.patch ---
diff -up webkit-1.1.22/JavaScriptCore/wtf/Platform.h.sparc webkit-1.1.22/JavaScriptCore/wtf/Platform.h
--- webkit-1.1.22/JavaScriptCore/wtf/Platform.h.sparc 2010-03-23 08:14:24.378618143 -0400
+++ webkit-1.1.22/JavaScriptCore/wtf/Platform.h 2010-03-23 08:14:29.871502920 -0400
@@ -828,7 +828,10 @@
#endif
#if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
-#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS))) || CPU(IA64) || CPU(ALPHA)
+#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS))) \
+ || CPU(IA64) \
+ || CPU(ALPHA) \
+ || CPU(SPARC64)
#define WTF_USE_JSVALUE64 1
#elif CPU(ARM) || CPU(PPC64)
#define WTF_USE_JSVALUE32 1
- Previous message: rpms/webkitgtk/F-12 Makefile, 1.2, 1.3 branch, 1.1, 1.2 sources, 1.14, 1.15 webkit-1.1.14-nspluginwrapper.patch, 1.1, 1.2 webkitgtk.spec, 1.31, 1.32 webkit-1.1.15.4-atomic-word.patch, 1.2, NONE webkit-1.1.15.4-s390x.patch, 1.1, NONE webkit-1.1.15.4-sparc.patch, 1.1, NONE
- Next message: rpms/emacs/F-12 emacs-23.1-spacing.patch, NONE, 1.1 emacs.spec, 1.155, 1.156
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list