Compare commits
7 Commits
| Author | SHA1 | Date |
|---|---|---|
Tomas Popela
|
b0a9c11a69 | |
|
Tomas Popela
|
79b9b363a8 | |
|
Tomas Popela
|
22181213e9 | |
|
Tomas Popela
|
9602d8d070 | |
|
Tomas Popela
|
e66a002044 | |
|
Tomas Popela
|
92e19e214a | |
|
Tomas Popela
|
cfe1e7365a |
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
312fd29eb7f5970660c6a64b8bf8420e webkitgtk-2.4.9.tar.xz
|
||||
24a25ccc30a7914ae50922aedf24b7bc webkitgtk-2.4.11.tar.xz
|
||||
|
|
|
|||
|
|
@ -1,199 +0,0 @@
|
|||
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
|
||||
|
||||
|
|
@ -1,45 +0,0 @@
|
|||
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
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
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.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.cloop_fix_32 2013-08-28 21:06:29.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:
|
||||
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.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.cloop_fix_32 webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter.asm
|
||||
--- webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.cloop_fix_32 2013-08-28 21:06:29.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)
|
||||
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
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
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)
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
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) \
|
||||
|
|
@ -9,8 +9,8 @@
|
|||
cp -p %1 %{buildroot}%{_pkgdocdir}/$(echo '%1' | sed -e 's!/!.!g')
|
||||
|
||||
Name: webkitgtk
|
||||
Version: 2.4.9
|
||||
Release: 10%{?dist}
|
||||
Version: 2.4.11
|
||||
Release: 2%{?dist}
|
||||
Summary: GTK+ Web content engine library
|
||||
|
||||
Group: Development/Libraries
|
||||
|
|
@ -19,15 +19,9 @@ URL: http://www.webkitgtk.org/
|
|||
|
||||
Source0: http://www.webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
|
||||
|
||||
Patch0: webkitgtk-aarch64.patch
|
||||
Patch1: webkitgtk-2.4.1-cloop_fix.patch
|
||||
Patch2: webkitgtk-2.4.5-cloop_fix_32.patch
|
||||
Patch3: webkitgtk-2.4.1-ppc64_align.patch
|
||||
# https://bugs.webkit.org/show_bug.cgi?id=142074
|
||||
Patch4: webkitgtk-2.4.8-user-agent.patch
|
||||
# http://trac.webkit.org/changeset/169665
|
||||
Patch5: webkitgtk-2.4.9-sql_initialize_string.patch
|
||||
Patch6: webkitgtk-2.4.9-abs.patch
|
||||
Patch0: webkitgtk-2.4.8-user-agent.patch
|
||||
Patch1: webkitgtk-2.4.9-abs.patch
|
||||
|
||||
BuildRequires: bison
|
||||
BuildRequires: chrpath
|
||||
|
|
@ -68,6 +62,8 @@ BuildRequires: libatomic
|
|||
WebKitGTK+ is the port of the portable web rendering engine WebKit to the
|
||||
GTK+ platform.
|
||||
|
||||
This package contains an insecure and deprecated version of WebKitGTK+ for GTK+ 2.
|
||||
|
||||
%package devel
|
||||
Summary: Development files for %{name}
|
||||
Group: Development/Libraries
|
||||
|
|
@ -90,18 +86,8 @@ This package contains developer documentation for %{name}.
|
|||
|
||||
%prep
|
||||
%setup -qn "webkitgtk-%{version}"
|
||||
%patch0 -p1 -b .aarch64
|
||||
%patch1 -p1 -b .cloop_fix
|
||||
%patch4 -p1 -b .user_agent
|
||||
%patch5 -p1 -b .sql_initialize_string
|
||||
%patch6 -p1
|
||||
# required for 32-bit big-endians
|
||||
%ifarch ppc s390 mips
|
||||
%patch2 -p1 -b .cloop_fix_32
|
||||
%endif
|
||||
%ifarch %{power64} aarch64 ppc
|
||||
%patch3 -p1 -b .ppc64_align
|
||||
%endif
|
||||
%patch0 -p1 -b .user_agent
|
||||
%patch1 -p1 -b .abs
|
||||
|
||||
%build
|
||||
# Use linker flags to reduce memory consumption
|
||||
|
|
@ -114,7 +100,7 @@ This package contains developer documentation for %{name}.
|
|||
|
||||
%ifarch ppc
|
||||
# Use linker flag -relax to get WebKit build under ppc(32) with JIT disabled
|
||||
%global optflags %{optflags} -Wl,-relax -latomic
|
||||
%global optflags %{optflags} -Wl,-relax
|
||||
%endif
|
||||
|
||||
%ifarch s390 s390x ppc %{power64} aarch64 %{mips}
|
||||
|
|
@ -124,6 +110,9 @@ This package contains developer documentation for %{name}.
|
|||
# Regenerate configure to pick up the gcc 5.0 changes
|
||||
autoreconf -v
|
||||
|
||||
# Workaround crashes with gcc 6.1
|
||||
%global optflags %{optflags} -fno-delete-null-pointer-checks
|
||||
|
||||
%if 0%{?fedora}
|
||||
%global optflags %{optflags} -DUSER_AGENT_GTK_DISTRIBUTOR_NAME=\'\\"Fedora\\"\'
|
||||
%endif
|
||||
|
|
@ -217,6 +206,25 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
|
|||
%{_datadir}/gtk-doc/html/webkitgtk
|
||||
|
||||
%changelog
|
||||
* Fri Jun 24 2016 Tomas Popela <tpopela@redhat.com> - 2.4.11-2
|
||||
- Workaround crashes with gcc 6.1
|
||||
- rhbz#1349318 - segfault in libjavascriptcoregtk-1.0.so.0.16.19 when launching Citrix Receiver
|
||||
|
||||
* Mon Apr 11 2016 Tomas Popela <tpopela@redhat.com> - 2.4.11-1
|
||||
- Update to 2.4.11
|
||||
|
||||
* Tue Apr 05 2016 Tomas Popela <tpopela@redhat.com> - 2.4.10-4
|
||||
- Fix the compilation on aarch64
|
||||
|
||||
* Tue Apr 05 2016 Tomas Popela <tpopela@redhat.com> - 2.4.10-3
|
||||
- rhbz#1321722 - [abrt] evolution: WTF::StringImpl::startsWith(): SIGSEGV with webkitgtk3-2.4.10
|
||||
|
||||
* Thu Mar 24 2016 Tomas Popela <tpopela@redhat.com> - 2.4.10-2
|
||||
- Add a workaround for rhbz#1320240
|
||||
|
||||
* Mon Mar 14 2016 Tomas Popela <tpopela@redhat.com> - 2.4.10-1
|
||||
- Update to 2.4.10
|
||||
|
||||
* Tue Feb 9 2016 Peter Robinson <pbrobinson@fedoraproject.org> 2.4.9-10
|
||||
- Add ruby deps for build
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue