qtscript-opensource-src (5.3.2+dfsg-2+dyson1) unstable; urgency=mediumHEADdyson/5.3.2+dfsg-2+dyson1master

  * Package for Dyson
  * Refreshed patches: debian/patches/dyson-use-system-malloc.patch,
    debian/patches/dyson-js-solaris-memory-layout.patch

3 files changed, 20 insertions, 12 deletions

diff --git a/debian/changelog b/debian/changelog
index a745c35..0d5f7f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+qtscript-opensource-src (5.3.2+dfsg-2+dyson1) unstable; urgency=medium
+
+  * Package for Dyson
+  * Refreshed patches: debian/patches/dyson-use-system-malloc.patch,
+    debian/patches/dyson-js-solaris-memory-layout.patch
+
+ -- Igor Pashev <pashev.igor@gmail.com>  Sun, 01 Mar 2015 20:35:58 +0300
+
 qtscript-opensource-src (5.3.2+dfsg-2) unstable; urgency=medium
 
   * Upload to unstable.
diff --git a/debian/patches/dyson-js-solaris-memory-layout.patch b/debian/patches/dyson-js-solaris-memory-layout.patch
index c9f0bb8..41e2b47 100644
--- a/debian/patches/dyson-js-solaris-memory-layout.patch
+++ b/debian/patches/dyson-js-solaris-memory-layout.patch
@@ -5,9 +5,9 @@ Bug-Dyson: http://osdyson.org/issues/159
 Bug-Firefox: https://bugzilla.mozilla.org/show_bug.cgi?id=577056
 Index: qtscript/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSImmediate.h
 ===================================================================
---- qtscript.orig/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSImmediate.h	2014-02-02 00:37:23.000000000 +0400
-+++ qtscript/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSImmediate.h	2014-04-28 12:02:19.681042540 +0400
-@@ -196,19 +196,43 @@
+--- qtscript.orig/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSImmediate.h
++++ qtscript/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSImmediate.h
+@@ -196,19 +196,43 @@ namespace JSC {
  
          static const int32_t signBit = 0x80000000;
   
@@ -51,7 +51,7 @@ Index: qtscript/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSImmediate.h
              return (rawValue(v) & TagTypeNumber) == TagTypeNumber;
  #else
              return isNumber(v);
-@@ -218,23 +242,39 @@
+@@ -218,23 +242,39 @@ namespace JSC {
  #if USE(JSVALUE64)
          static ALWAYS_INLINE bool isDouble(JSValue v)
          {
@@ -91,7 +91,7 @@ Index: qtscript/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSImmediate.h
              // Undefined and null share the same value, bar the 'undefined' bit in the extended tag.
              return (rawValue(v) & ~ExtendedTagBitUndefined) == FullTagTypeNull;
          }
-@@ -254,6 +294,10 @@
+@@ -254,6 +294,10 @@ namespace JSC {
  
          static ALWAYS_INLINE bool isEitherImmediate(JSValue v1, JSValue v2)
          {
@@ -102,7 +102,7 @@ Index: qtscript/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSImmediate.h
              return (rawValue(v1) | rawValue(v2)) & TagMask;
          }
  
-@@ -265,6 +309,10 @@
+@@ -265,6 +309,10 @@ namespace JSC {
          static ALWAYS_INLINE bool areBothImmediateIntegerNumbers(JSValue v1, JSValue v2)
          {
  #if USE(JSVALUE64)
@@ -115,9 +115,9 @@ Index: qtscript/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSImmediate.h
              return rawValue(v1) & rawValue(v2) & TagTypeNumber;
 Index: qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
 ===================================================================
---- qtscript.orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h	2014-04-28 11:52:07.408011217 +0400
-+++ qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h	2014-04-28 12:02:19.685676998 +0400
-@@ -448,6 +448,9 @@
+--- qtscript.orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
++++ qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
+@@ -460,6 +460,9 @@
  /* OS(SOLARIS) - Solaris */
  #if defined(sun) || defined(__sun)
  #define WTF_OS_SOLARIS 1
diff --git a/debian/patches/dyson-use-system-malloc.patch b/debian/patches/dyson-use-system-malloc.patch
index 1630df8..dcf1a4a 100644
--- a/debian/patches/dyson-use-system-malloc.patch
+++ b/debian/patches/dyson-use-system-malloc.patch
@@ -1,8 +1,8 @@
 Index: qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
 ===================================================================
---- qtscript.orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h	2014-04-28 11:01:55.106740703 +0400
-+++ qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h	2014-04-28 11:52:07.408011217 +0400
-@@ -821,6 +821,10 @@
+--- qtscript.orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
++++ qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
+@@ -835,6 +835,10 @@
  
  #endif