diff --git a/webkitgtk-2.5.90-cloop_fix.patch b/webkitgtk-2.5.90-cloop_fix.patch deleted file mode 100644 index c033641..0000000 --- a/webkitgtk-2.5.90-cloop_fix.patch +++ /dev/null @@ -1,99 +0,0 @@ -diff -up webkitgtk-2.5.90/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm.cloop_fix webkitgtk-2.5.90/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm ---- webkitgtk-2.5.90/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm.cloop_fix 2014-09-22 01:22:29.943407090 -0600 -+++ webkitgtk-2.5.90/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2014-09-22 01:20:25.463025643 -0600 -@@ -2094,7 +2094,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) -@@ -2111,7 +2111,7 @@ end - - macro getClosureVar() - loadp JSEnvironmentRecord::m_registers[t0], t0 -- loadisFromInstruction(6, t1) -+ loadpFromInstruction(6, t1) - loadq [t0, t1, 8], t0 - valueProfile(t0, 7, t1) - loadisFromInstruction(1, t1) -@@ -2168,7 +2168,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 - -@@ -2185,7 +2185,7 @@ macro putClosureVar() - loadisFromInstruction(3, t1) - loadConstantOrVariable(t1, t2) - loadp JSEnvironmentRecord::m_registers[t0], t0 -- loadisFromInstruction(6, t1) -+ loadpFromInstruction(6, t1) - storeq t2, [t0, t1, 8] - end - -diff -up webkitgtk-2.5.90/Source/JavaScriptCore/bytecode/CodeBlock.cpp.cloop_fix webkitgtk-2.5.90/Source/JavaScriptCore/bytecode/CodeBlock.cpp ---- webkitgtk-2.5.90/Source/JavaScriptCore/bytecode/CodeBlock.cpp.cloop_fix 2014-09-17 06:31:08.000000000 -0600 -+++ webkitgtk-2.5.90/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2014-09-24 06:00:21.573643180 -0600 -@@ -1519,13 +1519,13 @@ void CodeBlock::dumpBytecode( - int id0 = (++it)->u.operand; - ResolveModeAndType modeAndType = ResolveModeAndType((++it)->u.operand); - ++it; // Structure -- int operand = (++it)->u.operand; // Operand -+ void *operand = (++it)->u.pointer; // Operand - ++it; // Skip value profile. - printLocationAndOp(out, exec, location, it, "get_from_scope"); -- out.printf("%s, %s, %s, %u<%s|%s>, , %d", -+ out.printf("%s, %s, %s, %u<%s|%s>, , %lu", - registerName(r0).data(), registerName(r1).data(), idName(id0, identifier(id0)).data(), - modeAndType.operand(), resolveModeName(modeAndType.mode()), resolveTypeName(modeAndType.type()), -- operand); -+ reinterpret_cast(operand)); - break; - } - case op_put_to_scope: { -@@ -1534,12 +1534,12 @@ void CodeBlock::dumpBytecode( - int r1 = (++it)->u.operand; - ResolveModeAndType modeAndType = ResolveModeAndType((++it)->u.operand); - ++it; // Structure -- int operand = (++it)->u.operand; // Operand -+ void *operand = (++it)->u.pointer; // Operand - printLocationAndOp(out, exec, location, it, "put_to_scope"); -- out.printf("%s, %s, %s, %u<%s|%s>, , %d", -+ out.printf("%s, %s, %s, %u<%s|%s>, , %lu", - registerName(r0).data(), idName(id0, identifier(id0)).data(), registerName(r1).data(), - modeAndType.operand(), resolveModeName(modeAndType.mode()), resolveTypeName(modeAndType.type()), -- operand); -+ reinterpret_cast(operand)); - break; - } - default: -diff -up webkitgtk-2.5.90/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp.cloop_fix webkitgtk-2.5.90/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp ---- webkitgtk-2.5.90/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp.cloop_fix 2014-09-22 01:23:26.643580502 -0600 -+++ webkitgtk-2.5.90/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp 2014-09-24 06:02:36.574037807 -0600 -@@ -1392,7 +1396,7 @@ LLINT_SLOW_PATH_DECL(slow_path_get_from_ - { - ConcurrentJITLocker locker(codeBlock->m_lock); - pc[5].u.structure.set(exec->vm(), codeBlock->ownerExecutable(), structure); -- pc[6].u.operand = slot.cachedOffset(); -+ pc[6].u.pointer = reinterpret_cast(slot.cachedOffset()); - } - structure->startWatchingPropertyForReplacements(vm, slot.cachedOffset()); - } -diff -up webkitgtk-2.5.90/Source/JavaScriptCore/runtime/CommonSlowPaths.h.cloop_fix webkitgtk-2.5.90/Source/JavaScriptCore/runtime/CommonSlowPaths.h ---- webkitgtk-2.5.90/Source/JavaScriptCore/runtime/CommonSlowPaths.h.cloop_fix 2014-09-22 01:25:13.843908763 -0600 -+++ webkitgtk-2.5.90/Source/JavaScriptCore/runtime/CommonSlowPaths.h 2014-09-24 06:03:23.834201352 -0600 -@@ -115,7 +116,7 @@ inline void tryCachePutToScopeGlobal( - - 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(slot.cachedOffset()); - } - - } // namespace CommonSlowPaths diff --git a/webkitgtk-2.8.0-page_size_align.patch b/webkitgtk-2.8.0-page_size_align.patch deleted file mode 100644 index 63060ca..0000000 --- a/webkitgtk-2.8.0-page_size_align.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -up webkitgtk-2.8.0/Source/JavaScriptCore/heap/CopiedBlock.h.page_size_align webkitgtk-2.8.0/Source/JavaScriptCore/heap/CopiedBlock.h ---- webkitgtk-2.8.0/Source/JavaScriptCore/heap/CopiedBlock.h.page_size_align 2015-03-23 09:08:04.000000000 +0100 -+++ webkitgtk-2.8.0/Source/JavaScriptCore/heap/CopiedBlock.h 2015-04-08 12:02:51.218138924 +0200 -@@ -79,7 +79,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.8.0/Source/JavaScriptCore/interpreter/JSStack.cpp.page_size_align webkitgtk-2.8.0/Source/JavaScriptCore/interpreter/JSStack.cpp ---- webkitgtk-2.8.0/Source/JavaScriptCore/interpreter/JSStack.cpp.page_size_align 2015-04-08 12:02:51.218138924 +0200 -+++ webkitgtk-2.8.0/Source/JavaScriptCore/interpreter/JSStack.cpp 2015-04-08 12:04:48.158143620 +0200 -@@ -58,7 +58,8 @@ JSStack::JSStack(VM& vm) - size_t capacity = Options::maxPerThreadStackUsage(); - ASSERT(capacity && isPageAligned(capacity)); - -- m_reservation = PageReservation::reserve(WTF::roundUpToMultipleOf(commitSize, capacity), OSAllocator::JSVMStackPages); -+ size_t commitsize = pageSize(); -+ m_reservation = PageReservation::reserve(WTF::roundUpToMultipleOf(commitsize, capacity), OSAllocator::JSVMStackPages); - setStackLimit(highAddress()); - m_commitTop = highAddress(); - -@@ -92,7 +93,8 @@ bool JSStack::growSlowCase(Register* new - // have it is still within our budget. If not, we'll fail to grow and - // return false. - ptrdiff_t delta = reinterpret_cast(m_commitTop) - reinterpret_cast(newTopOfStackWithReservedZone); -- delta = WTF::roundUpToMultipleOf(commitSize, delta); -+ size_t commitsize = pageSize(); -+ delta = WTF::roundUpToMultipleOf(commitsize, delta); - Register* newCommitTop = m_commitTop - (delta / sizeof(Register)); - if (newCommitTop < reservationTop()) - return false; diff --git a/webkitgtk-2.8.0-s390_fixes.patch b/webkitgtk-2.8.0-s390_fixes.patch deleted file mode 100644 index a73290b..0000000 --- a/webkitgtk-2.8.0-s390_fixes.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up webkitgtk-2.8.0/Source/bmalloc/bmalloc/Algorithm.h.s390_fixes webkitgtk-2.8.0/Source/bmalloc/bmalloc/Algorithm.h ---- webkitgtk-2.8.0/Source/bmalloc/bmalloc/Algorithm.h.s390_fixes 2015-03-04 15:25:17.000000000 +0100 -+++ webkitgtk-2.8.0/Source/bmalloc/bmalloc/Algorithm.h 2015-03-27 10:59:40.245010499 +0100 -@@ -66,7 +66,7 @@ inline constexpr bool isPowerOfTwo(size_ - template inline T roundUpToMultipleOf(size_t divisor, T x) - { - BASSERT(isPowerOfTwo(divisor)); -- return reinterpret_cast((reinterpret_cast(x) + (divisor - 1)) & ~(divisor - 1)); -+ return reinterpret_cast((reinterpret_cast(x) + (divisor - 1)) & ~(divisor - 1)); - } - - template inline constexpr T roundUpToMultipleOf(T x) -diff -up webkitgtk-2.8.0/Source/bmalloc/bmalloc/Sizes.h.s390_fixes webkitgtk-2.8.0/Source/bmalloc/bmalloc/Sizes.h ---- webkitgtk-2.8.0/Source/bmalloc/bmalloc/Sizes.h.s390_fixes 2015-03-04 15:25:17.000000000 +0100 -+++ webkitgtk-2.8.0/Source/bmalloc/bmalloc/Sizes.h 2015-03-27 10:59:40.245010499 +0100 -@@ -99,7 +99,7 @@ namespace Sizes { - inline size_t sizeClass(size_t size) - { - static const size_t sizeClassMask = (mediumMax / alignment) - 1; -- return mask((size - 1) / alignment, sizeClassMask); -+ return mask(static_cast((size - 1) / alignment), sizeClassMask); - } - - inline size_t objectSize(size_t sizeClass) diff --git a/webkitgtk4.spec b/webkitgtk4.spec index 4209252..943c52f 100644 --- a/webkitgtk4.spec +++ b/webkitgtk4.spec @@ -5,11 +5,9 @@ mkdir -p _license_files ; \ cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g') -%global _hardened_build 1 - Name: webkitgtk4 Version: 2.11.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: GTK+ Web content engine library License: LGPLv2 @@ -18,13 +16,8 @@ Source0: http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz # https://bugs.webkit.org/show_bug.cgi?id=142074 Patch0: webkitgtk-2.7.90-user-agent-branding.patch -# CLoop fixes (applied just on secondary arches) -Patch1: webkitgtk-2.5.90-cloop_fix.patch -Patch2: webkitgtk-2.8.0-page_size_align.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=1206161 -Patch3: webkitgtk-2.8.0-s390_fixes.patch # https://bugs.webkit.org/show_bug.cgi?id=135972 -Patch5: webkitgtk-2.9.4-youtube.patch +Patch1: webkitgtk-2.9.4-youtube.patch BuildRequires: at-spi2-core-devel BuildRequires: bison @@ -130,19 +123,9 @@ files for developing applications that use JavaScript engine from %{name}. %prep %setup -q -n webkitgtk-%{version} %patch0 -p1 -b .user_agent -#%ifarch s390 s390x %{arm} ppc %{power64} %{mips} -# FIXME Temporarily disabled due to https://bugzilla.redhat.com/show_bug.cgi?id=1167004 -# Enabled just on secondary arches where we use CLoop -#%patch1 -p1 -b .cloop_fix -#%patch2 -p1 -b .page_size_align -#%endif -%ifarch s390 -%patch3 -p1 -b .s390_fixes -%endif -%patch5 -p1 -b .youtube +%patch1 -p1 -b .youtube # Remove bundled libraries -rm -rf Source/ThirdParty/leveldb/ rm -rf Source/ThirdParty/gtest/ rm -rf Source/ThirdParty/qunit/ @@ -165,11 +148,6 @@ rm -rf Source/ThirdParty/qunit/ %global optflags %{optflags} -Wl,-relax -latomic %endif -%ifarch s390 s390x %{arm} ppc %{power64} %{mips} -# Turn off bmalloc on secondary arches (as it is not ready for them) -%global optflags %{optflags} -DUSE_BMALLOC=0 -%endif - %if 0%{?fedora} %global optflags %{optflags} -DUSER_AGENT_GTK_DISTRIBUTOR_NAME=\'\\"Fedora\\"\' %endif @@ -189,6 +167,9 @@ pushd %{_target_platform} %ifarch s390 s390x ppc %{power64} aarch64 %{mips} -DENABLE_JIT=OFF \ %endif +%ifarch s390 s390x %{arm} ppc %{power64} %{mips} + -DUSE_SYSTEM_MALLOC=ON +%endif .. popd @@ -260,6 +241,16 @@ make %{?_smp_mflags} -C %{_target_platform} %{_datadir}/gtk-doc/html/webkitdomgtk-4.0/ %changelog +* Wed Dec 30 2015 Michael Catanzaro - 2.11.2-6 +- Remove webkitgtk-2.5.90-cloop_fix.patch and + webkitgtk-2.8.0-page_size_align.patch. These have been broken for ages. +- Remove webkitgtk-2.8.0-s390_fixes.patch since this is a patch for bmalloc, but + we disable bmalloc on s390. +- Updated webkitgtk-2.11.2-youtube.patch by Mario, now slightly less awful. +- Don't request hardened build, it's the default. +- Use public USE_SYSTEM_MALLOC option instead of unsupported DISABLE_BMALLOC. +- lldb is not bundled anymore. + * Wed Dec 30 2015 Michal Toman - 2.11.2-5 - Add support for MIPS