summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2013-12-03 23:55:18 +0400
committerIgor Pashev <pashev.igor@gmail.com>2013-12-03 23:55:18 +0400
commit13bed4290dae80e39399c58cfc8bddfd49d830a2 (patch)
tree10ae5c7c8760345c425c73f5bd05bca2cb8560a7
parente9888804af0b10d50203f493db2f994d40629d56 (diff)
downloadqtwebkit-13bed4290dae80e39399c58cfc8bddfd49d830a2.tar.gz
Added dyson-solaris-use-system-malloc.patch
-rw-r--r--debian/changelog7
-rw-r--r--debian/patches/dyson-solaris-use-system-malloc.patch15
-rw-r--r--debian/patches/series1
3 files changed, 23 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index b0b48ff..a002a5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qtwebkit (2.2.1-7+dyson1) UNRELEASED; urgency=low
+
+ * Package for Dyson
+ * Added dyson-solaris-use-system-malloc.patch
+
+ -- Igor Pashev <pashev.igor@gmail.com> Tue, 03 Dec 2013 23:54:22 +0400
+
qtwebkit (2.2.1-7) unstable; urgency=low
[ Nobuhiro Iwamatsu ]
diff --git a/debian/patches/dyson-solaris-use-system-malloc.patch b/debian/patches/dyson-solaris-use-system-malloc.patch
new file mode 100644
index 0000000..d84c936
--- /dev/null
+++ b/debian/patches/dyson-solaris-use-system-malloc.patch
@@ -0,0 +1,15 @@
+Index: qtwebkit/Source/JavaScriptCore/wtf/Platform.h
+===================================================================
+--- qtwebkit.orig/Source/JavaScriptCore/wtf/Platform.h 2011-12-25 23:12:15.000000000 +0400
++++ qtwebkit/Source/JavaScriptCore/wtf/Platform.h 2013-12-03 23:51:43.577110918 +0400
+@@ -774,6 +774,10 @@
+ #define HAVE_TIMEGM 1
+ #endif
+
++#if OS(SOLARIS)
++#define USE_SYSTEM_MALLOC 1
++#endif
++
+ #if OS(DARWIN)
+
+ #define HAVE_ERRNO_H 1
diff --git a/debian/patches/series b/debian/patches/series
index 683ab26..4717e52 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,3 +18,4 @@ glibc_hurd_mkspecs.diff
hurd.diff
webkit_qt_hide_symbols.diff
ignore-unused-local-typedefs_error.diff
+dyson-solaris-use-system-malloc.patch