qtwebkit-opensource-src (5.3.2+dfsg-3+dyson1) unstable; urgency=mediumdyson/5.3.2+dfsg-3+dyson1

  * Package for Dyson
  * Deleted debian/patches/dyson-offlineasm-isnan.patch (applied
    upstream)
  * Refreshed debian/patches/dyson-use-system-malloc.patch
  * Refreshed debian/patches/dyson-solaris-amd64-memory-layout.patch
  * Updated debian/libqt5webkit5.symbols for illumos libc (_IO_FILE vs _FILE)

6 files changed, 62 insertions, 64 deletions

diff --git a/debian/changelog b/debian/changelog
index 4a3fee7..9c2282b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+qtwebkit-opensource-src (5.3.2+dfsg-3+dyson1) unstable; urgency=medium
+
+  * Package for Dyson
+  * Deleted debian/patches/dyson-offlineasm-isnan.patch (applied
+    upstream)
+  * Refreshed debian/patches/dyson-use-system-malloc.patch
+  * Refreshed debian/patches/dyson-solaris-amd64-memory-layout.patch
+  * Updated debian/libqt5webkit5.symbols for illumos libc (_IO_FILE vs _FILE)
+
+ -- Igor Pashev <pashev.igor@gmail.com>  Sun, 01 Mar 2015 22:38:15 +0300
+
 qtwebkit-opensource-src (5.3.2+dfsg-3) unstable; urgency=medium
 
   * Backport three patches to fix crashes:
diff --git a/debian/libqt5webkit5.symbols b/debian/libqt5webkit5.symbols
index b7d0227..0346190 100644
--- a/debian/libqt5webkit5.symbols
+++ b/debian/libqt5webkit5.symbols
@@ -2177,7 +2177,8 @@ libQt5WebKit.so.5 libqt5webkit5 #MINVER#
  _ZN3JSC7JSProxy9setTargetERNS_2VMEPNS_14JSGlobalObjectE@Base 5.2.0
  _ZN3JSC7JSScope13objectAtScopeEPS0_@Base 5.0.2
  _ZN3JSC7JSValue13isValidCalleeEv@Base 5.0.2
- _ZN3JSC7Options14dumpAllOptionsEP8_IO_FILE@Base 5.0.2
+ (arch=!illumos-amd64)_ZN3JSC7Options14dumpAllOptionsEP8_IO_FILE@Base 5.0.2
+ (arch=illumos-amd64)_ZN3JSC7Options14dumpAllOptionsEP6__FILE@Base 5.3.2+dfsg-3+dyson1
  _ZN3JSC7Options9s_optionsE@Base 5.0.2
  _ZN3JSC7Options9setOptionEPKc@Base 5.0.2
  _ZN3JSC7Profile10restoreAllEv@Base 5.0.2
diff --git a/debian/patches/dyson-offlineasm-isnan.patch b/debian/patches/dyson-offlineasm-isnan.patch
deleted file mode 100644
index ab69664..0000000
--- a/debian/patches/dyson-offlineasm-isnan.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: qt5webkit/Source/JavaScriptCore/offlineasm/cloop.rb
-===================================================================
---- qt5webkit.orig/Source/JavaScriptCore/offlineasm/cloop.rb	2014-02-02 00:37:54.000000000 +0400
-+++ qt5webkit/Source/JavaScriptCore/offlineasm/cloop.rb	2014-04-28 15:34:41.761144023 +0400
-@@ -398,7 +398,7 @@
- end
- 
- def cloopEmitCompareDoubleWithNaNCheckAndBranch(operands, condition)
--    $asm.putc "if (std::isnan(#{operands[0].clValue(:double)}) || isnan(#{operands[1].clValue(:double)})"
-+    $asm.putc "if (std::isnan(#{operands[0].clValue(:double)}) || std::isnan(#{operands[1].clValue(:double)})"
-     $asm.putc "    || (#{operands[0].clValue(:double)} #{condition} #{operands[1].clValue(:double)}))"
-     $asm.putc "    goto #{operands[2].cLabel};"
- end
diff --git a/debian/patches/dyson-solaris-amd64-memory-layout.patch b/debian/patches/dyson-solaris-amd64-memory-layout.patch
index 2210452..4a4cffe 100644
--- a/debian/patches/dyson-solaris-amd64-memory-layout.patch
+++ b/debian/patches/dyson-solaris-amd64-memory-layout.patch
@@ -7,9 +7,9 @@ Description: fix for Solaris/amd64 memory layout
  TODO: Fix JIT
 Index: qt5webkit/Source/WTF/wtf/Platform.h
 ===================================================================
