[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.2.6-1-28-g62da83d

[Gustavo Noronha Silva]

The following commit has been merged in the debian/unstable branch:
commit 33d638d052c104897119f70cedeb12d6c645c5e9
Author: Gustavo Noronha Silva <kov at debian.org>
Date:   Wed Jan 12 09:38:23 2011 -0200

    Acknowledging the 1.2.5-2.1 NMU

diff --git a/debian/changelog b/debian/changelog
index eb39ea6..9e7a4cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+webkit (1.2.6-2) unstable; urgency=low
+
+  * Acknowledge 1.2.5-2.1 NMU, thanks gregor! (Closes: #598956).
+
+ -- Gustavo Noronha Silva <kov at debian.org>  Wed, 12 Jan 2011 09:33:46 -0200
+
 webkit (1.2.6-1) unstable; urgency=high
 
   [ Michael Gilbert ]
@@ -14,6 +20,15 @@ webkit (1.2.6-1) unstable; urgency=high
 
  -- Gustavo Noronha Silva <kov at debian.org>  Tue, 11 Jan 2011 09:44:19 -0200
 
+webkit (1.2.5-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Add patch 05-fix-jit-on-kfreebsd-i386.patch by Petr Salinger and 
+    Michael Dorrington: Fixes Javascript JIT crashing on kfreebsd-i386
+    (closes: #598956).
+
+ -- gregor herrmann <gregoa at debian.org>  Wed, 10 Nov 2010 23:28:55 +0100
+
 webkit (1.2.5-2) unstable; urgency=high
 
   * Unapply 02-pool-fixup-and-sparc-support.patch and
diff --git a/debian/patches/05-fix-jit-on-kfreebsd-i386.patch b/debian/patches/05-fix-jit-on-kfreebsd-i386.patch
new file mode 100644
index 0000000..9a50358
--- /dev/null
+++ b/debian/patches/05-fix-jit-on-kfreebsd-i386.patch
@@ -0,0 +1,51 @@
+Author: Petr Salinger
+Tester: Michael Dorrington
+Description: Fixes Javascript JIT crashing on kfreebsd-i386.
+ Fixes Javascript JIT issue that causes webkit to crash on kfreebsd-i386,
+ see <http://bugs.debian.org/598956>.
+
+ For reasoning of patch see:
+ "Common practices and problems found when porting to GNU/k*BSD"
+ <http://glibc-bsd.alioth.debian.org/porting/PORTING>
+
+ On kfreebsd-amd64, this issue does not occur.
+
+
+--- webkit-1.2.4/JavaScriptCore/jit/JITOpcodes.cpp	2010-09-03 20:18:02.000000000 +0100
++++ webkit-1.2.4-fix_jit_kfreebsd_i386/JavaScriptCore/jit/JITOpcodes.cpp	2010-10-07 06:09:55.000000000 +0100
+@@ -165,7 +165,7 @@
+      * stack pointer by the right amount after the call.
+      */
+ 
+-#if COMPILER(MSVC) || OS(LINUX)
++#if COMPILER(MSVC) || OS(LINUX) || defined(__GLIBC__)
+ #if COMPILER(MSVC)
+ #pragma pack(push)
+ #pragma pack(4)
+@@ -228,7 +228,7 @@
+     storePtr(regT2, Address(stackPointerRegister, OBJECT_OFFSETOF(NativeCallFrameStructure, thisValue) + OBJECT_OFFSETOF(JSValue, u.asBits.payload)));
+     storePtr(regT3, Address(stackPointerRegister, OBJECT_OFFSETOF(NativeCallFrameStructure, thisValue) + OBJECT_OFFSETOF(JSValue, u.asBits.tag)));
+ 
+-#if COMPILER(MSVC) || OS(LINUX)
++#if COMPILER(MSVC) || OS(LINUX) || defined(__GLIBC__)
+     // ArgList is passed by reference so is stackPointerRegister + 4 * sizeof(Register)
+     addPtr(Imm32(OBJECT_OFFSETOF(NativeCallFrameStructure, result)), stackPointerRegister, X86Registers::ecx);
+ 
+@@ -1689,7 +1689,7 @@
+      * not the rest of the callframe so we need a nice way to ensure we increment the
+      * stack pointer by the right amount after the call.
+      */
+-#if COMPILER(MSVC) || OS(LINUX)
++#if COMPILER(MSVC) || OS(LINUX) || defined(__GLIBC__)
+     struct NativeCallFrameStructure {
+       //  CallFrame* callFrame; // passed in EDX
+         JSObject* callee;
+@@ -1742,7 +1742,7 @@
+     loadPtr(Address(regT1, -(int)sizeof(Register)), regT1);
+     storePtr(regT1, Address(stackPointerRegister, OBJECT_OFFSETOF(NativeCallFrameStructure, thisValue)));
+ 
+-#if COMPILER(MSVC) || OS(LINUX)
++#if COMPILER(MSVC) || OS(LINUX) || defined(__GLIBC__)
+     // ArgList is passed by reference so is stackPointerRegister + 4 * sizeof(Register)
+     addPtr(Imm32(OBJECT_OFFSETOF(NativeCallFrameStructure, result)), stackPointerRegister, X86Registers::ecx);
+ 
diff --git a/debian/patches/series b/debian/patches/series
index c1c61c8..31076c4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 02-pool-fixup-and-sparc-support.patch
 04-spoof-user-agent-to-google.patch
+05-fix-jit-on-kfreebsd-i386.patch
 cve-2010-2646.patch
 cve-2010-2651.patch
 cve-2010-2900.patch

-- 
WebKit Debian packaging