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

1 files changed, 0 insertions, 18 deletions

diff --git a/debian/patches/pkgsrc/patch-src_3rdparty_webkit_Source_WebCore_platform_Timer.h b/debian/patches/pkgsrc/patch-src_3rdparty_webkit_Source_WebCore_platform_Timer.h
deleted file mode 100644
index f1b1dbb..0000000
--- a/debian/patches/pkgsrc/patch-src_3rdparty_webkit_Source_WebCore_platform_Timer.h
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_3rdparty_webkit_Source_WebCore_platform_Timer.h,v 1.1 2013/05/09 14:07:08 joerg Exp $
-
-Upstream changeset 92556
-
---- a/src/3rdparty/webkit/Source/WebCore/platform/Timer.h.orig	2012-11-23 10:09:58.000000000 +0000
-+++ b/src/3rdparty/webkit/Source/WebCore/platform/Timer.h
-@@ -84,9 +84,9 @@ private:
-     ThreadIdentifier m_thread;
- #endif
- 
--    friend class TimerHeapElement;
-     friend class ThreadTimers;
--    friend bool operator<(const TimerHeapElement&, const TimerHeapElement&);
-+    friend class TimerHeapLessThanFunction;
-+    friend class TimerHeapReference;
- };
- 
- template <typename TimerFiredClass> class Timer : public TimerBase {