diff options
11 files changed, 31 insertions, 446 deletions
diff --git a/debian/changelog b/debian/changelog index 30c8ed3..02de739 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,21 @@ +qt4-x11 (4:4.8.6+dfsg-1+dyson1) unstable; urgency=medium + + * 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 + + -- Igor Pashev <pashev.igor@gmail.com> Tue, 29 Apr 2014 17:42:38 +0400 + qt4-x11 (4:4.8.6+dfsg-1) unstable; urgency=medium * New upstream release. diff --git a/debian/patches/dyson-js-solaris-memory-layout.patch b/debian/patches/dyson-js-solaris-memory-layout.patch index fef0d57..ec868b0 100644 --- a/debian/patches/dyson-js-solaris-memory-layout.patch +++ b/debian/patches/dyson-js-solaris-memory-layout.patch @@ -3,10 +3,10 @@ Bug-Dyson: http://osdyson.org/issues/160 Bug-Dyson: http://osdyson.org/issues/145 Bug-Dyson: http://osdyson.org/issues/159 Bug-Firefox: https://bugzilla.mozilla.org/show_bug.cgi?id=577056 -Index: qt4-x11-4.8.5+dfsg/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSImmediate.h +Index: qt4-x11/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSImmediate.h =================================================================== ---- qt4-x11-4.8.5+dfsg.orig/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSImmediate.h 2013-10-30 05:37:46.172467212 +0400 -+++ qt4-x11-4.8.5+dfsg/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSImmediate.h 2013-10-30 06:26:28.052147518 +0400 +--- qt4-x11.orig/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSImmediate.h 2014-04-29 17:33:31.751535334 +0400 ++++ qt4-x11/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSImmediate.h 2014-04-29 17:33:42.752549019 +0400 @@ -196,19 +196,43 @@ static const int32_t signBit = 0x80000000; @@ -113,11 +113,11 @@ Index: qt4-x11-4.8.5+dfsg/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSI return (rawValue(v1) & rawValue(v2) & TagTypeNumber) == TagTypeNumber; #else return rawValue(v1) & rawValue(v2) & TagTypeNumber; -Index: qt4-x11-4.8.5+dfsg/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +Index: qt4-x11/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h =================================================================== ---- qt4-x11-4.8.5+dfsg.orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2013-10-30 06:29:20.587349440 +0400 -+++ qt4-x11-4.8.5+dfsg/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2013-10-30 06:30:45.148834844 +0400 -@@ -427,6 +427,9 @@ +--- qt4-x11.orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2014-04-29 17:33:31.751663516 +0400 ++++ qt4-x11/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2014-04-29 17:33:42.755179622 +0400 +@@ -457,6 +457,9 @@ /* OS(SOLARIS) - Solaris */ #if defined(sun) || defined(__sun) #define WTF_OS_SOLARIS 1 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 diff --git a/debian/patches/pkgsrc/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_NullPtr.h b/debian/patches/pkgsrc/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_NullPtr.h deleted file mode 100644 index 0c035e0..0000000 --- a/debian/patches/pkgsrc/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 $ - ---- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/NullPtr.h.orig 2013-06-07 05:16:54.000000000 +0000 -+++ b/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/debian/patches/pkgsrc/patch-src_3rdparty_webkit_Source_WebCore_features.pri b/debian/patches/pkgsrc/patch-src_3rdparty_webkit_Source_WebCore_features.pri deleted file mode 100644 index e90baeb..0000000 --- a/debian/patches/pkgsrc/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. - ---- a/src/3rdparty/webkit/Source/WebCore/features.pri.orig 2012-01-08 11:13:53.000000000 +0000 -+++ b/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/debian/patches/pkgsrc/patch-src_3rdparty_webkit_Source_WebCore_platform_Timer.cpp b/debian/patches/pkgsrc/patch-src_3rdparty_webkit_Source_WebCore_platform_Timer.cpp deleted file mode 100644 index dd9da09..0000000 --- a/debian/patches/pkgsrc/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 - ---- a/src/3rdparty/webkit/Source/WebCore/platform/Timer.cpp.orig 2012-11-23 10:09:58.000000000 +0000 -+++ b/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/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 { diff --git a/debian/patches/pkgsrc/patch-src_3rdparty_webkit_Source_WebCore_platform_network_qt_QNetworkReplyHandler.cpp b/debian/patches/pkgsrc/patch-src_3rdparty_webkit_Source_WebCore_platform_network_qt_QNetworkReplyHandler.cpp deleted file mode 100644 index d800d42..0000000 --- a/debian/patches/pkgsrc/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 $ - ---- a/src/3rdparty/webkit/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp.orig 2013-05-03 13:04:45.000000000 +0000 -+++ b/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/debian/patches/pkgsrc/patch-src_3rdparty_webkit_Source_WebKit_qt_Api_qgraphicswebview.cpp b/debian/patches/pkgsrc/patch-src_3rdparty_webkit_Source_WebKit_qt_Api_qgraphicswebview.cpp deleted file mode 100644 index c66e8c8..0000000 --- a/debian/patches/pkgsrc/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 $ - ---- a/src/3rdparty/webkit/Source/WebKit/qt/Api/qgraphicswebview.cpp.orig 2013-05-03 13:55:03.000000000 +0000 -+++ b/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/debian/patches/pkgsrc/patch-src_3rdparty_webkit_Source_WebKit_qt_WebCoreSupport_NotificationPresenterClientQt.cpp b/debian/patches/pkgsrc/patch-src_3rdparty_webkit_Source_WebKit_qt_WebCoreSupport_NotificationPresenterClientQt.cpp deleted file mode 100644 index 3e5cabb..0000000 --- a/debian/patches/pkgsrc/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 $ - ---- a/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp.orig 2013-05-03 13:43:43.000000000 +0000 -+++ b/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 - } - diff --git a/debian/patches/series b/debian/patches/series index af6d5ec..a7f715d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -61,18 +61,11 @@ pkgsrc/patch-src_3rdparty_webkit_Source_JavaScriptCore_parser_JSParser.cpp pkgsrc/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Atomics.h pkgsrc/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_HashSet.h pkgsrc/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_MathExtras.h -pkgsrc/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_NullPtr.h pkgsrc/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_RefCountedLeakCounter.h pkgsrc/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_StringImpl.h pkgsrc/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_ThreadSafeRefCounted.h pkgsrc/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Threading.h pkgsrc/patch-src_3rdparty_webkit_Source_WebCore_dom_Element.cpp -pkgsrc/patch-src_3rdparty_webkit_Source_WebCore_features.pri pkgsrc/patch-src_3rdparty_webkit_Source_WebCore_platform_DefaultLocalizationStrategy.cpp -pkgsrc/patch-src_3rdparty_webkit_Source_WebCore_platform_Timer.cpp -pkgsrc/patch-src_3rdparty_webkit_Source_WebCore_platform_Timer.h pkgsrc/patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_MediaPlayer.cpp -pkgsrc/patch-src_3rdparty_webkit_Source_WebCore_platform_network_qt_QNetworkReplyHandler.cpp pkgsrc/patch-src_3rdparty_webkit_Source_WebCore_platform_qt_PlatformKeyboardEventQt.cpp -pkgsrc/patch-src_3rdparty_webkit_Source_WebKit_qt_Api_qgraphicswebview.cpp -pkgsrc/patch-src_3rdparty_webkit_Source_WebKit_qt_WebCoreSupport_NotificationPresenterClientQt.cpp |