rpms
/
qtwebkit
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bz#893447, fix 64k pagesize issue

This commit is contained in:
Than Ngo 2013-01-11 23:17:44 +01:00
parent bea731c670
commit 3712689abb
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
qtwebkit-64k-pagesize.patch Normal file
View File

@ -0,0 +1,15 @@
diff -up qtwebkit-2.2.2-source/Source/JavaScriptCore/wtf/OSAllocatorPosix.cpp.me qtwebkit-2.2.2-source/Source/JavaScriptCore/wtf/OSAllocatorPosix.cpp
diff -up qtwebkit-2.2.2-source/Source/JavaScriptCore/wtf/PageAllocationAligned.cpp.me qtwebkit-2.2.2-source/Source/JavaScriptCore/wtf/PageAllocationAligned.cpp
--- qtwebkit-2.2.2-source/Source/JavaScriptCore/wtf/PageAllocationAligned.cpp.me 2013-01-11 22:33:35.233535266 +0100
+++ qtwebkit-2.2.2-source/Source/JavaScriptCore/wtf/PageAllocationAligned.cpp 2013-01-11 22:53:23.706822547 +0100
@@ -50,7 +50,9 @@ PageAllocationAligned PageAllocationAlig
vm_map(current_task(), &address, size, alignmentMask, flags, MEMORY_OBJECT_NULL, 0, FALSE, protection, PROT_READ | PROT_WRITE | PROT_EXEC, VM_INHERIT_DEFAULT);
return PageAllocationAligned(reinterpret_cast<void*>(address), size);
#else
- size_t alignmentDelta = alignment - pageSize();
+ size_t pagesize = pageSize();
+ if (alignment < pagesize) alignment = pagesize;
+ size_t alignmentDelta = alignment - pagesize;
// Resererve with suffcient additional VM to correctly align.
size_t reservationSize = size + alignmentDelta;

9
qtwebkit.spec
View File

@ -1,7 +1,7 @@
Name: qtwebkit
Version: 2.2.2
Release: 5%{?dist}
Release: 6%{?dist}
Summary: Qt WebKit bindings
Group: System Environment/Libraries
License: LGPLv2 with exceptions or GPLv3 with exceptions
@ -38,6 +38,9 @@ Patch7: webkit-qtwebkit-ld.gold.patch
# https://bugs.webkit.org/show_bug.cgi?id=97258
Patch8: qtwebkit-svg_infinite_loop.patch
# fix 64k pagesize issue
Patch9: qtwebkit-64k-pagesize.patch
## upstream patches
# https://bugzilla.redhat.com/891464
# https://bugs.webkit.org/show_bug.cgi?id=72285
@ -97,6 +100,7 @@ Provides: qt4-webkit-devel%{?_isa} = 2:%{version}-%{release}
#patch5 -p1 -b .qt46
%patch7 -p1 -b .ld.gold
%patch8 -p1 -b .svn_infinite_loop
%patch9 -p1 -b .64kpagesize
%patch100 -p1 -b .webkit72285
%patch102 -p1 -b .0002
%patch103 -p1 -b .0003
@ -153,6 +157,9 @@ rm -rf %{buildroot}
%changelog
* Fri Jan 11 2013 Than Ngo <than@redhat.com> 2.2.2-6
- bz#893447, fix 64k pagesize issue
* Fri Jan 04 2013 Rex Dieter <rdieter@fedoraproject.org> 2.2.2-5
- segfault in requiresLineBox at rendering/RenderBlockLineLayout.cpp (#891464)