diff options
| author | Fathi Boudra <fabo@debian.org> | 2011-04-07 08:50:04 +0300 |
|---|---|---|
| committer | Fathi Boudra <fabo@debian.org> | 2011-04-07 08:50:04 +0300 |
| commit | 0a16cd8aeaf8485cb04fbe51df105b77592e964f (patch) | |
| tree | d0f32ef53d8729dad6339f853c6781f865cfe7e7 | |
| parent | 0293d406097a28c0f84062ab23e85d0ac4161a92 (diff) | |
| download | qtwebkit-0a16cd8aeaf8485cb04fbe51df105b77592e964f.tar.gz | |
New upstream release
Refresh patches
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/patches/04_enable_debug_information.diff | 2 | ||||
| -rw-r--r-- | debian/patches/linux_amd64_no_overcommit.diff | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index d8f5f0a..ab50899 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,12 @@ -qtwebkit (2.1.0~2011week09-4) UNRELEASED; urgency=low +qtwebkit (2.1.0~2011week13-1) UNRELEASED; urgency=low + * New upstream release. + + [ José Manuel Santamaría Lema ] * Add linux_amd64_no_overcommit.diff to avoid crashes on amd64 with less than 3 or 4GB of RAM. Thanks to Felix Geyer for his help with this issue. - -- José Manuel Santamaría Lema <panfaust@gmail.com> Mon, 28 Mar 2011 18:50:18 +0200 + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 06 Apr 2011 11:37:59 +0300 qtwebkit (2.1.0~2011week09-3) unstable; urgency=high diff --git a/debian/patches/04_enable_debug_information.diff b/debian/patches/04_enable_debug_information.diff index c77a67b..b36f16a 100644 --- a/debian/patches/04_enable_debug_information.diff +++ b/debian/patches/04_enable_debug_information.diff @@ -4,7 +4,7 @@ author: Fathi Boudra <fabo@debian.org> --- a/WebCore/WebCore.pro +++ b/WebCore/WebCore.pro -@@ -3165,8 +3165,6 @@ HEADERS += $$WEBKIT_API_HEADERS +@@ -3160,8 +3160,6 @@ HEADERS += $$WEBKIT_API_HEADERS !CONFIG(webkit-debug):CONFIG(QTDIR_build) { # Remove the following 2 lines if you want debug information in WebCore diff --git a/debian/patches/linux_amd64_no_overcommit.diff b/debian/patches/linux_amd64_no_overcommit.diff index 63c725e..aeec959 100644 --- a/debian/patches/linux_amd64_no_overcommit.diff +++ b/debian/patches/linux_amd64_no_overcommit.diff @@ -63,7 +63,7 @@ Description: Avoid crashes on amd64 with less than 3 or 4GB of RAM. #endif // ASLR currently only works on darwin (due to arc4random) & 64-bit (due to address space size). -@@ -331,7 +346,7 @@ +@@ -331,7 +346,7 @@ public: // 16MB of allocations have been freed, sweep m_freeList // coalescing any neighboring fragments. m_countFreedSinceLastCoalesce += size; @@ -72,7 +72,7 @@ Description: Avoid crashes on amd64 with less than 3 or 4GB of RAM. m_countFreedSinceLastCoalesce = 0; coalesceFreeSpace(); } -@@ -435,11 +450,33 @@ +@@ -435,11 +450,33 @@ void ExecutableAllocator::intializePageS static FixedVMPoolAllocator* allocator = 0; static SpinLock spinlock = SPINLOCK_INITIALIZER; |