diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2014-04-30 08:32:21 +0400 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2014-04-30 08:32:21 +0400 |
| commit | 6e8f83b063fd88006802df261bfb143093d450b4 (patch) | |
| tree | a4ce1dbbcbad1023aa0ea8db6499f37bdab3850b /debian/patches/dyson-solaris-use-system-malloc.patch | |
| parent | e216140d472c55b3cbb13a25275d6f26955239bf (diff) | |
| download | qt4-x11-master.tar.gz | |
qt4-x11 (4:4.8.6+dfsg-1+dyson1) unstable; urgency=mediumHEADdyson/4.8.6+dfsg-1+dyson1master
* Package for Dyson
* Removed (applied upstream):
pkgsrc/patch-src_3rdparty_webkit_Source_WebCore_platform_Timer.cpp
pkgsrc/patch-src_3rdparty_webkit_Source_WebCore_platform_Timer.h
* Removed because unused and does not apply cleanly:
pkgsrc/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_NullPtr.h
pkgsrc/patch-src_3rdparty_webkit_Source_WebCore_features.pri
pkgsrc/patch-src_3rdparty_webkit_Source_WebCore_platform_network_qt_QNetworkReplyHandler.cpp
pkgsrc/patch-src_3rdparty_webkit_Source_WebKit_qt_Api_qgraphicswebview.cpp
pkgsrc/patch-src_3rdparty_webkit_Source_WebKit_qt_WebCoreSupport_NotificationPresenterClientQt.cpp
* Refreshed:
dyson-js-solaris-memory-layout.patch
dyson-solaris-use-system-malloc.patch
Diffstat (limited to 'debian/patches/dyson-solaris-use-system-malloc.patch')
| -rw-r--r-- | debian/patches/dyson-solaris-use-system-malloc.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/debian/patches/dyson-solaris-use-system-malloc.patch b/debian/patches/dyson-solaris-use-system-malloc.patch index 85193ab..8eb594b 100644 --- a/debian/patches/dyson-solaris-use-system-malloc.patch +++ b/debian/patches/dyson-solaris-use-system-malloc.patch @@ -1,9 +1,9 @@ Description: otherwise we crash Index: qt4-x11/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h =================================================================== ---- qt4-x11.orig/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h 2013-09-18 21:43:02.949287604 +0400 -+++ qt4-x11/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h 2013-09-18 21:54:59.769098005 +0400 -@@ -878,6 +878,10 @@ +--- qt4-x11.orig/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h 2014-04-29 17:33:00.728319789 +0400 ++++ qt4-x11/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h 2014-04-29 17:33:06.418155206 +0400 +@@ -882,6 +882,10 @@ #endif #endif @@ -16,9 +16,9 @@ Index: qt4-x11/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h #if !defined(ENABLE_FAST_MALLOC_MATCH_VALIDATION) Index: qt4-x11/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h =================================================================== ---- qt4-x11.orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2013-09-18 21:43:05.586299290 +0400 -+++ qt4-x11/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2013-09-19 21:52:31.806307631 +0400 -@@ -711,6 +711,10 @@ +--- qt4-x11.orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2014-04-29 17:33:04.278454232 +0400 ++++ qt4-x11/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2014-04-29 17:33:31.751663516 +0400 +@@ -741,6 +741,10 @@ #define HAVE_TIMEGM 1 #endif |