summaryrefslogtreecommitdiff
path: root/x11/qt4-libs
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2014-07-22 17:01:51 +0000
committerwiz <wiz@pkgsrc.org>2014-07-22 17:01:51 +0000
commitebe05b3e7fcebe37c0dba8dfe2a8313c2e0043ba (patch)
treebff543d9e57323f03ce419323971a66cd8ebcde4 /x11/qt4-libs
parentc2a8a368276c45efa40e0cc51dc1ce1d30ede14e (diff)
downloadpkgsrc-ebe05b3e7fcebe37c0dba8dfe2a8313c2e0043ba.tar.gz
Update qt4 packages to 4.8.6.
Qt 4.8.6 provides overall over 200 improvements and bug fixes, for example: Security Fix for XML Entity Expansion Denial of Service (the "Billion Laughs" attack) Better support for Mac OS X 10.9 Mavericks Many customer requested bug fixes, for example QTBUG-15116, QTBUG-21371, QTBUG-8990, QTBUG-28601, QTBUG-20946, QTBUG-30276, QTBUG-29572 and QTBUG-13237 (just to name a few) MinGW binary packages are now built with MinGW-w64 based toolchain with gcc 4.8.2 Basque translation added and many other translations improved
Diffstat (limited to 'x11/qt4-libs')
-rw-r--r--x11/qt4-libs/Makefile3
-rw-r--r--x11/qt4-libs/distinfo18
-rw-r--r--x11/qt4-libs/patches/patch-cb20
-rw-r--r--x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_HashTable.h13
-rw-r--r--x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Threading.h29
-rw-r--r--x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_NullPtr.h20
-rw-r--r--x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_WebCore_features.pri17
-rw-r--r--x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_WebCore_platform_Timer.cpp248
-rw-r--r--x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_WebCore_platform_Timer.h18
-rw-r--r--x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_WebCore_platform_network_qt_QNetworkReplyHandler.cpp73
-rw-r--r--x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_WebKit_qt_Api_qgraphicswebview.cpp22
-rw-r--r--x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_WebKit_qt_WebCoreSupport_NotificationPresenterClientQt.cpp28
12 files changed, 5 insertions, 504 deletions
diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile
index 78135e45ac9..2e41d311773 100644
--- a/x11/qt4-libs/Makefile
+++ b/x11/qt4-libs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.98 2014/06/18 09:28:18 wiz Exp $
+# $NetBSD: Makefile,v 1.99 2014/07/22 17:01:51 wiz Exp $
PKGNAME= qt4-libs-${QTVERSION}
-PKGREVISION= 5
COMMENT= C++ X GUI toolkit
.include "../../x11/qt4-libs/Makefile.common"
diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo
index fb20b1b1079..d40d2579f16 100644
--- a/x11/qt4-libs/distinfo
+++ b/x11/qt4-libs/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.89 2013/09/21 09:40:36 joerg Exp $
+$NetBSD: distinfo,v 1.90 2014/07/22 17:01:51 wiz Exp $
-SHA1 (qt-everywhere-opensource-src-4.8.5.tar.gz) = 745f9ebf091696c0d5403ce691dc28c039d77b9e
-RMD160 (qt-everywhere-opensource-src-4.8.5.tar.gz) = 1e7bb099d5d1cda0b663cebe207c846c8d04750d
-Size (qt-everywhere-opensource-src-4.8.5.tar.gz) = 241491467 bytes
+SHA1 (qt-everywhere-opensource-src-4.8.6.tar.gz) = ddf9c20ca8309a116e0466c42984238009525da6
+RMD160 (qt-everywhere-opensource-src-4.8.6.tar.gz) = 0220d4e76ac761c9ecfb8ddab6f2c1dc6ad70c33
+Size (qt-everywhere-opensource-src-4.8.6.tar.gz) = 241623667 bytes
SHA1 (patch-aa) = 9b5f8bd980d8c3f38fd3c541380fd42d2a93a609
SHA1 (patch-ab) = 447a888cbc784a54935f23d1005d6977374a484d
SHA1 (patch-ac) = 078ddafefc719f248740f40e2063dae07cd601e5
@@ -34,7 +34,6 @@ SHA1 (patch-be) = dd47e1fbf46ca01901e664f544ea1942f61c2557
SHA1 (patch-bf) = fba76801814a69d22ce5cc58ac2a8c2bfe3bd019
SHA1 (patch-bg) = 50d10a94b98b2e0cd8aa1a05dfc1e002c0f2ef2f
SHA1 (patch-ca) = 8b69cb6201f624f43df7d766ff1967253bb22430
-SHA1 (patch-cb) = 13e1b0ffb171637e1ff84a548ef83cf4e006c207
SHA1 (patch-cg) = 2519fe525237167f10dffb9294c861f4d7063f31
SHA1 (patch-qmake_generators_makefile.cpp) = d163cfbf8e598123dd1ed2f9bb5e6935b4e5bf64
SHA1 (patch-src_3rdparty_clucene_src_CLucene_config_repl__tchar.h) = 3f19ae44da341afc4ebfe32a2eb80e38c3307648
@@ -44,9 +43,7 @@ SHA1 (patch-src_3rdparty_clucene_src_CLucene_util_Arrays.h) = 41c2cf95b81157f380
SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_Collector.cpp) = 93d5de2e9aff4dcc2e8317296801fac7e16ec613
SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_Structure.cpp) = 156e99fa8594470be4e89e212408258824044e41
SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_Structure.h) = b822a84aae7e125cb56b01bffdcfec07060d88f6
-SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_HashTable.h) = 66b510e7f8a3a33f9934ad77bbe00a6c24b60d74
SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_RefCountedLeakCounter.h) = 3b70ecb3a95944a3dd4a26c7b5c53e44aa89de1a
-SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Threading.h) = d1ff007f2070a57aba65e9eac49c9b3df7f3a583
SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_TypeTraits.h) = f23437f6e4b47f999d4fc2c576c5e7a63446b9da
SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_heap_MachineStackMarker.cpp) = cbce2e10307d26163a76266c0ceee315a609d63d
SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_heap_MarkedSpace.cpp) = c7c9c39b11007e7ec3884874a38d000e3238bf64
@@ -56,21 +53,14 @@ SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_parser_JSParser.cpp) = 95e
SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Atomics.h) = c79d9ed7f60a63090aadabbe2fa399a911449cd8
SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_HashSet.h) = 25654a9f2cedb17b5f536b324e47d56eb4010029
SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_MathExtras.h) = 68152f0077ec5bcce1b3774aaac64af5fd9e491e
-SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_NullPtr.h) = c22f73ad58f2ae2f80e3dfce3df6fe75b20ede39
SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_RefCountedLeakCounter.h) = fc4686c018471fcae375d9382737e0844a0f45a8
SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_StringImpl.h) = d5460bede6b3662df4d9dbec5826db98c6ef4f61
SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_ThreadSafeRefCounted.h) = 2d3176beb56697d033387ab10729cfb6681d01c7
SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Threading.h) = fa7519ef6ac04cd13be085783f663c329e4a14be
SHA1 (patch-src_3rdparty_webkit_Source_WebCore_dom_Element.cpp) = 90fd6a884f9fd058210c3011bea2ce695011d2e3
-SHA1 (patch-src_3rdparty_webkit_Source_WebCore_features.pri) = d0053dd2732604908fcec294b2a833aeb6d93f40
SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_DefaultLocalizationStrategy.cpp) = 0377066bd28d5eae02e8fcf200da4360c286ad84
-SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_Timer.cpp) = 6327c7ea52b5a91adc5b96319c29c8ffd994524e
-SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_Timer.h) = b1cc159d1e9e792666f0099b1439782429ccb82f
SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_MediaPlayer.cpp) = f9a1f71b4607c5f542c059873cf5735fad9ff3a1
-SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_network_qt_QNetworkReplyHandler.cpp) = 29e0c55ed578b546682154c5df4d53d3ed298d7b
SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_qt_PlatformKeyboardEventQt.cpp) = b28cf71983f8e71b82b1c634a10b3898ca13ede5
-SHA1 (patch-src_3rdparty_webkit_Source_WebKit_qt_Api_qgraphicswebview.cpp) = 87518d8aa1363d9d56358d69f896593369cf0ba9
-SHA1 (patch-src_3rdparty_webkit_Source_WebKit_qt_WebCoreSupport_NotificationPresenterClientQt.cpp) = 1a3417f521d238a845a0afc750fcf3e2a71c2fc8
SHA1 (patch-src_corelib_io_io.pri) = cde98927b524c92fae1e053c2359e77bde2c240a
SHA1 (patch-src_corelib_io_qfilesystemwatcher.cpp) = bb16b95d20286b1aa069dc25843d7e0067cc0268
SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols.cpp) = 3ad682b86d2e9bd2b282caa298508dc3e9dd8566
diff --git a/x11/qt4-libs/patches/patch-cb b/x11/qt4-libs/patches/patch-cb
deleted file mode 100644
index c846be65bc7..00000000000
--- a/x11/qt4-libs/patches/patch-cb
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-cb,v 1.4 2012/01/12 22:59:58 adam Exp $
-
---- src/gui/kernel/qapplication_mac.mm.orig 2011-12-08 05:06:02.000000000 +0000
-+++ src/gui/kernel/qapplication_mac.mm
-@@ -1257,12 +1257,14 @@ void qt_init(QApplicationPrivate *priv,
- [cocoaApp setDelegate:newDelegate];
-
- QT_MANGLE_NAMESPACE(QCocoaMenuLoader) *qtMenuLoader = [[QT_MANGLE_NAMESPACE(QCocoaMenuLoader) alloc] init];
-- if ([NSBundle loadNibNamed:@"qt_menu" owner:qtMenuLoader] == false) {
-+ NSNib *qtNib = [[NSNib alloc] initWithContentsOfURL:[NSURL fileURLWithPath:@"@QTPREFIX@/qt_menu.nib"]];
-+ if ([qtNib instantiateNibWithOwner:qtMenuLoader topLevelObjects:nil] == false) {
- qFatal("Qt internal error: qt_menu.nib could not be loaded. The .nib file"
- " should be placed in QtGui.framework/Versions/Current/Resources/ "
- " or in the resources directory of your application bundle.");
- }
-
-+ [qtNib release];
- [cocoaApp setMenu:[qtMenuLoader menu]];
- [newDelegate setMenuLoader:qtMenuLoader];
- [qtMenuLoader release];
diff --git a/x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_HashTable.h b/x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_HashTable.h
deleted file mode 100644
index cf1108cffbb..00000000000
--- a/x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_HashTable.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_HashTable.h,v 1.2 2013/07/07 18:13:56 adam Exp $
-
---- src/3rdparty/javascriptcore/JavaScriptCore/wtf/HashTable.h.orig 2013-04-29 18:21:34.000000000 +0000
-+++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/HashTable.h
-@@ -257,7 +257,7 @@ namespace WTF {
-
- using std::swap;
-
--#if !COMPILER(MSVC) && !OS(QNX)
-+#if !COMPILER(MSVC) && !OS(QNX) && !defined(_LIBCPP_VERSION) && !defined(__GXX_EXPERIMENTAL_CXX0X__)
- // The Dinkumware C++ library (used by MSVC and QNX) has a swap for pairs defined.
-
- // swap pairs by component, in case of pair members that specialize swap
diff --git a/x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Threading.h b/x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Threading.h
deleted file mode 100644
index 4342d6296d7..00000000000
--- a/x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Threading.h
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Threading.h,v 1.1 2013/05/09 14:07:08 joerg Exp $
-
---- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h.orig 2013-04-29 18:12:16.000000000 +0000
-+++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
-@@ -78,7 +78,9 @@
- #elif OS(QNX)
- #include <atomic.h>
- #elif COMPILER(GCC) && !OS(SYMBIAN)
--#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2))
-+#include <ciso646>
-+#ifdef _LIBCPP_VERSION
-+#elif (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2))
- #include <ext/atomicity.h>
- #else
- #include <bits/atomicity.h>
-@@ -250,8 +252,13 @@ inline int atomicDecrement(int volatile*
- #elif COMPILER(GCC) && !CPU(SPARC64) && !OS(SYMBIAN) // sizeof(_Atomic_word) != sizeof(int) on sparc64 gcc
- #define WTF_USE_LOCKFREE_THREADSAFESHARED 1
-
-+#ifdef _LIBCPP_VERSION
-+inline int atomicIncrement(int volatile* addend) { return __sync_fetch_and_add(addend, 1) + 1; }
-+inline int atomicDecrement(int volatile* addend) { return __sync_fetch_and_add(addend, -1) - 1; }
-+#else
- inline int atomicIncrement(int volatile* addend) { return __gnu_cxx::__exchange_and_add(addend, 1) + 1; }
- inline int atomicDecrement(int volatile* addend) { return __gnu_cxx::__exchange_and_add(addend, -1) - 1; }
-+#endif
-
- #endif
-
diff --git a/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_NullPtr.h b/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_NullPtr.h
deleted file mode 100644
index 492ff1f15b3..00000000000
--- a/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_NullPtr.h
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_NullPtr.h,v 1.2 2013/07/07 18:13:56 adam Exp $
-
---- src/3rdparty/webkit/Source/JavaScriptCore/wtf/NullPtr.h.orig 2013-06-07 05:16:54.000000000 +0000
-+++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/NullPtr.h
-@@ -35,8 +35,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
- #define __has_feature(feature) 0
- #endif
-
--#if __has_feature(cxx_nullptr) || (GCC_VERSION_AT_LEAST(4, 6, 0) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && _MSC_VER >= 1600 && !COMPILER(INTEL))
-+#if __has_feature(cxx_nullptr) || (GCC_VERSION_AT_LEAST(4, 6, 0) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && _MSC_VER >= 1600 && !COMPILER(INTEL)) || defined(_LIBCPP_VERSION)
-
-+#if defined(__clang__) && !defined(_LIBCPP_VERSION)
-+namespace std
-+{
-+ typedef decltype(nullptr) nullptr_t;
-+}
-+#endif
- #define HAVE_NULLPTR 1
-
- #else
diff --git a/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_WebCore_features.pri b/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_WebCore_features.pri
deleted file mode 100644
index 776f4a08f97..00000000000
--- a/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_WebCore_features.pri
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_3rdparty_webkit_Source_WebCore_features.pri,v 1.1 2012/01/12 22:59:58 adam Exp $
-
-Mac OS X: Problem linking with QTKit enabled.
-
---- src/3rdparty/webkit/Source/WebCore/features.pri.orig 2012-01-08 11:13:53.000000000 +0000
-+++ src/3rdparty/webkit/Source/WebCore/features.pri
-@@ -165,8 +165,8 @@ symbian|maemo5|maemo6 {
- mac:!contains(DEFINES, USE_QTMULTIMEDIA=1) {
- DEFINES -= ENABLE_VIDEO=0
- DEFINES += ENABLE_VIDEO=1
-- DEFINES += WTF_USE_QTKIT=1
-- DEFINES -= WTF_USE_QTKIT=0
-+ DEFINES -= WTF_USE_QTKIT=1
-+ DEFINES += WTF_USE_QTKIT=0
- } else: linux-*:!contains(DEFINES, USE_QTMULTIMEDIA=1) {
- !contains(QT_CONFIG, no-pkg-config):system(pkg-config --exists glib-2.0 gio-2.0 gstreamer-0.10): {
- DEFINES -= ENABLE_VIDEO=0
diff --git a/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_WebCore_platform_Timer.cpp b/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_WebCore_platform_Timer.cpp
deleted file mode 100644
index 99914957cef..00000000000
--- a/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_WebCore_platform_Timer.cpp
+++ /dev/null
@@ -1,248 +0,0 @@
-$NetBSD: patch-src_3rdparty_webkit_Source_WebCore_platform_Timer.cpp,v 1.1 2013/05/09 14:07:08 joerg Exp $
-
-Upstream changeset 92556
-
---- src/3rdparty/webkit/Source/WebCore/platform/Timer.cpp.orig 2012-11-23 10:09:58.000000000 +0000
-+++ src/3rdparty/webkit/Source/WebCore/platform/Timer.cpp
-@@ -41,6 +41,8 @@ using namespace std;
-
- namespace WebCore {
-
-+class TimerHeapReference;
-+
- // Timers are stored in a heap data structure, used to implement a priority queue.
- // This allows us to efficiently determine which timer needs to fire the soonest.
- // Then we set a single shared system timer to fire at that time.
-@@ -53,110 +55,138 @@ static Vector<TimerBase*>& timerHeap()
- return threadGlobalData().threadTimers().timerHeap();
- }
-
--// Class to represent elements in the heap when calling the standard library heap algorithms.
--// Maintains the m_heapIndex value in the timers themselves, which allows us to do efficient
--// modification of the heap.
--class TimerHeapElement {
--public:
-- explicit TimerHeapElement(int i)
-- : m_index(i)
-- , m_timer(timerHeap()[m_index])
-- {
-- checkConsistency();
-- }
--
-- TimerHeapElement(const TimerHeapElement&);
-- TimerHeapElement& operator=(const TimerHeapElement&);
--
-- TimerBase* timer() const { return m_timer; }
--
-- void checkConsistency() const
-- {
-- ASSERT(m_index >= 0);
-- ASSERT(m_index < static_cast<int>(timerHeap().size()));
-- }
-+// ----------------
-
-+class TimerHeapPointer {
-+public:
-+ TimerHeapPointer(TimerBase** pointer) : m_pointer(pointer) { }
-+ TimerHeapReference operator*() const;
-+ TimerBase* operator->() const { return *m_pointer; }
- private:
-- TimerHeapElement();
-+ TimerBase** m_pointer;
-+};
-
-- int m_index;
-- TimerBase* m_timer;
-+class TimerHeapReference {
-+public:
-+ TimerHeapReference(TimerBase*& reference) : m_reference(reference) { }
-+ operator TimerBase*() const { return m_reference; }
-+ TimerHeapPointer operator&() const { return &m_reference; }
-+ TimerHeapReference& operator=(TimerBase*);
-+ TimerHeapReference& operator=(TimerHeapReference);
-+private:
-+ TimerBase*& m_reference;
- };
-
--inline TimerHeapElement::TimerHeapElement(const TimerHeapElement& o)
-- : m_index(-1), m_timer(o.timer())
-+inline TimerHeapReference TimerHeapPointer::operator*() const
- {
-+ return *m_pointer;
- }
-
--inline TimerHeapElement& TimerHeapElement::operator=(const TimerHeapElement& o)
-+inline TimerHeapReference& TimerHeapReference::operator=(TimerBase* timer)
- {
-- TimerBase* t = o.timer();
-- m_timer = t;
-- if (m_index != -1) {
-- checkConsistency();
-- timerHeap()[m_index] = t;
-- t->m_heapIndex = m_index;
-- }
-+ m_reference = timer;
-+ Vector<TimerBase*>& heap = timerHeap();
-+ if (&m_reference >= heap.data() && &m_reference < heap.data() + heap.size())
-+ timer->m_heapIndex = &m_reference - heap.data();
- return *this;
- }
-
--inline bool operator<(const TimerHeapElement& a, const TimerHeapElement& b)
-+inline TimerHeapReference& TimerHeapReference::operator=(TimerHeapReference b)
- {
-- // The comparisons below are "backwards" because the heap puts the largest
-- // element first and we want the lowest time to be the first one in the heap.
-- double aFireTime = a.timer()->m_nextFireTime;
-- double bFireTime = b.timer()->m_nextFireTime;
-- if (bFireTime != aFireTime)
-- return bFireTime < aFireTime;
--
-- // We need to look at the difference of the insertion orders instead of comparing the two
-- // outright in case of overflow.
-- unsigned difference = a.timer()->m_heapInsertionOrder - b.timer()->m_heapInsertionOrder;
-- return difference < UINT_MAX / 2;
-+ TimerBase* timer = b;
-+ return *this = timer;
-+}
-+
-+inline void swap(TimerHeapReference a, TimerHeapReference b)
-+{
-+ TimerBase* timerA = a;
-+ TimerBase* timerB = b;
-+
-+ // Invoke the assignment operator, since that takes care of updating m_heapIndex.
-+ a = timerB;
-+ b = timerA;
- }
-
- // ----------------
-
- // Class to represent iterators in the heap when calling the standard library heap algorithms.
--// Returns TimerHeapElement for elements in the heap rather than the TimerBase pointers themselves.
--class TimerHeapIterator : public iterator<random_access_iterator_tag, TimerHeapElement, int> {
-+// Uses a custom pointer and reference type that update indices for pointers in the heap.
-+class TimerHeapIterator : public iterator<random_access_iterator_tag, TimerBase*, ptrdiff_t, TimerHeapPointer, TimerHeapReference> {
- public:
-- TimerHeapIterator() : m_index(-1) { }
-- TimerHeapIterator(int i) : m_index(i) { checkConsistency(); }
--
-- TimerHeapIterator& operator++() { checkConsistency(); ++m_index; checkConsistency(); return *this; }
-- TimerHeapIterator operator++(int) { checkConsistency(); checkConsistency(1); return m_index++; }
-+ explicit TimerHeapIterator(TimerBase** pointer) : m_pointer(pointer) { checkConsistency(); }
-
-- TimerHeapIterator& operator--() { checkConsistency(); --m_index; checkConsistency(); return *this; }
-- TimerHeapIterator operator--(int) { checkConsistency(); checkConsistency(-1); return m_index--; }
-+ TimerHeapIterator& operator++() { checkConsistency(); ++m_pointer; checkConsistency(); return *this; }
-+ TimerHeapIterator operator++(int) { checkConsistency(1); return TimerHeapIterator(m_pointer++); }
-
-- TimerHeapIterator& operator+=(int i) { checkConsistency(); m_index += i; checkConsistency(); return *this; }
-- TimerHeapIterator& operator-=(int i) { checkConsistency(); m_index -= i; checkConsistency(); return *this; }
-+ TimerHeapIterator& operator--() { checkConsistency(); --m_pointer; checkConsistency(); return *this; }
-+ TimerHeapIterator operator--(int) { checkConsistency(-1); return TimerHeapIterator(m_pointer--); }
-
-- TimerHeapElement operator*() const { return TimerHeapElement(m_index); }
-- TimerHeapElement operator[](int i) const { return TimerHeapElement(m_index + i); }
-+ TimerHeapIterator& operator+=(ptrdiff_t i) { checkConsistency(); m_pointer += i; checkConsistency(); return *this; }
-+ TimerHeapIterator& operator-=(ptrdiff_t i) { checkConsistency(); m_pointer -= i; checkConsistency(); return *this; }
-
-- int index() const { return m_index; }
-+ TimerHeapReference operator*() const { return TimerHeapReference(*m_pointer); }
-+ TimerHeapReference operator[](ptrdiff_t i) const { return TimerHeapReference(m_pointer[i]); }
-+ TimerBase* operator->() const { return *m_pointer; }
-
-- void checkConsistency(int offset = 0) const
-+private:
-+ void checkConsistency(ptrdiff_t offset = 0) const
- {
-- ASSERT_UNUSED(offset, m_index + offset >= 0);
-- ASSERT_UNUSED(offset, m_index + offset <= static_cast<int>(timerHeap().size()));
-+ ASSERT(m_pointer >= timerHeap().data());
-+ ASSERT(m_pointer <= timerHeap().data() + timerHeap().size());
-+ ASSERT_UNUSED(offset, m_pointer + offset >= timerHeap().data());
-+ ASSERT_UNUSED(offset, m_pointer + offset <= timerHeap().data() + timerHeap().size());
- }
-
--private:
-- int m_index;
-+ friend bool operator==(TimerHeapIterator, TimerHeapIterator);
-+ friend bool operator!=(TimerHeapIterator, TimerHeapIterator);
-+ friend bool operator<(TimerHeapIterator, TimerHeapIterator);
-+ friend bool operator>(TimerHeapIterator, TimerHeapIterator);
-+ friend bool operator<=(TimerHeapIterator, TimerHeapIterator);
-+ friend bool operator>=(TimerHeapIterator, TimerHeapIterator);
-+
-+ friend TimerHeapIterator operator+(TimerHeapIterator, size_t);
-+ friend TimerHeapIterator operator+(size_t, TimerHeapIterator);
-+
-+ friend TimerHeapIterator operator-(TimerHeapIterator, size_t);
-+ friend ptrdiff_t operator-(TimerHeapIterator, TimerHeapIterator);
-+
-+ TimerBase** m_pointer;
- };
-
--inline bool operator==(TimerHeapIterator a, TimerHeapIterator b) { return a.index() == b.index(); }
--inline bool operator!=(TimerHeapIterator a, TimerHeapIterator b) { return a.index() != b.index(); }
--inline bool operator<(TimerHeapIterator a, TimerHeapIterator b) { return a.index() < b.index(); }
-+inline bool operator==(TimerHeapIterator a, TimerHeapIterator b) { return a.m_pointer == b.m_pointer; }
-+inline bool operator!=(TimerHeapIterator a, TimerHeapIterator b) { return a.m_pointer != b.m_pointer; }
-+inline bool operator<(TimerHeapIterator a, TimerHeapIterator b) { return a.m_pointer < b.m_pointer; }
-+inline bool operator>(TimerHeapIterator a, TimerHeapIterator b) { return a.m_pointer > b.m_pointer; }
-+inline bool operator<=(TimerHeapIterator a, TimerHeapIterator b) { return a.m_pointer <= b.m_pointer; }
-+inline bool operator>=(TimerHeapIterator a, TimerHeapIterator b) { return a.m_pointer >= b.m_pointer; }
-+
-+inline TimerHeapIterator operator+(TimerHeapIterator a, size_t b) { return TimerHeapIterator(a.m_pointer + b); }
-+inline TimerHeapIterator operator+(size_t a, TimerHeapIterator b) { return TimerHeapIterator(a + b.m_pointer); }
-
--inline TimerHeapIterator operator+(TimerHeapIterator a, int b) { return a.index() + b; }
--inline TimerHeapIterator operator+(int a, TimerHeapIterator b) { return a + b.index(); }
-+inline TimerHeapIterator operator-(TimerHeapIterator a, size_t b) { return TimerHeapIterator(a.m_pointer - b); }
-+inline ptrdiff_t operator-(TimerHeapIterator a, TimerHeapIterator b) { return a.m_pointer - b.m_pointer; }
-
--inline TimerHeapIterator operator-(TimerHeapIterator a, int b) { return a.index() - b; }
--inline int operator-(TimerHeapIterator a, TimerHeapIterator b) { return a.index() - b.index(); }
-+// ----------------
-+
-+class TimerHeapLessThanFunction {
-+public:
-+ bool operator()(TimerBase*, TimerBase*) const;
-+};
-+
-+inline bool TimerHeapLessThanFunction::operator()(TimerBase* a, TimerBase* b) const
-+{
-+ // The comparisons below are "backwards" because the heap puts the largest
-+ // element first and we want the lowest time to be the first one in the heap.
-+ double aFireTime = a->m_nextFireTime;
-+ double bFireTime = b->m_nextFireTime;
-+ if (bFireTime != aFireTime)
-+ return bFireTime < aFireTime;
-+
-+ // We need to look at the difference of the insertion orders instead of comparing the two
-+ // outright in case of overflow.
-+ unsigned difference = a->m_heapInsertionOrder - b->m_heapInsertionOrder;
-+ return difference < numeric_limits<unsigned>::max() / 2;
-+}
-
- // ----------------
-
-@@ -225,7 +255,8 @@ void TimerBase::heapDecreaseKey()
- {
- ASSERT(m_nextFireTime != 0);
- checkHeapIndex();
-- push_heap(TimerHeapIterator(0), TimerHeapIterator(m_heapIndex + 1));
-+ TimerBase** heapData = timerHeap().data();
-+ push_heap(TimerHeapIterator(heapData), TimerHeapIterator(heapData + m_heapIndex + 1), TimerHeapLessThanFunction());
- checkHeapIndex();
- }
-
-@@ -274,7 +305,9 @@ void TimerBase::heapPopMin()
- {
- ASSERT(this == timerHeap().first());
- checkHeapIndex();
-- pop_heap(TimerHeapIterator(0), TimerHeapIterator(timerHeap().size()));
-+ Vector<TimerBase*>& heap = timerHeap();
-+ TimerBase** heapData = heap.data();
-+ pop_heap(TimerHeapIterator(heapData), TimerHeapIterator(heapData + heap.size()), TimerHeapLessThanFunction());
- checkHeapIndex();
- ASSERT(this == timerHeap().last());
- }
diff --git a/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_WebCore_platform_Timer.h b/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_WebCore_platform_Timer.h
deleted file mode 100644
index 27554584312..00000000000
--- a/x11/qt4-libs/patches/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
-
---- src/3rdparty/webkit/Source/WebCore/platform/Timer.h.orig 2012-11-23 10:09:58.000000000 +0000
-+++ 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 {
diff --git a/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_WebCore_platform_network_qt_QNetworkReplyHandler.cpp b/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_WebCore_platform_network_qt_QNetworkReplyHandler.cpp
deleted file mode 100644
index 5be5154e7da..00000000000
--- a/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_WebCore_platform_network_qt_QNetworkReplyHandler.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-$NetBSD: patch-src_3rdparty_webkit_Source_WebCore_platform_network_qt_QNetworkReplyHandler.cpp,v 1.1 2013/05/09 14:07:08 joerg Exp $
-
---- src/3rdparty/webkit/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp.orig 2013-05-03 13:04:45.000000000 +0000
-+++ src/3rdparty/webkit/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
-@@ -235,7 +235,7 @@ QNetworkReply* QNetworkReplyWrapper::rel
- resetConnections();
- QNetworkReply* reply = m_reply;
- m_reply = 0;
-- m_sniffer = 0;
-+ m_sniffer = nullptr;
-
- reply->setParent(0);
- return reply;
-@@ -300,7 +300,7 @@ void QNetworkReplyWrapper::receiveSniffe
- Q_ASSERT(m_sniffer);
-
- m_sniffedMIMEType = m_sniffer->mimeType();
-- m_sniffer = 0;
-+ m_sniffer = nullptr;
-
- emitMetaDataChanged();
- }
-@@ -417,7 +417,7 @@ QNetworkReply* QNetworkReplyHandler::rel
- return 0;
-
- QNetworkReply* reply = m_replyWrapper->release();
-- m_replyWrapper = 0;
-+ m_replyWrapper = nullptr;
- return reply;
- }
-
-@@ -440,12 +440,12 @@ void QNetworkReplyHandler::finish()
-
- ResourceHandleClient* client = m_resourceHandle->client();
- if (!client) {
-- m_replyWrapper = 0;
-+ m_replyWrapper = nullptr;
- return;
- }
-
- if (m_replyWrapper->wasRedirected()) {
-- m_replyWrapper = 0;
-+ m_replyWrapper = nullptr;
- m_queue.push(&QNetworkReplyHandler::start);
- return;
- }
-@@ -465,7 +465,7 @@ void QNetworkReplyHandler::finish()
- }
- }
-
-- m_replyWrapper = 0;
-+ m_replyWrapper = nullptr;
- }
-
- void QNetworkReplyHandler::sendResponseIfNeeded()
-@@ -539,7 +539,7 @@ void QNetworkReplyHandler::redirect(Reso
- newUrl.toString(),
- QCoreApplication::translate("QWebPage", "Redirection limit reached"));
- client->didFail(m_resourceHandle, error);
-- m_replyWrapper = 0;
-+ m_replyWrapper = nullptr;
- return;
- }
-
-@@ -666,7 +666,7 @@ void QNetworkReplyHandler::start()
- if (!reply)
- return;
-
-- m_replyWrapper = new QNetworkReplyWrapper(&m_queue, reply, m_resourceHandle->shouldContentSniff() && d->m_context->mimeSniffingEnabled(), this);
-+ m_replyWrapper = adoptPtr(new QNetworkReplyWrapper(&m_queue, reply, m_resourceHandle->shouldContentSniff() && d->m_context->mimeSniffingEnabled(), this));
-
- if (m_loadType == SynchronousLoad) {
- m_replyWrapper->synchronousLoad();
diff --git a/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_WebKit_qt_Api_qgraphicswebview.cpp b/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_WebKit_qt_Api_qgraphicswebview.cpp
deleted file mode 100644
index 8c0190df1a4..00000000000
--- a/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_WebKit_qt_Api_qgraphicswebview.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-src_3rdparty_webkit_Source_WebKit_qt_Api_qgraphicswebview.cpp,v 1.1 2013/05/09 14:07:08 joerg Exp $
-
---- src/3rdparty/webkit/Source/WebKit/qt/Api/qgraphicswebview.cpp.orig 2013-05-03 13:55:03.000000000 +0000
-+++ src/3rdparty/webkit/Source/WebKit/qt/Api/qgraphicswebview.cpp
-@@ -471,7 +471,7 @@ void QGraphicsWebViewPrivate::detachCurr
- return;
-
- page->d->view.clear();
-- page->d->client = 0;
-+ page->d->client = nullptr;
-
- // if the page was created by us, we own it and need to
- // destroy it as well.
-@@ -504,7 +504,7 @@ void QGraphicsWebView::setPage(QWebPage*
- if (!d->page)
- return;
-
-- d->page->d->client = new PageClientQGraphicsWidget(this, page); // set the page client
-+ d->page->d->client = adoptPtr(new PageClientQGraphicsWidget(this, page)); // set the page client
-
- if (d->overlay())
- d->overlay()->prepareGraphicsItemGeometryChange();
diff --git a/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_WebKit_qt_WebCoreSupport_NotificationPresenterClientQt.cpp b/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_WebKit_qt_WebCoreSupport_NotificationPresenterClientQt.cpp
deleted file mode 100644
index d7ed5c83e34..00000000000
--- a/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_WebKit_qt_WebCoreSupport_NotificationPresenterClientQt.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-src_3rdparty_webkit_Source_WebKit_qt_WebCoreSupport_NotificationPresenterClientQt.cpp,v 1.1 2013/05/09 14:07:08 joerg Exp $
-
---- src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp.orig 2013-05-03 13:43:43.000000000 +0000
-+++ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp
-@@ -73,9 +73,9 @@ NotificationWrapper::NotificationWrapper
- #if ENABLE(NOTIFICATIONS)
-
- #ifndef QT_NO_SYSTEMTRAYICON
-- m_notificationIcon = 0;
-+ m_notificationIcon = nullptr;
- #endif
-- m_presenter = 0;
-+ m_presenter = nullptr;
- #endif
- }
-
-@@ -211,9 +211,9 @@ void NotificationPresenterClientQt::disp
- QPixmap pixmap;
- if (bytes.length() && pixmap.loadFromData(bytes)) {
- QIcon icon(pixmap);
-- wrapper->m_notificationIcon = new QSystemTrayIcon(icon);
-+ wrapper->m_notificationIcon = adoptPtr(new QSystemTrayIcon(icon));
- } else
-- wrapper->m_notificationIcon = new QSystemTrayIcon();
-+ wrapper->m_notificationIcon = adoptPtr(new QSystemTrayIcon());
- #endif
- }
-