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

Update to 2.4.9

Browse Source 
Resolves: rhbz#1198713
This commit is contained in:
Tomas Popela 2015-11-30 10:21:01 +01:00
parent 8eaf993986
commit d2dd93281d
10 changed files with 378 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -30,3 +30,4 @@ webkit-1.3.2.tar.gz
/webkitgtk-2.2.2.tar.xz /webkitgtk-2.2.2.tar.xz
/webkitgtk-2.2.3.tar.xz /webkitgtk-2.2.3.tar.xz
/webkitgtk-2.2.4.tar.xz /webkitgtk-2.2.4.tar.xz
/webkitgtk-2.4.9.tar.xz

2
sources
View File

@ -1 +1 @@
d2af0d2d75f18cac33bd82ee63e22571 webkitgtk-2.2.4.tar.xz 312fd29eb7f5970660c6a64b8bf8420e webkitgtk-2.4.9.tar.xz

12
webkitgtk-2.1.1-yarr.patch
View File

@ -1,12 +0,0 @@
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. */

199
webkitgtk-2.4.1-cloop_fix.patch Normal file
View File

@ -0,0 +1,199 @@
diff -up webkitgtk-2.4.4/Source/JavaScriptCore/interpreter/ProtoCallFrame.h.cloop_fix webkitgtk-2.4.4/Source/JavaScriptCore/interpreter/ProtoCallFrame.h
--- webkitgtk-2.4.4/Source/JavaScriptCore/interpreter/ProtoCallFrame.h.cloop_fix 2014-07-23 14:15:45.497658648 +0200
+++ webkitgtk-2.4.4/Source/JavaScriptCore/interpreter/ProtoCallFrame.h 2014-07-23 14:16:46.997687779 +0200
@@ -36,7 +36,7 @@ struct ProtoCallFrame {
Register calleeValue;
Register argCountAndCodeOriginValue;
Register thisArg;
- size_t paddedArgCount;
+ uint32_t paddedArgCount;
JSValue *args;
void init(CodeBlock*, JSScope*, JSObject*, JSValue, int, JSValue* otherArgs = 0);
@@ -53,7 +53,7 @@ struct ProtoCallFrame {
int argumentCountIncludingThis() const { return argCountAndCodeOriginValue.payload(); }
int argumentCount() const { return argumentCountIncludingThis() - 1; }
void setArgumentCountIncludingThis(int count) { argCountAndCodeOriginValue.payload() = count; }
- void setPaddedArgsCount(size_t argCount) { paddedArgCount = argCount; }
+ void setPaddedArgsCount(uint32_t argCount) { paddedArgCount = argCount; }
void clearCurrentVPC() { argCountAndCodeOriginValue.tag() = 0; }
diff -up webkitgtk-2.4.4/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp.cloop_fix webkitgtk-2.4.4/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp
--- webkitgtk-2.4.4/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp.cloop_fix 2014-07-23 14:16:02.057667404 +0200
+++ webkitgtk-2.4.4/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp 2014-07-23 14:16:46.997687779 +0200
@@ -1354,7 +1354,7 @@ LLINT_SLOW_PATH_DECL(slow_path_get_from_
CodeBlock* codeBlock = exec->codeBlock();
ConcurrentJITLocker locker(codeBlock->m_lock);
pc[5].u.structure.set(exec->vm(), codeBlock->ownerExecutable(), scope->structure());
- pc[6].u.operand = slot.cachedOffset();
+ pc[6].u.pointer = reinterpret_cast<void*>(slot.cachedOffset());
}
}
@@ -1381,7 +1381,7 @@ LLINT_SLOW_PATH_DECL(slow_path_put_to_sc
if (slot.isCacheable() && slot.base() == scope && scope->structure()->propertyAccessesAreCacheable()) {
ConcurrentJITLocker locker(codeBlock->m_lock);
pc[5].u.structure.set(exec->vm(), codeBlock->ownerExecutable(), scope->structure());
- pc[6].u.operand = slot.cachedOffset();
+ pc[6].u.pointer = reinterpret_cast<void*>(slot.cachedOffset());
}
}
diff -up webkitgtk-2.4.4/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.cloop_fix webkitgtk-2.4.4/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
--- webkitgtk-2.4.4/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.cloop_fix 2014-07-23 14:16:13.047672325 +0200
+++ webkitgtk-2.4.4/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2014-07-23 14:18:27.547721786 +0200
@@ -282,7 +282,7 @@ macro doCallToJavaScript(makeCall, doRet
storep temp3, CodeBlock+4[cfr, temp1, 8]
btinz temp1, .copyHeaderLoop
- loadi ProtoCallFrame::argCountAndCodeOriginValue[protoCallFrame], temp2
+ loadi PayloadOffset + ProtoCallFrame::argCountAndCodeOriginValue[protoCallFrame], temp2
subi 1, temp2
loadi ProtoCallFrame::paddedArgCount[protoCallFrame], temp3
subi 1, temp3
@@ -321,7 +321,7 @@ macro doCallToJavaScript(makeCall, doRet
.calleeFramePopped:
loadp Callee[cfr], temp3 # VM.topCallFrame
- loadp ScopeChain[cfr], temp4
+ loadp ScopeChain + PayloadOffset[cfr], temp4
storep temp4, [temp3]
doReturn(extraStackSpace)
@@ -598,7 +598,7 @@ end
macro branchIfException(label)
- loadp ScopeChain[cfr], t3
+ loadp ScopeChain + PayloadOffset[cfr], t3
andp MarkedBlockMask, t3
loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3
bieq VM::m_exception + TagOffset[t3], EmptyValueTag, .noException
@@ -2039,7 +2039,7 @@ _llint_op_catch:
# the interpreter's throw trampoline (see _llint_throw_trampoline).
# The throwing code must have known that we were throwing to the interpreter,
# and have set VM::targetInterpreterPCForThrow.
- loadp ScopeChain[cfr], t3
+ loadp ScopeChain + PayloadOffset[cfr], t3
andp MarkedBlockMask, t3
loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3
loadp VM::callFrameForThrow[t3], cfr
@@ -2159,7 +2159,7 @@ macro nativeCallTrampoline(executableOff
andp MarkedBlockMask, t3
loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3
elsif C_LOOP
- loadp ScopeChain[cfr], t3
+ loadp ScopeChain + PayloadOffset[cfr], t3
andp MarkedBlockMask, t3
loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3
storep cfr, VM::topCallFrame[t3]
@@ -2172,7 +2172,7 @@ macro nativeCallTrampoline(executableOff
move t2, cfr
cloopCallNative executableOffsetToFunction[t1]
restoreReturnAddressBeforeReturn(t3)
- loadp ScopeChain[cfr], t3
+ loadp ScopeChain + PayloadOffset[cfr], t3
andp MarkedBlockMask, t3
loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3
else
@@ -2212,7 +2212,7 @@ macro resolveScope()
addi 1, t2
.resolveScopeAfterActivationCheck:
- loadp ScopeChain[cfr], t0
+ loadp ScopeChain + PayloadOffset[cfr], t0
btiz t2, .resolveScopeLoopEnd
.resolveScopeLoop:
@@ -2271,13 +2271,13 @@ _llint_op_resolve_scope:
macro loadWithStructureCheck(operand, slowPath)
loadisFromInstruction(operand, t0)
- loadp [cfr, t0, 8], t0
+ loadp PayloadOffset[cfr, t0, 8], t0
loadpFromInstruction(5, t1)
bpneq JSCell::m_structure[t0], t1, slowPath
end
macro getProperty()
- loadisFromInstruction(6, t3)
+ loadpFromInstruction(6, t3)
loadPropertyAtVariableOffset(t3, t0, t1, t2)
valueProfile(t1, t2, 28, t0)
loadisFromInstruction(1, t0)
@@ -2297,7 +2297,7 @@ end
macro getClosureVar()
loadp JSVariableObject::m_registers[t0], t0
- loadisFromInstruction(6, t3)
+ loadpFromInstruction(6, t3)
loadp TagOffset[t0, t3, 8], t1
loadp PayloadOffset[t0, t3, 8], t2
valueProfile(t1, t2, 28, t0)
@@ -2356,7 +2356,7 @@ _llint_op_get_from_scope:
macro putProperty()
loadisFromInstruction(3, t1)
loadConstantOrVariable(t1, t2, t3)
- loadisFromInstruction(6, t1)
+ loadpFromInstruction(6, t1)
storePropertyAtVariableOffset(t1, t0, t2, t3)
end
@@ -2374,7 +2374,7 @@ macro putClosureVar()
loadisFromInstruction(3, t1)
loadConstantOrVariable(t1, t2, t3)
loadp JSVariableObject::m_registers[t0], t0
- loadisFromInstruction(6, t1)
+ loadpFromInstruction(6, t1)
storei t2, TagOffset[t0, t1, 8]
storei t3, PayloadOffset[t0, t1, 8]
end
diff -up webkitgtk-2.4.4/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm.cloop_fix webkitgtk-2.4.4/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
--- webkitgtk-2.4.4/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm.cloop_fix 2014-07-23 14:16:19.147675074 +0200
+++ webkitgtk-2.4.4/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2014-07-23 14:16:46.997687779 +0200
@@ -171,7 +171,7 @@ macro doCallToJavaScript(makeCall, doRet
storep temp3, CodeBlock[cfr, temp1, 8]
btinz temp1, .copyHeaderLoop
- loadi ProtoCallFrame::argCountAndCodeOriginValue[protoCallFrame], temp2
+ loadi PayloadOffset + ProtoCallFrame::argCountAndCodeOriginValue[protoCallFrame], temp2
subi 1, temp2
loadi ProtoCallFrame::paddedArgCount[protoCallFrame], temp3
subi 1, temp3
@@ -2047,7 +2047,7 @@ macro loadWithStructureCheck(operand, sl
end
macro getProperty()
- loadisFromInstruction(6, t1)
+ loadpFromInstruction(6, t1)
loadPropertyAtVariableOffset(t1, t0, t2)
valueProfile(t2, 7, t0)
loadisFromInstruction(1, t0)
@@ -2064,7 +2064,7 @@ end
macro getClosureVar()
loadp JSVariableObject::m_registers[t0], t0
- loadisFromInstruction(6, t1)
+ loadpFromInstruction(6, t1)
loadq [t0, t1, 8], t0
valueProfile(t0, 7, t1)
loadisFromInstruction(1, t1)
@@ -2121,7 +2121,7 @@ _llint_op_get_from_scope:
macro putProperty()
loadisFromInstruction(3, t1)
loadConstantOrVariable(t1, t2)
- loadisFromInstruction(6, t1)
+ loadpFromInstruction(6, t1)
storePropertyAtVariableOffset(t1, t0, t2)
end
@@ -2138,7 +2138,7 @@ macro putClosureVar()
loadisFromInstruction(3, t1)
loadConstantOrVariable(t1, t2)
loadp JSVariableObject::m_registers[t0], t0
- loadisFromInstruction(6, t1)
+ loadpFromInstruction(6, t1)
storeq t2, [t0, t1, 8]
end

45
webkitgtk-2.4.1-ppc64_align.patch Normal file
View File

@ -0,0 +1,45 @@
diff -up webkitgtk-2.4.2/Source/JavaScriptCore/heap/CopiedBlock.h.ppc64_align webkitgtk-2.4.2/Source/JavaScriptCore/heap/CopiedBlock.h
--- webkitgtk-2.4.2/Source/JavaScriptCore/heap/CopiedBlock.h.ppc64_align 2014-05-12 08:03:53.000000000 +0200
+++ webkitgtk-2.4.2/Source/JavaScriptCore/heap/CopiedBlock.h 2014-05-14 15:16:36.946318596 +0200
@@ -81,7 +81,7 @@ public:
size_t size();
size_t capacity();
- static const size_t blockSize = 32 * KB;
+ static const size_t blockSize = 64 * KB;
bool hasWorkList();
CopyWorkList& workList();
diff -up webkitgtk-2.4.2/Source/JavaScriptCore/interpreter/JSStack.cpp.ppc64_align webkitgtk-2.4.2/Source/JavaScriptCore/interpreter/JSStack.cpp
--- webkitgtk-2.4.2/Source/JavaScriptCore/interpreter/JSStack.cpp.ppc64_align 2014-05-12 08:03:53.000000000 +0200
+++ webkitgtk-2.4.2/Source/JavaScriptCore/interpreter/JSStack.cpp 2014-05-14 15:17:35.617171141 +0200
@@ -49,7 +49,8 @@ JSStack::JSStack(VM& vm, size_t capacity
{
ASSERT(capacity && isPageAligned(capacity));
- m_reservation = PageReservation::reserve(roundUpAllocationSize(capacity * sizeof(Register), commitSize), OSAllocator::JSVMStackPages);
+ size_t commitsize = pageSize();
+ m_reservation = PageReservation::reserve(roundUpAllocationSize(capacity * sizeof(Register), commitsize), OSAllocator::JSVMStackPages);
updateStackLimit(highAddress());
m_commitEnd = highAddress();
@@ -78,7 +79,8 @@ bool JSStack::growSlowCase(Register* new
// Compute the chunk size of additional memory to commit, and see if we
// have it is still within our budget. If not, we'll fail to grow and
// return false.
- long delta = roundUpAllocationSize(reinterpret_cast<char*>(m_commitEnd) - reinterpret_cast<char*>(newEnd), commitSize);
+ size_t commitsize = pageSize();
+ long delta = roundUpAllocationSize(reinterpret_cast<char*>(m_commitEnd) - reinterpret_cast<char*>(newEnd), commitsize);
if (reinterpret_cast<char*>(m_commitEnd) - delta <= reinterpret_cast<char*>(m_useableEnd))
return false;
@@ -134,7 +136,8 @@ void JSStack::enableErrorStackReserve()
void JSStack::disableErrorStackReserve()
{
- char* useableEnd = reinterpret_cast<char*>(reservationEnd()) + commitSize;
+ size_t commitsize = pageSize();
+ char* useableEnd = reinterpret_cast<char*>(reservationEnd()) + commitsize;
m_useableEnd = reinterpret_cast_ptr<Register*>(useableEnd);
// By the time we get here, we are guaranteed to be destructing the last

12
webkit-2.1.90-double2intsPPC32.patch → webkitgtk-2.4.5-cloop_fix_32.patch
View File

@ -1,6 +1,6 @@
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 diff -up webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.cloop_fix_32 webkitgtk-2.4.5/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.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.cloop_fix_32 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 +++ webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2013-09-12 15:32:34.000000000 +0200
@@ -1679,7 +1679,7 @@ _llint_op_next_pname: @@ -1679,7 +1679,7 @@ _llint_op_next_pname:
loadi 20[PC], t2 loadi 20[PC], t2
loadi PayloadOffset[cfr, t2, 8], t2 loadi PayloadOffset[cfr, t2, 8], t2
@ -10,9 +10,9 @@ diff -up webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter32_64
addi 1, t0 addi 1, t0
storei t0, PayloadOffset[cfr, t1, 8] storei t0, PayloadOffset[cfr, t1, 8]
loadi 4[PC], t1 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 diff -up webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.cloop_fix_32 webkitgtk-2.4.5/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.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.cloop_fix_32 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 +++ webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2013-09-12 15:32:34.000000000 +0200
@@ -276,13 +276,13 @@ macro assertNotConstant(index) @@ -276,13 +276,13 @@ macro assertNotConstant(index)
end end

38
webkitgtk-2.4.9-disable_deprecated_get_set_id.patch Normal file
View File

@ -0,0 +1,38 @@
diff -up webkitgtk-2.4.9/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.cpp.disable_deprecated_get_set_id webkitgtk-2.4.9/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.cpp
--- webkitgtk-2.4.9/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.cpp.disable_deprecated_get_set_id 2015-06-22 14:33:06.800967146 +0200
+++ webkitgtk-2.4.9/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.cpp 2015-06-22 14:35:19.296072294 +0200
@@ -39,13 +39,11 @@ WebKitDOMBlob* webkit_dom_blob_webkit_sl
gchar* webkit_dom_html_element_get_id(WebKitDOMHTMLElement* element)
{
- g_warning("The get_id method on WebKitDOMHTMLElement is deprecated. Use the one in WebKitDOMElement instead.");
return webkit_dom_element_get_id(WEBKIT_DOM_ELEMENT(element));
}
void webkit_dom_html_element_set_id(WebKitDOMHTMLElement* element, const gchar* value)
{
- g_warning("The set_id method on WebKitDOMHTMLElement is deprecated. Use the one in WebKitDOMElement instead.");
webkit_dom_element_set_id(WEBKIT_DOM_ELEMENT(element), value);
}
diff -up webkitgtk-2.4.9/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.h.disable_deprecated_get_set_id webkitgtk-2.4.9/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.h
--- webkitgtk-2.4.9/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.h.disable_deprecated_get_set_id 2015-06-22 14:33:12.813062669 +0200
+++ webkitgtk-2.4.9/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.h 2015-06-22 14:34:00.548821118 +0200
@@ -49,7 +49,7 @@ webkit_dom_blob_webkit_slice(WebKitDOMBl
*
* Deprecated: 2.2: Use webkit_dom_element_get_id() instead.
*/
-WEBKIT_DEPRECATED_FOR(webkit_dom_element_get_id) gchar*
+WEBKIT_API gchar*
webkit_dom_html_element_get_id(WebKitDOMHTMLElement* self);
/**
@@ -59,7 +59,7 @@ webkit_dom_html_element_get_id(WebKitDOM
*
* Deprecated: 2.2: Use webkit_dom_element_set_id() instead.
*/
-WEBKIT_DEPRECATED_FOR(webkit_dom_element_set_id) void
+WEBKIT_API void
webkit_dom_html_element_set_id(WebKitDOMHTMLElement* self, const gchar* value);
/**

12
webkitgtk-2.4.9-sql_initialize_string.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up webkitgtk-2.4.9/Source/WebCore/platform/sql/SQLiteStatement.cpp.sql_initialize_string webkitgtk-2.4.9/Source/WebCore/platform/sql/SQLiteStatement.cpp
--- webkitgtk-2.4.9/Source/WebCore/platform/sql/SQLiteStatement.cpp.sql_initialize_string 2015-09-14 09:25:43.004200172 +0200
+++ webkitgtk-2.4.9/Source/WebCore/platform/sql/SQLiteStatement.cpp 2015-09-14 09:25:57.852082368 +0200
@@ -71,7 +71,7 @@ int SQLiteStatement::prepare()
// this lets SQLite avoid an extra string copy.
size_t lengthIncludingNullCharacter = query.length() + 1;
- const char* tail;
+ const char* tail = nullptr;
int error = sqlite3_prepare_v2(m_database.sqlite3Handle(), query.data(), lengthIncludingNullCharacter, &m_statement, &tail);
if (error != SQLITE_OK)

39
webkitgtk-aarch64.patch Normal file
View File

@ -0,0 +1,39 @@
diff -up webkitgtk-2.4.9/Source/WTF/wtf/dtoa/utils.h.aarch64 webkitgtk-2.4.9/Source/WTF/wtf/dtoa/utils.h
--- webkitgtk-2.4.9/Source/WTF/wtf/dtoa/utils.h.aarch64 2015-05-20 11:03:24.000000000 +0200
+++ webkitgtk-2.4.9/Source/WTF/wtf/dtoa/utils.h 2015-05-20 13:45:35.629023925 +0200
@@ -49,7 +49,7 @@
defined(__ARMEL__) || \
defined(_MIPS_ARCH_MIPS32R2)
#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
-#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA)
+#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(AARCH64) || CPU(HPPA)
#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
#elif defined(_M_IX86) || defined(__i386__)
#if defined(_WIN32)
diff -up webkitgtk-2.4.9/Source/WTF/wtf/Platform.h.aarch64 webkitgtk-2.4.9/Source/WTF/wtf/Platform.h
--- webkitgtk-2.4.9/Source/WTF/wtf/Platform.h.aarch64 2015-05-20 11:03:24.000000000 +0200
+++ webkitgtk-2.4.9/Source/WTF/wtf/Platform.h 2015-05-20 13:47:34.439861401 +0200
@@ -334,6 +334,14 @@
#define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
#endif
+/* CPU(AARCH64) - AArch64 */
+#if defined(__aarch64__)
+#define WTF_CPU_AARCH64 1
+#if defined(__AARCH64BE__)
+#define WTF_CPU_BIG_ENDIAN 1
+#endif
+#endif
+
/* ==== OS() - underlying operating system; only to be used for mandated low-level services like
virtual memory, not to choose a GUI toolkit ==== */
@@ -654,7 +662,7 @@
#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS))) \
|| (CPU(IA64) && !CPU(IA64_32)) \
|| CPU(ALPHA) \
- || CPU(ARM64) \
+ || CPU(AARCH64) \
|| CPU(S390X) \
|| CPU(MIPS64) \
|| CPU(PPC64) \

57
webkitgtk.spec
View File

@ -9,7 +9,7 @@
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.2.4 Version: 2.4.9
Release: 1%{?dist} Release: 1%{?dist}
Summary: GTK+ Web content engine library Summary: GTK+ Web content engine library
@ -21,17 +21,19 @@ Source0: http://www.webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
# add support for nspluginwrapper. # add support for nspluginwrapper.
Patch0: webkit-1.3.10-nspluginwrapper.patch Patch0: webkit-1.3.10-nspluginwrapper.patch
# workarounds for non-JIT arches Patch1: webkitgtk-aarch64.patch
# https://bugs.webkit.org/show_bug.cgi?id=104270 Patch2: webkitgtk-2.4.1-cloop_fix.patch
Patch1: webkitgtk-2.1.1-yarr.patch Patch3: webkitgtk-2.4.5-cloop_fix_32.patch
# https://bugs.webkit.org/show_bug.cgi?id=103128 Patch4: webkitgtk-2.4.1-ppc64_align.patch
Patch4: webkit-2.1.90-double2intsPPC32.patch Patch5: webkitgtk-2.4.9-disable_deprecated_get_set_id.patch
# http://trac.webkit.org/changeset/169665
Patch6: webkitgtk-2.4.9-sql_initialize_string.patch
BuildRequires: bison BuildRequires: bison
BuildRequires: chrpath BuildRequires: chrpath
BuildRequires: enchant-devel BuildRequires: enchant-devel
BuildRequires: flex BuildRequires: flex
BuildRequires: geoclue-devel BuildRequires: geoclue2-devel
BuildRequires: gettext BuildRequires: gettext
BuildRequires: gperf BuildRequires: gperf
BuildRequires: gstreamer1-devel BuildRequires: gstreamer1-devel
@ -56,6 +58,11 @@ BuildRequires: cairo-devel
BuildRequires: cairo-gobject-devel BuildRequires: cairo-gobject-devel
BuildRequires: fontconfig-devel >= 2.5 BuildRequires: fontconfig-devel >= 2.5
BuildRequires: freetype-devel BuildRequires: freetype-devel
Requires: geoclue2
%ifarch ppc
BuildRequires: libatomic
%endif
%description %description
WebKitGTK+ is the port of the portable web rendering engine WebKit to the WebKitGTK+ is the port of the portable web rendering engine WebKit to the
@ -84,35 +91,40 @@ This package contains developer documentation for %{name}.
%prep %prep
%setup -qn "webkitgtk-%{version}" %setup -qn "webkitgtk-%{version}"
%patch0 -p1 -b .nspluginwrapper %patch0 -p1 -b .nspluginwrapper
%patch1 -p1 -b .yarr %patch1 -p1 -b .aarch64
%patch2 -p1 -b .cloop_fix
%patch5 -p1 -b .disable_deprecated_get_id
%patch6 -p1 -b .sql_initialize_string
# required for 32-bit big-endians
%ifarch ppc s390 %ifarch ppc s390
%patch4 -p1 -b .double2intsPPC32 %patch3 -p1 -b .cloop_fix_32
%endif
%ifarch %{power64} aarch64 ppc
%patch4 -p1 -b .ppc64_align
%endif %endif
%build %build
%ifarch s390 %{arm} ppc # Use linker flags to reduce memory consumption
# Use linker flags to reduce memory consumption on low-mem architectures
%global optflags %{optflags} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads %global optflags %{optflags} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
%endif
%ifarch s390 s390x %{arm} %ifarch s390 %{arm}
# Decrease debuginfo verbosity to reduce memory consumption even more # Decrease debuginfo verbosity to reduce memory consumption even more
%global optflags %(echo %{optflags} | sed 's/-g /-g1 /') %global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
%endif %endif
%ifarch ppc %ifarch ppc
# Use linker flag -relax to get WebKit2 build under ppc(32) with JIT disabled # Use linker flag -relax to get WebKit build under ppc(32) with JIT disabled
%global optflags %{optflags} -Wl,-relax %global optflags %{optflags} -Wl,-relax -latomic
%endif %endif
# Build with -g1 on all platforms to avoid running into 4 GB ar format limit %ifarch s390 s390x ppc %{power64} aarch64
# https://bugs.webkit.org/show_bug.cgi?id=91154 %global optflags %{optflags} -DENABLE_YARR_JIT=0
%global optflags %(echo %{optflags} | sed 's/-g /-g1 /') %endif
%configure \ %configure \
--with-gtk=2.0 \ --with-gtk=2.0 \
--disable-webkit2 \ --disable-webkit2 \
%ifarch s390 s390x ppc ppc64 %ifarch s390 s390x ppc %{power64} aarch64
--disable-jit \ --disable-jit \
%else %else
--enable-jit \ --enable-jit \
@ -122,11 +134,11 @@ This package contains developer documentation for %{name}.
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/WebKit2/webkit2gtk/webkit2
mkdir -p DerivedSources/WebKit2 mkdir -p DerivedSources/WebKit2
mkdir -p DerivedSources/webkitdom/ mkdir -p DerivedSources/webkitdom/
mkdir -p DerivedSources/InjectedBundle mkdir -p DerivedSources/InjectedBundle
mkdir -p DerivedSources/Platform mkdir -p DerivedSources/Platform
mkdir -p DerivedSources/WebKit2/webkit2gtk/webkit2
make %{_smp_mflags} V=1 make %{_smp_mflags} V=1
@ -190,6 +202,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
%{_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/JavaScriptCore-1.0.gir %{_datadir}/gir-1.0/JavaScriptCore-1.0.gir
%{_datadir}/gtk-doc/html/webkitdomgtk
%files doc %files doc
%dir %{_datadir}/gtk-doc %dir %{_datadir}/gtk-doc
@ -198,6 +211,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
%changelog %changelog
* Mon Nov 30 2015 Tomas Popela <tpopela@redhat.com> 2.4.9-1
- Update to 2.4.9
- Resolves: rhbz#1198713
* Tue Jan 21 2014 Tomas Popela <tpopela@redhat.com> 2.2.4-1 * Tue Jan 21 2014 Tomas Popela <tpopela@redhat.com> 2.2.4-1
- Update to 2.2.4 - Update to 2.2.4