rpms/webkitgtk
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update 2.2.0

Browse Source
This commit is contained in:
Kevin Fenzi 2013-09-28 16:46:57 -06:00
parent 81f31948dc
commit 0043c65a85
8 changed files with 56 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -26,3 +26,4 @@ webkit-1.3.2.tar.gz
/webkitgtk-2.0.1.tar.xz /webkitgtk-2.0.1.tar.xz
/webkitgtk-2.0.2.tar.xz /webkitgtk-2.0.2.tar.xz
/webkitgtk-2.0.4.tar.xz /webkitgtk-2.0.4.tar.xz
/webkitgtk-2.2.0.tar.xz

2
sources
View File

@ -1 +1 @@
413be319ba171feed9348d1bede6b0a7 webkitgtk-2.0.4.tar.xz 9c337812667c4885ebe29a54084dcd4c webkitgtk-2.2.0.tar.xz

21
webkit-1.11.2-Double2Ints.patch
View File

@ -1,21 +0,0 @@
diff -up webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp.double2ints webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
--- webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp.double2ints 2013-02-12 17:22:38.000000000 +0100
+++ webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp 2013-03-07 18:04:39.778807991 +0100
@@ -117,6 +118,17 @@ static double Ints2Double(uint32_t lo, u
u.ival64 = (static_cast<uint64_t>(hi) << 32) | lo;
return u.dval;
}
+
+static void Double2Ints(double input, intptr_t& lo, intptr_t& hi)
+{
+ union {
+ double dval;
+ int64_t ival64;
+ } u;
+ u.dval = input;
+ hi = static_cast<intptr_t>(u.ival64 >> 32);
+ lo = static_cast<intptr_t>(u.ival64);
+}
#endif // USE(JSVALUE32_64)
} // namespace LLint

12
webkit-1.11.2-yarr.patch
View File

@ -1,12 +0,0 @@
diff -up webkitgtk-1.11.2/Source/WTF/wtf/Platform.h.orig webkitgtk-1.11.2/Source/WTF/wtf/Platform.h
--- webkitgtk-1.11.2/Source/WTF/wtf/Platform.h.orig 2012-12-16 21:27:29.000000000 +0100
+++ webkitgtk-1.11.2/Source/WTF/wtf/Platform.h 2012-12-16 23:16:19.000000000 +0100
@@ -1001,7 +1001,7 @@
#define ENABLE_REGEXP_TRACING 0
/* Yet Another Regex Runtime - turned on by default for JIT enabled ports. */
-#if !defined(ENABLE_YARR_JIT) && (ENABLE(JIT) || ENABLE(LLINT_C_LOOP)) && !PLATFORM(CHROMIUM) && !(OS(QNX) && PLATFORM(QT))
+#if !defined(ENABLE_YARR_JIT) && ENABLE(JIT) && !PLATFORM(CHROMIUM) && !(OS(QNX) && PLATFORM(QT))
#define ENABLE_YARR_JIT 1
/* Setting this flag compares JIT results with interpreter results. */

31
webkit-2.1.90-double2intsPPC32.patch Normal file
View File

@ -0,0 +1,31 @@
diff -up webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.double2intsPPC32 webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
--- webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.double2intsPPC32 2013-08-28 21:06:29.000000000 +0200
+++ webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2013-09-12 15:32:34.000000000 +0200
@@ -1679,7 +1679,7 @@ _llint_op_next_pname:
loadi 20[PC], t2
loadi PayloadOffset[cfr, t2, 8], t2
loadp JSPropertyNameIterator::m_jsStrings[t2], t3
- loadi [t3, t0, 8], t3
+ loadi PayloadOffset[t3, t0, 8], t3
addi 1, t0
storei t0, PayloadOffset[cfr, t1, 8]
loadi 4[PC], t1
diff -up webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.double2intsPPC32 webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter.asm
--- webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.double2intsPPC32 2013-08-28 21:06:29.000000000 +0200
+++ webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2013-09-12 15:32:34.000000000 +0200
@@ -276,13 +276,13 @@ macro assertNotConstant(index)
end
macro functionForCallCodeBlockGetter(targetRegister)
- loadp Callee[cfr], targetRegister
+ loadp Callee + PayloadOffset[cfr], targetRegister
loadp JSFunction::m_executable[targetRegister], targetRegister
loadp FunctionExecutable::m_codeBlockForCall[targetRegister], targetRegister
end
macro functionForConstructCodeBlockGetter(targetRegister)
- loadp Callee[cfr], targetRegister
+ loadp Callee + PayloadOffset[cfr], targetRegister
loadp JSFunction::m_executable[targetRegister], targetRegister
loadp FunctionExecutable::m_codeBlockForConstruct[targetRegister], targetRegister
end