---- qt5webkit.orig/Source/WTF/wtf/Platform.h	2014-04-28 13:30:10.017373871 +0400
-+++ qt5webkit/Source/WTF/wtf/Platform.h	2014-04-28 14:23:13.600091402 +0400
-@@ -410,6 +410,15 @@
+--- qt5webkit.orig/Source/WTF/wtf/Platform.h
++++ qt5webkit/Source/WTF/wtf/Platform.h
+@@ -433,6 +433,15 @@
  #define WTF_OS_SOLARIS 1
  #endif
  
@@ -25,7 +25,7 @@ Index: qt5webkit/Source/WTF/wtf/Platform.h
  /* OS(WINCE) - Windows CE; note that for this platform OS(WINDOWS) is also defined */
  #if defined(_WIN32_WCE)
  #define WTF_OS_WINCE 1
-@@ -780,7 +789,7 @@
+@@ -815,7 +824,7 @@
     low-level interpreter. */
  #if !defined(ENABLE_LLINT) \
      && ENABLE(JIT) \
@@ -34,7 +34,7 @@ Index: qt5webkit/Source/WTF/wtf/Platform.h
      && (PLATFORM(MAC) || PLATFORM(IOS) || PLATFORM(GTK) || PLATFORM(QT)) \
      && (CPU(X86) || CPU(X86_64) || CPU(ARM_THUMB2) || CPU(ARM_TRADITIONAL) || CPU(MIPS) || CPU(SH4))
  #define ENABLE_LLINT 1
-@@ -788,7 +797,7 @@
+@@ -823,7 +832,7 @@
  
  #if !defined(ENABLE_DFG_JIT) && ENABLE(JIT) && !COMPILER(MSVC)
  /* Enable the DFG JIT on X86 and X86_64.  Only tested on Mac and GNU/Linux. */
@@ -45,9 +45,9 @@ Index: qt5webkit/Source/WTF/wtf/Platform.h
  /* Enable the DFG JIT on ARMv7.  Only tested on iOS and Qt Linux. */
 Index: qt5webkit/Source/JavaScriptCore/runtime/JSCJSValue.h
 ===================================================================
---- qt5webkit.orig/Source/JavaScriptCore/runtime/JSCJSValue.h	2014-02-02 00:37:54.000000000 +0400
-+++ qt5webkit/Source/JavaScriptCore/runtime/JSCJSValue.h	2014-04-28 14:23:13.607064263 +0400
-@@ -387,6 +387,14 @@
+--- qt5webkit.orig/Source/JavaScriptCore/runtime/JSCJSValue.h
++++ qt5webkit/Source/JavaScriptCore/runtime/JSCJSValue.h
+@@ -387,6 +387,14 @@ private:
      // alignment for a GC cell, and in the zero page).
      #define ValueEmpty   0x0ll
      #define ValueDeleted 0x4ll
@@ -64,9 +64,9 @@ Index: qt5webkit/Source/JavaScriptCore/runtime/JSCJSValue.h
      EncodedValueDescriptor u;
 Index: qt5webkit/Source/JavaScriptCore/runtime/JSCJSValueInlines.h
 ===================================================================
---- qt5webkit.orig/Source/JavaScriptCore/runtime/JSCJSValueInlines.h	2014-02-02 00:37:53.000000000 +0400
-+++ qt5webkit/Source/JavaScriptCore/runtime/JSCJSValueInlines.h	2014-04-28 14:23:13.611459563 +0400
-@@ -336,6 +336,13 @@
+--- qt5webkit.orig/Source/JavaScriptCore/runtime/JSCJSValueInlines.h
++++ qt5webkit/Source/JavaScriptCore/runtime/JSCJSValueInlines.h
+@@ -336,6 +336,13 @@ inline bool JSValue::asBoolean() const
  
  #else // !USE(JSVALUE32_64) i.e. USE(JSVALUE64)
  
@@ -80,7 +80,7 @@ Index: qt5webkit/Source/JavaScriptCore/runtime/JSCJSValueInlines.h
  // 0x0 can never occur naturally because it has a tag of 00, indicating a pointer value, but a payload of 0x0, which is in the (invalid) zero page.
  inline JSValue::JSValue()
  {
-@@ -412,6 +419,10 @@
+@@ -412,6 +419,10 @@ inline int32_t JSValue::asInt32() const
  
  inline bool JSValue::isDouble() const
  {
@@ -91,7 +91,7 @@ Index: qt5webkit/Source/JavaScriptCore/runtime/JSCJSValueInlines.h
      return isNumber() && !isInt32();
  }
  
-@@ -437,22 +448,38 @@
+@@ -437,22 +448,38 @@ inline JSValue::JSValue(JSFalseTag)
  
  inline bool JSValue::isUndefinedOrNull() const
  {
@@ -130,7 +130,7 @@ Index: qt5webkit/Source/JavaScriptCore/runtime/JSCJSValueInlines.h
      return (u.asInt64 & TagTypeNumber) == TagTypeNumber;
  }
  
-@@ -483,6 +510,10 @@
+@@ -483,6 +510,10 @@ inline double JSValue::asDouble() const
  
  inline bool JSValue::isNumber() const
  {
@@ -143,9 +143,9 @@ Index: qt5webkit/Source/JavaScriptCore/runtime/JSCJSValueInlines.h
  
 Index: qt5webkit/Source/JavaScriptCore/jit/JITInlines.h
 ===================================================================
---- qt5webkit.orig/Source/JavaScriptCore/jit/JITInlines.h	2014-02-02 00:37:54.000000000 +0400
-+++ qt5webkit/Source/JavaScriptCore/jit/JITInlines.h	2014-04-28 14:23:13.618223641 +0400
-@@ -799,7 +799,14 @@
+--- qt5webkit.orig/Source/JavaScriptCore/jit/JITInlines.h
++++ qt5webkit/Source/JavaScriptCore/jit/JITInlines.h
+@@ -799,7 +799,14 @@ ALWAYS_INLINE void JIT::emitInitRegister
  
  ALWAYS_INLINE JIT::Jump JIT::emitJumpIfJSCell(RegisterID reg)
  {
@@ -162,9 +162,9 @@ Index: qt5webkit/Source/JavaScriptCore/jit/JITInlines.h
  ALWAYS_INLINE JIT::Jump JIT::emitJumpIfBothJSCells(RegisterID reg1, RegisterID reg2, RegisterID scratch)
 Index: qt5webkit/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
 ===================================================================
---- qt5webkit.orig/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm	2014-02-02 00:37:52.000000000 +0400
-+++ qt5webkit/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm	2014-04-28 14:32:30.094738838 +0400
-@@ -31,6 +31,9 @@
+--- qt5webkit.orig/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
++++ qt5webkit/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
+@@ -31,6 +31,9 @@ const ValueFalse      = TagBitTypeOther
  const ValueTrue       = TagBitTypeOther | TagBitBool | 1
  const ValueUndefined  = TagBitTypeOther | TagBitUndefined
  const ValueNull       = TagBitTypeOther
@@ -174,7 +174,7 @@ Index: qt5webkit/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
  
  # Utilities.
  macro jumpToInstruction()
-@@ -167,12 +170,21 @@
+@@ -167,12 +170,21 @@ end
  
  macro loadConstantOrVariableInt32(index, value, slow)
      loadConstantOrVariable(index, value)
@@ -196,7 +196,7 @@ Index: qt5webkit/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
  end
  
  macro writeBarrier(value)
-@@ -280,7 +292,13 @@
+@@ -280,7 +292,13 @@ _llint_op_convert_this:
      traceExecution()
      loadisFromInstruction(1, t0)
      loadq [cfr, t0, 8], t0
@@ -210,7 +210,7 @@ Index: qt5webkit/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
      loadp JSCell::m_structure[t0], t0
      bbb Structure::m_typeInfo + TypeInfo::m_type[t0], ObjectType, .opConvertThisSlow
      loadpFromInstruction(2, t1)
-@@ -364,7 +382,13 @@
+@@ -364,7 +382,13 @@ _llint_op_neq:
  macro equalNullComparison()
      loadisFromInstruction(2, t0)
      loadq [cfr, t0, 8], t0
@@ -224,7 +224,7 @@ Index: qt5webkit/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
      loadp JSCell::m_structure[t0], t2
      btbnz Structure::m_typeInfo + TypeInfo::m_flags[t2], MasqueradesAsUndefined, .masqueradesAsUndefined
      move 0, t0
-@@ -404,6 +428,10 @@
+@@ -404,6 +428,10 @@ macro strictEq(equalityOperation, slowPa
      loadisFromInstruction(2, t2)
      loadConstantOrVariable(t0, t1)
      loadConstantOrVariable(t2, t0)
@@ -235,7 +235,7 @@ Index: qt5webkit/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
      move t0, t2
      orq t1, t2
      btqz t2, tagMask, .slow
-@@ -440,6 +468,9 @@
+@@ -440,6 +468,9 @@ macro preOp(arithmeticOperation, slowPat
      traceExecution()
      loadisFromInstruction(1, t0)
      loadq [cfr, t0, 8], t1
@@ -245,7 +245,7 @@ Index: qt5webkit/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
      bqb t1, tagTypeNumber, .slow
      arithmeticOperation(t1, .slow)
      orq tagTypeNumber, t1
-@@ -468,6 +499,9 @@
+@@ -468,6 +499,9 @@ _llint_op_to_number:
      loadisFromInstruction(2, t0)
      loadisFromInstruction(1, t1)
      loadConstantOrVariable(t0, t2)
@@ -255,7 +255,7 @@ Index: qt5webkit/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
      bqaeq t2, tagTypeNumber, .opToNumberIsImmediate
      btqz t2, tagTypeNumber, .opToNumberSlow
  .opToNumberIsImmediate:
-@@ -484,6 +518,9 @@
+@@ -484,6 +518,9 @@ _llint_op_negate:
      loadisFromInstruction(2, t0)
      loadisFromInstruction(1, t1)
      loadConstantOrVariable(t0, t2)
@@ -265,7 +265,7 @@ Index: qt5webkit/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
      bqb t2, tagTypeNumber, .opNegateNotInt
      btiz t2, 0x7fffffff, .opNegateSlow
      negi t2
-@@ -506,7 +543,13 @@
+@@ -506,7 +543,13 @@ macro binaryOpCustomStore(integerOperati
      loadisFromInstruction(2, t2)
      loadConstantOrVariable(t0, t1)
      loadConstantOrVariable(t2, t0)
@@ -279,7 +279,7 @@ Index: qt5webkit/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
      bqb t1, tagTypeNumber, .op2NotInt
      loadisFromInstruction(1, t2)
      integerOperationAndStore(t1, t0, .slow, t2)
-@@ -515,6 +558,9 @@
+@@ -515,6 +558,9 @@ macro binaryOpCustomStore(integerOperati
  .op1NotInt:
      # First operand is definitely not an int, the second operand could be anything.
      btqz t0, tagTypeNumber, .slow
@@ -289,7 +289,7 @@ Index: qt5webkit/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
      bqaeq t1, tagTypeNumber, .op1NotIntOp2Int
      btqz t1, tagTypeNumber, .slow
      addq tagTypeNumber, t1
-@@ -535,6 +581,9 @@
+@@ -535,6 +581,9 @@ macro binaryOpCustomStore(integerOperati
  .op2NotInt:
      # First operand is definitely an int, the second is definitely not.
      loadisFromInstruction(1, t2)
@@ -299,7 +299,7 @@ Index: qt5webkit/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
      btqz t1, tagTypeNumber, .slow
      ci2d t0, ft0
      addq tagTypeNumber, t1
-@@ -624,6 +673,10 @@
+@@ -624,6 +673,10 @@ macro bitOp(operation, slowPath, advance
      loadisFromInstruction(1, t3)
      loadConstantOrVariable(t0, t1)
      loadConstantOrVariable(t2, t0)
@@ -310,7 +310,7 @@ Index: qt5webkit/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
      bqb t0, tagTypeNumber, .slow
      bqb t1, tagTypeNumber, .slow
      operation(t1, t0, .slow)
-@@ -717,6 +770,9 @@
+@@ -717,6 +770,9 @@ _llint_op_instanceof:
      loadp JSCell::m_structure[t2], t2
      loadq Structure::m_prototype[t2], t2
      bqeq t2, t1, .opInstanceofDone
@@ -320,7 +320,7 @@ Index: qt5webkit/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
      btqz t2, tagMask, .opInstanceofLoop
  
      move 0, t0
-@@ -735,6 +791,9 @@
+@@ -735,6 +791,9 @@ _llint_op_is_undefined:
      loadisFromInstruction(2, t1)
      loadisFromInstruction(1, t2)
      loadConstantOrVariable(t1, t0)
@@ -330,7 +330,7 @@ Index: qt5webkit/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
      btqz t0, tagMask, .opIsUndefinedCell
      cqeq t0, ValueUndefined, t3
      orq ValueFalse, t3
-@@ -772,6 +831,12 @@
+@@ -772,6 +831,12 @@ _llint_op_is_number:
      loadisFromInstruction(2, t1)
      loadisFromInstruction(1, t2)
      loadConstantOrVariable(t1, t0)
@@ -343,7 +343,7 @@ Index: qt5webkit/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
      tqnz t0, tagTypeNumber, t1
      orq ValueFalse, t1
      storeq t1, [cfr, t2, 8]
-@@ -783,7 +848,13 @@
+@@ -783,7 +848,13 @@ _llint_op_is_string:
      loadisFromInstruction(2, t1)
      loadisFromInstruction(1, t2)
      loadConstantOrVariable(t1, t0)
@@ -357,7 +357,7 @@ Index: qt5webkit/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
      loadp JSCell::m_structure[t0], t0
      cbeq Structure::m_typeInfo + TypeInfo::m_type[t0], StringType, t1
      orq ValueFalse, t1
-@@ -1150,6 +1221,9 @@
+@@ -1150,6 +1221,9 @@ _llint_op_put_by_val:
      contiguousPutByVal(
          macro (operand, scratch, address)
              loadConstantOrVariable(operand, scratch)
@@ -367,7 +367,7 @@ Index: qt5webkit/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
              bpb scratch, tagTypeNumber, .opPutByValSlow
              storep scratch, address
          end)
-@@ -1159,6 +1233,9 @@
+@@ -1159,6 +1233,9 @@ _llint_op_put_by_val:
      contiguousPutByVal(
          macro (operand, scratch, address)
              loadConstantOrVariable(operand, scratch)
@@ -377,7 +377,7 @@ Index: qt5webkit/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
              bqb scratch, tagTypeNumber, .notInt
              ci2d scratch, ft0
              jmp .ready
-@@ -1237,7 +1314,13 @@
+@@ -1237,7 +1314,13 @@ macro equalNull(cellHandler, immediateHa
      loadisFromInstruction(1, t0)
      assertNotConstant(t0)
      loadq [cfr, t0, 8], t0
@@ -391,7 +391,7 @@ Index: qt5webkit/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
      loadp JSCell::m_structure[t0], t2
      cellHandler(t2, Structure::m_typeInfo + TypeInfo::m_flags[t2], .target)
      dispatch(3)
-@@ -1295,6 +1378,10 @@
+@@ -1295,6 +1378,10 @@ macro compare(integerCompare, doubleComp
      loadisFromInstruction(2, t3)
      loadConstantOrVariable(t2, t0)
      loadConstantOrVariable(t3, t1)
@@ -402,7 +402,7 @@ Index: qt5webkit/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
      bqb t0, tagTypeNumber, .op1NotInt
      bqb t1, tagTypeNumber, .op2NotInt
      integerCompare(t0, t1, .jumpTarget)
-@@ -1342,6 +1429,9 @@
+@@ -1342,6 +1429,9 @@ _llint_op_switch_imm:
      muli sizeof SimpleJumpTable, t3    # FIXME: would be nice to peephole this!
      loadp CodeBlock::RareData::m_immediateSwitchJumpTables + VectorBufferOffset[t2], t2
      addp t3, t2
@@ -412,7 +412,7 @@ Index: qt5webkit/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
      bqb t1, tagTypeNumber, .opSwitchImmNotInt
      subi SimpleJumpTable::min[t2], t1
      biaeq t1, SimpleJumpTable::branchOffsets + VectorSizeOffset[t2], .opSwitchImmFallThrough
-@@ -1370,7 +1460,13 @@
+@@ -1370,7 +1460,13 @@ _llint_op_switch_char:
      muli sizeof SimpleJumpTable, t3
      loadp CodeBlock::RareData::m_characterSwitchJumpTables + VectorBufferOffset[t2], t2
      addp t3, t2
@@ -426,7 +426,7 @@ Index: qt5webkit/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
      loadp JSCell::m_structure[t1], t0
      bbneq Structure::m_typeInfo + TypeInfo::m_type[t0], StringType, .opSwitchCharFallThrough
      bineq JSString::m_length[t1], 1, .opSwitchCharFallThrough
-@@ -1414,7 +1510,13 @@
+@@ -1414,7 +1510,13 @@ macro arrayProfileForCall()
      if VALUE_PROFILER
          loadisFromInstruction(3, t3)
          loadq ThisArgumentOffset[cfr, t3, 8], t0
@@ -440,7 +440,7 @@ Index: qt5webkit/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
          loadp JSCell::m_structure[t0], t0
          loadpFromInstruction(5, t1)
          storep t0, ArrayProfile::m_lastSeenStructure[t1]
-@@ -1488,7 +1590,13 @@
+@@ -1488,7 +1590,13 @@ _llint_op_ret_object_or_this:
      checkSwitchToJITForEpilogue()
      loadisFromInstruction(1, t2)
      loadConstantOrVariable(t2, t0)
@@ -454,7 +454,7 @@ Index: qt5webkit/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
      loadp JSCell::m_structure[t0], t2
      bbb Structure::m_typeInfo + TypeInfo::m_type[t2], ObjectType, .opRetObjectOrThisNotObject
      doReturn()
-@@ -1504,7 +1612,13 @@
+@@ -1504,7 +1612,13 @@ _llint_op_to_primitive:
      loadisFromInstruction(2, t2)
      loadisFromInstruction(1, t3)
      loadConstantOrVariable(t2, t0)
@@ -470,8 +470,8 @@ Index: qt5webkit/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
  .opToPrimitiveIsImm:
 Index: qt5webkit/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
 ===================================================================
---- qt5webkit.orig/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h	2014-02-02 00:37:52.000000000 +0400
-+++ qt5webkit/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h	2014-04-28 14:23:13.633668995 +0400
+--- qt5webkit.orig/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
++++ qt5webkit/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h
 @@ -104,6 +104,12 @@
  #define OFFLINE_ASM_JSVALUE64 0
  #endif
diff --git a/debian/patches/dyson-use-system-malloc.patch b/debian/patches/dyson-use-system-malloc.patch
index 5022176..7d85c5a 100644
--- a/debian/patches/dyson-use-system-malloc.patch
+++ b/debian/patches/dyson-use-system-malloc.patch
@@ -1,9 +1,9 @@
 Description: fix crash on Dyson
 Index: qt5webkit/Source/WTF/wtf/Platform.h
 ===================================================================
---- qt5webkit.orig/Source/WTF/wtf/Platform.h	2014-04-29 22:18:20.566403388 +0400
-+++ qt5webkit/Source/WTF/wtf/Platform.h	2014-04-30 13:15:11.003435201 +0400
-@@ -698,7 +698,7 @@
+--- qt5webkit.orig/Source/WTF/wtf/Platform.h
++++ qt5webkit/Source/WTF/wtf/Platform.h
+@@ -721,7 +721,7 @@
  #if PLATFORM(QT)
  /* We must not customize the global operator new and delete for the Qt port. */
  #define ENABLE_GLOBAL_FASTMALLOC_NEW 0
diff --git a/debian/patches/series b/debian/patches/series
index 4953626..dff8ec2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,5 +17,4 @@ dyson-MathExtras.patch
 dyson-yield.patch
 dyson-MachineStackMarker-stackPointer.patch
 dyson-solaris-amd64-memory-layout.patch
-dyson-offlineasm-isnan.patch
 dyson-use-system-malloc.patch