63
webkitgtk-2.0.4-libatomic.patch
View File

@ -1,63 +0,0 @@
diff -up webkitgtk-2.0.4/GNUmakefile.in.ppc webkitgtk-2.0.4/GNUmakefile.in
--- webkitgtk-2.0.4/GNUmakefile.in.ppc 2013-08-04 21:12:16.184460261 +0200
+++ webkitgtk-2.0.4/GNUmakefile.in 2013-08-04 21:13:31.235462408 +0200
@@ -20865,6 +20865,7 @@ libWTF_la_CXXFLAGS = \
$(libWTF_la_CFLAGS)
libWTF_la_CFLAGS = \
+ -latomic \
-fstrict-aliasing \
-O3 \
$(global_cflags) \
@@ -22243,6 +22244,7 @@ Programs_WebKitPluginProcess_SOURCES = \
$(webkit2_plugin_process_sources)
Programs_WebKitPluginProcess_LDADD = \
+ -latomic \
-lpthread \
libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
WebCoreLayerGtk2.a \
diff -up webkitgtk-2.0.4/Source/WebKit2/GNUmakefile.am.ppc webkitgtk-2.0.4/Source/WebKit2/GNUmakefile.am
--- webkitgtk-2.0.4/Source/WebKit2/GNUmakefile.am.ppc 2013-08-04 21:13:45.056462804 +0200
+++ webkitgtk-2.0.4/Source/WebKit2/GNUmakefile.am 2013-08-04 21:14:10.076463519 +0200
@@ -604,6 +604,7 @@ Programs_WebKitPluginProcess_SOURCES = \
$(webkit2_plugin_process_sources)
Programs_WebKitPluginProcess_LDADD = \
+ -latomic \
-lpthread \
libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
WebCoreLayerGtk2.a \
diff -up webkitgtk-2.0.4/Source/WTF/GNUmakefile.am.ppc webkitgtk-2.0.4/Source/WTF/GNUmakefile.am
--- webkitgtk-2.0.4/Source/WTF/GNUmakefile.am.ppc 2013-08-04 21:14:22.140463865 +0200
+++ webkitgtk-2.0.4/Source/WTF/GNUmakefile.am 2013-08-04 21:14:50.155464666 +0200
@@ -25,6 +25,7 @@ libWTF_la_CXXFLAGS = \
$(libWTF_la_CFLAGS)
libWTF_la_CFLAGS = \
+ -latomic \
-fstrict-aliasing \
-O3 \
$(global_cflags) \
diff -up webkitgtk-2.0.4/Source/WTF/wtf/Atomics.h.ppc webkitgtk-2.0.4/Source/WTF/wtf/Atomics.h
--- webkitgtk-2.0.4/Source/WTF/wtf/Atomics.h.ppc 2013-08-04 21:15:01.142464980 +0200
+++ webkitgtk-2.0.4/Source/WTF/wtf/Atomics.h 2013-08-04 21:16:59.951468379 +0200
@@ -107,6 +107,18 @@ inline int atomicDecrement(int volatile*
inline int atomicIncrement(int volatile* addend) { return __atomic_inc(addend) + 1; }
inline int atomicDecrement(int volatile* addend) { return __atomic_dec(addend) - 1; }
+#elif COMPILER(GCC) && (__GNUC__ > 4 || (__GNUC__ == 4 \
+ && (__GNUC_MINOR__ > 8 || (__GNUC_MINOR__ == 8 \
+ && (__GNUC_PATCHLEVEL__ > 0 || (__GNUC_PATCHLEVEL__ == 0)))))) \
+ && CPU(PPC)
+#define WTF_USE_LOCKFREE_THREADSAFEREFCOUNTED 1
+inline int atomicIncrement(int volatile* addend) { return __atomic_fetch_add(addend, 1, __ATOMIC_ACQ_REL); }
+inline int atomicDecrement(int volatile* addend) { return __atomic_fetch_sub(addend, 1, __ATOMIC_ACQ_REL); }
+
+inline int64_t atomicIncrement(int64_t volatile* addend) { return __atomic_fetch_add(addend, 1, __ATOMIC_ACQ_REL); }
+inline int64_t atomicDecrement(int64_t volatile* addend) { return __atomic_fetch_sub(addend, 1, __ATOMIC_ACQ_REL); }
+
+
#elif COMPILER(GCC) && !CPU(SPARC64) // sizeof(_Atomic_word) != sizeof(int) on sparc64 gcc
#define WTF_USE_LOCKFREE_THREADSAFEREFCOUNTED 1

12
webkitgtk-2.1.1-yarr.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up webkitgtk-2.1.1/Source/WTF/wtf/Platform.h.yarr webkitgtk-2.1.1/Source/WTF/wtf/Platform.h
--- webkitgtk-2.1.1/Source/WTF/wtf/Platform.h.yarr 2013-05-29 15:41:14.572995439 +0200
+++ webkitgtk-2.1.1/Source/WTF/wtf/Platform.h 2013-05-29 15:42:04.434993292 +0200
@@ -823,7 +823,7 @@
#define ENABLE_REGEXP_TRACING 0
/* Yet Another Regex Runtime - turned on by default for JIT enabled ports. */
-#if !defined(ENABLE_YARR_JIT) && (ENABLE(JIT) || ENABLE(LLINT_C_LOOP)) && !(OS(QNX) && PLATFORM(QT))
+#if !defined(ENABLE_YARR_JIT) && ENABLE(JIT) && ENABLE(LLINT_C_LOOP) && !(OS(QNX) && PLATFORM(QT))
#define ENABLE_YARR_JIT 1
/* Setting this flag compares JIT results with interpreter results. */

24
webkitgtk.spec
View File

@ -9,8 +9,8 @@
cp -p %1 %{buildroot}%{_pkgdocdir}/$(echo '%1' | sed -e 's!/!.!g') cp -p %1 %{buildroot}%{_pkgdocdir}/$(echo '%1' | sed -e 's!/!.!g')
Name: webkitgtk Name: webkitgtk
Version: 2.0.4 Version: 2.2.0
Release: 3%{?dist} Release: 1%{?dist}
Summary: GTK+ Web content engine library Summary: GTK+ Web content engine library
Group: Development/Libraries Group: Development/Libraries
@ -23,10 +23,8 @@ Source0: http://www.webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
Patch0: webkit-1.3.10-nspluginwrapper.patch Patch0: webkit-1.3.10-nspluginwrapper.patch
# workarounds for non-JIT arches # workarounds for non-JIT arches
# https://bugs.webkit.org/show_bug.cgi?id=104270 # https://bugs.webkit.org/show_bug.cgi?id=104270
Patch1: webkit-1.11.2-yarr.patch Patch1: webkitgtk-2.1.1-yarr.patch
# https://bugs.webkit.org/show_bug.cgi?id=103128 # https://bugs.webkit.org/show_bug.cgi?id=103128
Patch2: webkit-1.11.2-Double2Ints.patch
Patch3: webkitgtk-2.0.4-libatomic.patch
Patch4: webkit-1.11.90-double2intsPPC32.patch Patch4: webkit-1.11.90-double2intsPPC32.patch
BuildRequires: bison BuildRequires: bison
@ -91,10 +89,6 @@ This package contains developer documentation for %{name}.
%setup -qn "webkitgtk-%{version}" %setup -qn "webkitgtk-%{version}"
%patch0 -p1 -b .nspluginwrapper %patch0 -p1 -b .nspluginwrapper
%patch1 -p1 -b .yarr %patch1 -p1 -b .yarr
%patch2 -p1 -b .double2ints
%ifarch ppc
%patch3 -p1 -b .libatomic
%endif
# required for 32-bit big-endians # required for 32-bit big-endians
%ifarch ppc s390 %ifarch ppc s390
%patch4 -p1 -b .double2intsPPC32 %patch4 -p1 -b .double2intsPPC32
@ -132,9 +126,11 @@ CFLAGS="%{optflags} -DLIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANA
mkdir -p DerivedSources/webkit mkdir -p DerivedSources/webkit
mkdir -p DerivedSources/WebCore mkdir -p DerivedSources/WebCore
mkdir -p DerivedSources/ANGLE mkdir -p DerivedSources/ANGLE
mkdir -p DerivedSources/webkitdom/
mkdir -p DerivedSources/WebKit2/webkit2gtk/webkit2 mkdir -p DerivedSources/WebKit2/webkit2gtk/webkit2
mkdir -p DerivedSources/WebKit2
mkdir -p DerivedSources/webkitdom/
mkdir -p DerivedSources/InjectedBundle mkdir -p DerivedSources/InjectedBundle
mkdir -p DerivedSources/Platform
make %{_smp_mflags} V=1 make %{_smp_mflags} V=1
@ -185,7 +181,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
%{_libdir}/libwebkitgtk-1.0.so.* %{_libdir}/libwebkitgtk-1.0.so.*
%{_libdir}/libjavascriptcoregtk-1.0.so.* %{_libdir}/libjavascriptcoregtk-1.0.so.*
%{_libdir}/girepository-1.0/WebKit-1.0.typelib %{_libdir}/girepository-1.0/WebKit-1.0.typelib
%{_libdir}/girepository-1.0/JSCore-1.0.typelib %{_libdir}/girepository-1.0/JavaScriptCore-1.0.typelib
%{_libexecdir}/%{name}/ %{_libexecdir}/%{name}/
%{_datadir}/webkitgtk-1.0 %{_datadir}/webkitgtk-1.0
@ -197,15 +193,17 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
%{_libdir}/pkgconfig/webkit-1.0.pc %{_libdir}/pkgconfig/webkit-1.0.pc
%{_libdir}/pkgconfig/javascriptcoregtk-1.0.pc %{_libdir}/pkgconfig/javascriptcoregtk-1.0.pc
%{_datadir}/gir-1.0/WebKit-1.0.gir %{_datadir}/gir-1.0/WebKit-1.0.gir
%{_datadir}/gir-1.0/JSCore-1.0.gir %{_datadir}/gir-1.0/JavaScriptCore-1.0.gir
%files doc %files doc
%dir %{_datadir}/gtk-doc %dir %{_datadir}/gtk-doc
%dir %{_datadir}/gtk-doc/html %dir %{_datadir}/gtk-doc/html
%{_datadir}/gtk-doc/html/webkitgtk %{_datadir}/gtk-doc/html/webkitgtk
%changelog %changelog
* Fri Sep 27 2013 Kevin Fenzi <kevin@scrye.com> 2.2.0-1
- Update 2.2.0
* Sun Aug 04 2013 Karsten Hopp <karsten@redhat.com> 2.0.4-3 * Sun Aug 04 2013 Karsten Hopp <karsten@redhat.com> 2.0.4-3
- update ppc libatomic patch - update ppc libatomic patch