[Midnightbsd-cvs] mports [17583] trunk/www: move qt4 webkit port to live with the others
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Sep 27 13:26:50 EDT 2014
Revision: 17583
http://svnweb.midnightbsd.org/mports/?rev=17583
Author: laffer1
Date: 2014-09-27 13:26:48 -0400 (Sat, 27 Sep 2014)
Log Message:
-----------
move qt4 webkit port to live with the others
Modified Paths:
--------------
trunk/www/Makefile
trunk/www/webkit-qt4/Makefile
trunk/www/webkit-qt4/distinfo
trunk/www/webkit-qt4/files/patch-libcxx
trunk/www/webkit-qt4/files/patch-src__3rdparty__webkit__Source__JavaScriptCore__wtf__Atomics.h
trunk/www/webkit-qt4/pkg-plist
Added Paths:
-----------
trunk/www/webkit-qt4/
Removed Paths:
-------------
trunk/www/qt4-webkit/
trunk/www/webkit-qt4/files/patch-git_ccd1b2ee
trunk/www/webkit-qt4/pkg-descr
Modified: trunk/www/Makefile
===================================================================
--- trunk/www/Makefile 2014-09-27 17:18:09 UTC (rev 17582)
+++ trunk/www/Makefile 2014-09-27 17:26:48 UTC (rev 17583)
@@ -95,7 +95,6 @@
SUBDIR += polipo
SUBDIR += privoxy
SUBDIR += py-httplib2
-SUBDIR += qt4-webkit
SUBDIR += retsina
SUBDIR += seamonkey
SUBDIR += serf
@@ -114,6 +113,7 @@
SUBDIR += w3m
SUBDIR += webkit-gtk2
SUBDIR += webkit-gtk3
+SUBDIR += qt4-webkit
SUBDIR += weblint
SUBDIR += webserver
SUBDIR += webservices
Modified: trunk/www/webkit-qt4/Makefile
===================================================================
--- trunk/www/qt4-webkit/Makefile 2014-09-27 16:09:04 UTC (rev 17568)
+++ trunk/www/webkit-qt4/Makefile 2014-09-27 17:26:48 UTC (rev 17583)
@@ -1,23 +1,25 @@
+# Created by: danny at ricin.com
# $MidnightBSD$
+# $FreeBSD: head/www/webkit-qt4/Makefile 367888 2014-09-10 20:50:31Z gerald $
PORTNAME= webkit
DISTVERSION= ${QT4_VERSION}
-CATEGORIES?= www
+CATEGORIES= www
PKGNAMEPREFIX= qt4-
MAINTAINER= ports at MidnightBSD.org
-COMMENT= Qt4 WebKit engine
+COMMENT= Qt WebKit implementation
+
LICENSE= gpl3
-USES= pkgconfig
USE_QT4= corelib declarative gui network \
qmake_build moc_build rcc_build
-QT_NONSTANDARD= yes
QT_DIST= yes
USE_XORG= xrender
+USES= pkgconfig
HAS_CONFIGURE= yes
-USE_LDCONFIG= ${PREFIX}/lib/qt4
+USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
ALL_TARGET= first
CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
@@ -39,26 +41,23 @@
CONFIGURE_ARGS+= -I../../../../include/Qt -I../../../../include
-EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure
-
OPTIONS_DEFINE= GSTREAMER
-OPTIONS_DEFAULT= GSTREAMER
+OPTIONS_DEFAULT=GSTREAMER
-GSTREAMER_DESC= HTML5 audio and video via GStreamer
+GSTREAMER_USE= GSTREAMER=yes
-.include <bsd.mport.options.mk>
+.include <bsd.port.pre.mk>
-.if ${PORT_OPTIONS:MGSTREAMER}
-USE_GSTREAMER= yes
-.endif
+# Quick hack to avoid messing up qt_webkit_version.pri installation
+# directory. bsd.port.pre.mk is required to add the setting at the end.
+CONFIGURE_ENV+= QMAKEPATH=""
+MAKE_ENV+= QMAKEPATH=""
-.include <bsd.port.pre.mk>
-
pre-configure:
${MKDIR} ${WRKSRC}/mkspecs
- ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake
- ${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/bin/moc
- ${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/bin/rcc
+ ${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake
+ ${LN} -sf ${MOC} ${WRKSRC}/bin/moc
+ ${LN} -sf ${RCC} ${WRKSRC}/bin/rcc
${REINPLACE_CMD} -e 's|linux-\*|unix|g' \
${BUILD_WRKSRC}/WebCore/features.pri \
${BUILD_WRKSRC}/JavaScriptCore/wtf/wtf.pri
@@ -72,7 +71,7 @@
post-configure:
${REINPLACE_CMD} \
- -e 's|${PREFIX}/lib/qt4/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
+ -e 's|${PREFIX}/${QT_LIBDIR_REL}/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
-e 's|.*$$(QMAKE).*||g' \
-e '/^CFLAGS/ s|-I${LOCALBASE}/include ||g' \
-e '/^CXXFLAGS/ s|-I${LOCALBASE}/include ||g' \
@@ -82,11 +81,10 @@
${CP} ${BUILD_WRKSRC}/WebKit/qt/Makefile \
${BUILD_WRKSRC}/WebKit/qt/Makefile.QtWebKit
${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \
- -E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \
+ -E -e 's|(.*location=).*moc|\1${PREFIX}/${QT_BINDIR_REL}/${MOC:T}|g' \
${WRKSRC}/lib/pkgconfig/QtWebKit.pc
# QtWebKit is statically linked with jscore, remove the latest.
${REINPLACE_CMD} -e 's|-L../JavaScriptCore/release||; s|-ljscore||' \
- ${WRKSRC}/lib/pkgconfig/QtWebKit.pc \
- ${WRKSRC}/lib/libQtWebKit.la
+ ${WRKSRC}/lib/pkgconfig/QtWebKit.pc
.include <bsd.port.post.mk>
Modified: trunk/www/webkit-qt4/distinfo
===================================================================
--- trunk/www/qt4-webkit/distinfo 2014-09-27 16:09:04 UTC (rev 17568)
+++ trunk/www/webkit-qt4/distinfo 2014-09-27 17:26:48 UTC (rev 17583)
@@ -1,2 +1,2 @@
-SHA256 (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270
-SIZE (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 236593028
+SHA256 (KDE/qt-everywhere-opensource-src-4.8.6.tar.gz) = 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c
+SIZE (KDE/qt-everywhere-opensource-src-4.8.6.tar.gz) = 241623667
Deleted: trunk/www/webkit-qt4/files/patch-git_ccd1b2ee
===================================================================
--- trunk/www/qt4-webkit/files/patch-git_ccd1b2ee 2014-09-27 16:09:04 UTC (rev 17568)
+++ trunk/www/webkit-qt4/files/patch-git_ccd1b2ee 2014-09-27 17:26:48 UTC (rev 17583)
@@ -1,35 +0,0 @@
-commit ccd1b2ee01c193cd157978c1f9f08f87d0f9c94b
-Author: Raphael Kubo da Costa <rakuco at FreeBSD.org>
-Date: Fri May 10 01:40:23 2013 +0300
-
- Check that 3DNow! instructions are supported before including mm3dnow.h.
-
- Include mm3dnow.h the way we already include the (S)SSE{3,4} and AVX
- instruction headers: by checking that the compiler is set to support those
- instructions besides verifying that QT_HAVE_3DNOW evalues to true (which
- only means the compiler supported them when the build was being configured).
-
- This has not caused a problem in most cases so far because GCC protects its
- mm3dnow.h header with an #ifdef __3dNOW__ (contrary to what it does on, say,
- pmmintrin.h). clang's mm3dnow.h, on the other hand, does not have that check
- and can fail if -march is set to, for example, i386 or i486.
-
- Not backported from qt5 because qtbase because qsimd_p.h does not include
- the 3DNow! headers after commit a1b30b49ef09bef2e97b9a0622bf7ad622678fee.
-
- Change-Id: I15ab5e936c71c55f89c3f25777ab27fbd262e9cd
- Reviewed-by: Thiago Macieira <thiago.macieira at intel.com>
-
-diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h
-index 87e26e1..6a32e8f 100644
---- ./src/corelib/tools/qsimd_p.h
-+++ ./src/corelib/tools/qsimd_p.h
-@@ -199,7 +199,7 @@ QT_BEGIN_HEADER
- #endif
-
- // 3D now intrinsics
--#if defined(QT_HAVE_3DNOW)
-+#if defined(QT_HAVE_3DNOW) && (defined(__3dNOW__) || defined(Q_CC_MSVC))
- #include <mm3dnow.h>
- #endif
-
Modified: trunk/www/webkit-qt4/files/patch-libcxx
===================================================================
--- trunk/www/qt4-webkit/files/patch-libcxx 2014-09-27 16:09:04 UTC (rev 17568)
+++ trunk/www/webkit-qt4/files/patch-libcxx 2014-09-27 17:26:48 UTC (rev 17583)
@@ -208,7 +208,7 @@
#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)
+#include <ciso646>
+
+#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)
@@ -231,288 +231,6 @@
document()->setParsing(false); // Make the doc think it's done, so it will apply xsl sheets.
document()->styleSelectorChanged(RecalcStyleImmediately);
document()->setParsing(true);
---- src/3rdparty/webkit/Source/WebCore/platform/Timer.cpp (revision 92555)
-+++ src/3rdparty/webkit/Source/WebCore/platform/Timer.cpp (revision 92556)
-@@ -41,6 +41,8 @@
-
- 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,113 +55,141 @@
- 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 {
-+// ----------------
-+
-+class TimerHeapPointer {
- public:
-- explicit TimerHeapElement(int i)
-- : m_index(i)
-- , m_timer(timerHeap()[m_index])
-- {
-- checkConsistency();
-- }
-+ TimerHeapPointer(TimerBase** pointer) : m_pointer(pointer) { }
-+ TimerHeapReference operator*() const;
-+ TimerBase* operator->() const { return *m_pointer; }
-+private:
-+ TimerBase** m_pointer;
-+};
-
-- 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 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:
-- TimerHeapElement();
--
-- int m_index;
-- TimerBase* m_timer;
-+ 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(); }
-+ 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--() { 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+=(ptrdiff_t i) { checkConsistency(); m_pointer += i; checkConsistency(); return *this; }
-+ TimerHeapIterator& operator-=(ptrdiff_t i) { checkConsistency(); m_pointer -= i; checkConsistency(); return *this; }
-
-- TimerHeapElement operator*() const { return TimerHeapElement(m_index); }
-- TimerHeapElement operator[](int i) const { return TimerHeapElement(m_index + i); }
-+ TimerHeapReference operator*() const { return TimerHeapReference(*m_pointer); }
-+ TimerHeapReference operator[](ptrdiff_t i) const { return TimerHeapReference(m_pointer[i]); }
-+ TimerBase* operator->() const { return *m_pointer; }
-
-- int index() const { return m_index; }
--
-- 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, 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 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 int operator-(TimerHeapIterator a, TimerHeapIterator b) { return a.index() - 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; }
-
- // ----------------
-
-+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;
-+}
-+
-+// ----------------
-+
- TimerBase::TimerBase()
- : m_nextFireTime(0)
- , m_repeatInterval(0)
-@@ -225,7 +255,8 @@
- {
- 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 @@
- {
- 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());
- }
---- src/3rdparty/webkit/Source/WebCore/platform/Timer.h (revision 92555)
-+++ src/3rdparty/webkit/Source/WebCore/platform/Timer.h (revision 92556)
-@@ -84,9 +84,9 @@
- 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 {
---- src/3rdparty/webkit/Source/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp (revision 86531)
-+++ src/3rdparty/webkit/Source/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp (revision 86532)
-@@ -944,7 +944,7 @@
-
- GraphicsLayerQt::GraphicsLayerQt(GraphicsLayerClient* client)
- : GraphicsLayer(client)
-- , m_impl(PassOwnPtr<GraphicsLayerQtImpl>(new GraphicsLayerQtImpl(this)))
-+ , m_impl(adoptPtr(new GraphicsLayerQtImpl(this)))
- {
- }
-
-@@ -955,7 +955,7 @@
- // This is the hook for WebCore compositor to know that Qt implements compositing with GraphicsLayerQt.
- PassOwnPtr<GraphicsLayer> GraphicsLayer::create(GraphicsLayerClient* client)
- {
-- return new GraphicsLayerQt(client);
-+ return adoptPtr(new GraphicsLayerQt(client));
- }
-
- /* \reimp (GraphicsLayer.h): The current size might change, thus we need to update the whole display.
-
--- src/3rdparty/webkit/Source/WebCore/loader/icon/IconRecord.h
+++ src/3rdparty/webkit/Source/WebCore/loader/icon/IconRecord.h
@@ -38,7 +38,7 @@
@@ -548,15 +266,6 @@
--- src/3rdparty/webkit/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp (revision 86529)
+++ src/3rdparty/webkit/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp (revision 86530)
-@@ -235,7 +235,7 @@
- resetConnections();
- QNetworkReply* reply = m_reply;
- m_reply = 0;
-- m_sniffer = 0;
-+ m_sniffer = nullptr;
-
- reply->setParent(0);
- return reply;
@@ -285,7 +285,7 @@
Q_ASSERT(!m_sniffer);
@@ -566,58 +275,7 @@
if (m_sniffer->isFinished()) {
receiveSniffedMIMEType();
-@@ -300,7 +300,7 @@
- Q_ASSERT(m_sniffer);
-
- m_sniffedMIMEType = m_sniffer->mimeType();
-- m_sniffer = 0;
-+ m_sniffer = nullptr;
-
- emitMetaDataChanged();
- }
-@@ -417,7 +417,7 @@
- return 0;
-
- QNetworkReply* reply = m_replyWrapper->release();
-- m_replyWrapper = 0;
-+ m_replyWrapper = nullptr;
- return reply;
- }
-
-@@ -440,12 +440,12 @@
-
- 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 @@
- }
- }
-
-- m_replyWrapper = 0;
-+ m_replyWrapper = nullptr;
- }
-
- void QNetworkReplyHandler::sendResponseIfNeeded()
-@@ -539,7 +539,7 @@
- newUrl.toString(),
- QCoreApplication::translate("QWebPage", "Redirection limit reached"));
- client->didFail(m_resourceHandle, error);
-- m_replyWrapper = 0;
-+ m_replyWrapper = nullptr;
- return;
- }
-
-@@ -660,7 +660,7 @@
+@@ -666,7 +666,7 @@
if (!reply)
return;
@@ -641,16 +299,7 @@
--- src/3rdparty/webkit/Source/WebKit/qt/Api/qgraphicswebview.cpp (revision 86532)
+++ src/3rdparty/webkit/Source/WebKit/qt/Api/qgraphicswebview.cpp (revision 86533)
-@@ -473,7 +473,7 @@
- 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.
-@@ -506,7 +506,7 @@
+@@ -504,7 +504,7 @@
if (!d->page)
return;
@@ -927,18 +576,6 @@
, m_destroyingInspectorView(false)
--- src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp (revision 86536)
+++ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp (revision 86550)
-@@ -73,9 +73,9 @@
- #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 @@
QPixmap pixmap;
if (bytes.length() && pixmap.loadFromData(bytes)) {
Modified: trunk/www/webkit-qt4/files/patch-src__3rdparty__webkit__Source__JavaScriptCore__wtf__Atomics.h
===================================================================
--- trunk/www/qt4-webkit/files/patch-src__3rdparty__webkit__Source__JavaScriptCore__wtf__Atomics.h 2014-09-27 16:09:04 UTC (rev 17568)
+++ trunk/www/webkit-qt4/files/patch-src__3rdparty__webkit__Source__JavaScriptCore__wtf__Atomics.h 2014-09-27 17:26:48 UTC (rev 17583)
@@ -1,49 +1,5 @@
-From e3c44790065894f4e7f98ab097fce22c5bcbbd0a Mon Sep 17 00:00:00 2001
-From: Raphael Kubo da Costa <rakuco at FreeBSD.org>
-Date: Tue, 2 Jul 2013 13:48:28 +0300
-Subject: [PATCH] Bring in WebKit revisions 139553 and 139921.
-
-They are primarily useful for getting rid of some libstdc++-specific
-includes which break the build with libc++, and also for simplifying the
-code and removing a Darwin-specific code path.
-
-r139553 by ossy at webkit.org:
- Use sync_add_and_fetch instead of gnu_cxx::exchange_and_add
- https://bugs.webkit.org/show_bug.cgi?id=106729
-
- After r139514 we need atomicIncrement(int64_t volatile*) for all
- platform. Now the GCC implementation of atomicIncrement() is based on
- gnu_cxx::exchange_and_add, which doesn't support int64_t type, but
- sync_add_and_fetch does.
-
- Reviewed by Benjamin Poulain.
-
-r139921 by benjamin at webkit.org:
- Use GCC's implementation of atomicIncrement/Decrement on Mac
- https://bugs.webkit.org/show_bug.cgi?id=106976
-
- Reviewed by Filip Pizlo.
-
- wtf/Atomics.h: GCC and LLVM have builtin for atomic ADD and SUB:
- sync_add_and_fetch, sync_sub_and_fetch.
-
- Using them let the compiler just generate the atomic operations inline
- instead of generating a function call to LibC. It also simplify the
- code a bit.
-
-Cherry-picked from qtwebkit/0baf197 and qtwebkit/801fc96. I'm cherry-picking
-both revisions together to match what was done in 0de22e80.
-
-Change-Id: Ie5c1067980662ff04e8e36d8cf6e9459b7c46aab
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen at digia.com>
----
- .../webkit/Source/JavaScriptCore/wtf/Atomics.h | 18 ++----------------
- 1 file changed, 2 insertions(+), 16 deletions(-)
-
-diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Atomics.h b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Atomics.h
-index bce5fba..acf0e5a 100644
---- src/3rdparty/webkit/Source/JavaScriptCore/wtf/Atomics.h
-+++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/Atomics.h
+--- src/3rdparty/webkit/Source/JavaScriptCore/wtf/Atomics.h.orig 2014-04-10 20:37:11.000000000 +0200
++++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/Atomics.h 2014-04-24 16:11:40.000000000 +0200
@@ -63,18 +63,10 @@
#if OS(WINDOWS)
@@ -63,12 +19,12 @@
#endif
namespace WTF {
-@@ -90,12 +82,6 @@ inline int atomicIncrement(int volatile* addend) { return InterlockedIncrement(r
+@@ -90,12 +82,6 @@
inline int atomicDecrement(int volatile* addend) { return InterlockedDecrement(reinterpret_cast<long volatile*>(addend)); }
#endif
-#elif OS(DARWIN)
--#define WTF_USE_LOCKFREE_THREADSAFEREFCOUNTED 1
+-#define WTF_USE_LOCKFREE_THREADSAFESHARED 1
-
-inline int atomicIncrement(int volatile* addend) { return OSAtomicIncrement32Barrier(const_cast<int*>(addend)); }
-inline int atomicDecrement(int volatile* addend) { return OSAtomicDecrement32Barrier(const_cast<int*>(addend)); }
@@ -76,17 +32,3 @@
#elif OS(ANDROID)
inline int atomicIncrement(int volatile* addend) { return android_atomic_inc(addend); }
-@@ -109,8 +95,8 @@ inline int atomicDecrement(int volatile* addend) { return (int) atomic_sub_value
- #elif COMPILER(GCC) && !CPU(SPARC64) && !OS(SYMBIAN) // sizeof(_Atomic_word) != sizeof(int) on sparc64 gcc
- #define WTF_USE_LOCKFREE_THREADSAFEREFCOUNTED 1
-
--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; }
-+inline int atomicIncrement(int volatile* addend) { return __sync_add_and_fetch(addend, 1); }
-+inline int atomicDecrement(int volatile* addend) { return __sync_sub_and_fetch(addend, 1); }
-
- #endif
-
---
-1.8.4
-
Deleted: trunk/www/webkit-qt4/pkg-descr
===================================================================
--- trunk/www/qt4-webkit/pkg-descr 2014-09-27 16:09:04 UTC (rev 17568)
+++ trunk/www/webkit-qt4/pkg-descr 2014-09-27 17:26:48 UTC (rev 17583)
@@ -1,12 +0,0 @@
-Qt is a C++ toolkit for application development. It lets application
-developers target all major operating systems with a single application
-source code.
-
-Qt provides a platform-independent API to all central platform functionality:
-GUI, database access, networking, file handling, etc. The Qt library
-encapsulates the different APIs of different operating systems, providing
-the application programmer with a single, common API for all operating systems.
-The native C APIs are encapsulated in a set of well-designed, fully
-object-oriented C++ classes.
-
-WWW: http://qt.nokia.com/products/qt/index.html
Modified: trunk/www/webkit-qt4/pkg-plist
===================================================================
--- trunk/www/qt4-webkit/pkg-plist 2014-09-27 16:09:04 UTC (rev 17568)
+++ trunk/www/webkit-qt4/pkg-plist 2014-09-27 17:26:48 UTC (rev 17583)
@@ -1,78 +1,77 @@
-include/qt4/Qt/QtWebKit
-include/qt4/Qt/qgraphicswebview.h
-include/qt4/Qt/qwebdatabase.h
-include/qt4/Qt/qwebelement.h
-include/qt4/Qt/qwebframe.h
-include/qt4/Qt/qwebhistory.h
-include/qt4/Qt/qwebhistoryinterface.h
-include/qt4/Qt/qwebinspector.h
-include/qt4/Qt/qwebkitglobal.h
-include/qt4/Qt/qwebkitplatformplugin.h
-include/qt4/Qt/qwebkitversion.h
-include/qt4/Qt/qwebpage.h
-include/qt4/Qt/qwebpluginfactory.h
-include/qt4/Qt/qwebscriptworld.h
-include/qt4/Qt/qwebsecurityorigin.h
-include/qt4/Qt/qwebsettings.h
-include/qt4/Qt/qwebview.h
-include/qt4/QtWebKit/QGraphicsWebView
-include/qt4/QtWebKit/QWebDatabase
-include/qt4/QtWebKit/QWebElement
-include/qt4/QtWebKit/QWebElementCollection
-include/qt4/QtWebKit/QWebFrame
-include/qt4/QtWebKit/QWebFullScreenVideoHandler
-include/qt4/QtWebKit/QWebHapticFeedbackPlayer
-include/qt4/QtWebKit/QWebHistory
-include/qt4/QtWebKit/QWebHistoryInterface
-include/qt4/QtWebKit/QWebHistoryItem
-include/qt4/QtWebKit/QWebHitTestResult
-include/qt4/QtWebKit/QWebInspector
-include/qt4/QtWebKit/QWebKitPlatformPlugin
-include/qt4/QtWebKit/QWebNotificationData
-include/qt4/QtWebKit/QWebNotificationPresenter
-include/qt4/QtWebKit/QWebPage
-include/qt4/QtWebKit/QWebPluginFactory
-include/qt4/QtWebKit/QWebScriptWorld
-include/qt4/QtWebKit/QWebSecurityOrigin
-include/qt4/QtWebKit/QWebSelectData
-include/qt4/QtWebKit/QWebSelectMethod
-include/qt4/QtWebKit/QWebSettings
-include/qt4/QtWebKit/QWebTouchModifier
-include/qt4/QtWebKit/QWebView
-include/qt4/QtWebKit/QtWebKit
-include/qt4/QtWebKit/qgraphicswebview.h
-include/qt4/QtWebKit/qwebdatabase.h
-include/qt4/QtWebKit/qwebelement.h
-include/qt4/QtWebKit/qwebframe.h
-include/qt4/QtWebKit/qwebhistory.h
-include/qt4/QtWebKit/qwebhistoryinterface.h
-include/qt4/QtWebKit/qwebinspector.h
-include/qt4/QtWebKit/qwebkitglobal.h
-include/qt4/QtWebKit/qwebkitplatformplugin.h
-include/qt4/QtWebKit/qwebkitversion.h
-include/qt4/QtWebKit/qwebpage.h
-include/qt4/QtWebKit/qwebpluginfactory.h
-include/qt4/QtWebKit/qwebscriptworld.h
-include/qt4/QtWebKit/qwebsecurityorigin.h
-include/qt4/QtWebKit/qwebsettings.h
-include/qt4/QtWebKit/qwebview.h
-lib/qt4/imports/QtWebKit/libqmlwebkitplugin.so
-%%DEBUG%%lib/qt4/imports/QtWebKit/libqmlwebkitplugin.so.debug
-lib/qt4/imports/QtWebKit/qmldir
-lib/qt4/libQtWebKit.la
-lib/qt4/libQtWebKit.prl
-lib/qt4/libQtWebKit.so
-lib/qt4/libQtWebKit.so.4
-lib/qt4/libQtWebKit.so.4.9
-lib/qt4/libQtWebKit.so.4.9.3
+%%QT_INCDIR%%/Qt/QtWebKit
+%%QT_INCDIR%%/Qt/qgraphicswebview.h
+%%QT_INCDIR%%/Qt/qwebdatabase.h
+%%QT_INCDIR%%/Qt/qwebelement.h
+%%QT_INCDIR%%/Qt/qwebframe.h
+%%QT_INCDIR%%/Qt/qwebhistory.h
+%%QT_INCDIR%%/Qt/qwebhistoryinterface.h
+%%QT_INCDIR%%/Qt/qwebinspector.h
+%%QT_INCDIR%%/Qt/qwebkitglobal.h
+%%QT_INCDIR%%/Qt/qwebkitplatformplugin.h
+%%QT_INCDIR%%/Qt/qwebkitversion.h
+%%QT_INCDIR%%/Qt/qwebpage.h
+%%QT_INCDIR%%/Qt/qwebpluginfactory.h
+%%QT_INCDIR%%/Qt/qwebscriptworld.h
+%%QT_INCDIR%%/Qt/qwebsecurityorigin.h
+%%QT_INCDIR%%/Qt/qwebsettings.h
+%%QT_INCDIR%%/Qt/qwebview.h
+%%QT_INCDIR%%/QtWebKit/QGraphicsWebView
+%%QT_INCDIR%%/QtWebKit/QWebDatabase
+%%QT_INCDIR%%/QtWebKit/QWebElement
+%%QT_INCDIR%%/QtWebKit/QWebElementCollection
+%%QT_INCDIR%%/QtWebKit/QWebFrame
+%%QT_INCDIR%%/QtWebKit/QWebFullScreenVideoHandler
+%%QT_INCDIR%%/QtWebKit/QWebHapticFeedbackPlayer
+%%QT_INCDIR%%/QtWebKit/QWebHistory
+%%QT_INCDIR%%/QtWebKit/QWebHistoryInterface
+%%QT_INCDIR%%/QtWebKit/QWebHistoryItem
+%%QT_INCDIR%%/QtWebKit/QWebHitTestResult
+%%QT_INCDIR%%/QtWebKit/QWebInspector
+%%QT_INCDIR%%/QtWebKit/QWebKitPlatformPlugin
+%%QT_INCDIR%%/QtWebKit/QWebNotificationData
+%%QT_INCDIR%%/QtWebKit/QWebNotificationPresenter
+%%QT_INCDIR%%/QtWebKit/QWebPage
+%%QT_INCDIR%%/QtWebKit/QWebPluginFactory
+%%QT_INCDIR%%/QtWebKit/QWebScriptWorld
+%%QT_INCDIR%%/QtWebKit/QWebSecurityOrigin
+%%QT_INCDIR%%/QtWebKit/QWebSelectData
+%%QT_INCDIR%%/QtWebKit/QWebSelectMethod
+%%QT_INCDIR%%/QtWebKit/QWebSettings
+%%QT_INCDIR%%/QtWebKit/QWebTouchModifier
+%%QT_INCDIR%%/QtWebKit/QWebView
+%%QT_INCDIR%%/QtWebKit/QtWebKit
+%%QT_INCDIR%%/QtWebKit/qgraphicswebview.h
+%%QT_INCDIR%%/QtWebKit/qwebdatabase.h
+%%QT_INCDIR%%/QtWebKit/qwebelement.h
+%%QT_INCDIR%%/QtWebKit/qwebframe.h
+%%QT_INCDIR%%/QtWebKit/qwebhistory.h
+%%QT_INCDIR%%/QtWebKit/qwebhistoryinterface.h
+%%QT_INCDIR%%/QtWebKit/qwebinspector.h
+%%QT_INCDIR%%/QtWebKit/qwebkitglobal.h
+%%QT_INCDIR%%/QtWebKit/qwebkitplatformplugin.h
+%%QT_INCDIR%%/QtWebKit/qwebkitversion.h
+%%QT_INCDIR%%/QtWebKit/qwebpage.h
+%%QT_INCDIR%%/QtWebKit/qwebpluginfactory.h
+%%QT_INCDIR%%/QtWebKit/qwebscriptworld.h
+%%QT_INCDIR%%/QtWebKit/qwebsecurityorigin.h
+%%QT_INCDIR%%/QtWebKit/qwebsettings.h
+%%QT_INCDIR%%/QtWebKit/qwebview.h
+%%QT_IMPORTDIR%%/QtWebKit/libqmlwebkitplugin.so
+%%DEBUG%%%%QT_IMPORTDIR%%/QtWebKit/libqmlwebkitplugin.so.debug
+%%QT_IMPORTDIR%%/QtWebKit/qmldir
+%%QT_LIBDIR%%/libQtWebKit.prl
+%%QT_LIBDIR%%/libQtWebKit.so
+%%QT_LIBDIR%%/libQtWebKit.so.4
+%%QT_LIBDIR%%/libQtWebKit.so.4.9
+%%QT_LIBDIR%%/libQtWebKit.so.4.9.4
libdata/pkgconfig/QtWebKit.pc
-share/qt4/mkspecs/modules/qt_webkit_version.pri
- at dirrmtry share/qt4/mkspecs/modules
- at dirrmtry share/qt4/mkspecs
- at dirrmtry share/qt4
- at dirrm lib/qt4/imports/QtWebKit
- at dirrmtry lib/qt4/imports
- at dirrmtry lib/qt4
- at dirrm include/qt4/QtWebKit
- at dirrmtry include/qt4/Qt
- at dirrmtry include/qt4
+%%QT_MKSPECDIR%%/modules/qt_webkit_version.pri
+ at dirrmtry %%QT_MKSPECDIR%%/modules
+ at dirrmtry %%QT_MKSPECDIR%%
+ at dirrmtry %%QT_DATADIR%%
+ at dirrm %%QT_IMPORTDIR%%/QtWebKit
+ at dirrmtry %%QT_IMPORTDIR%%
+ at dirrmtry %%QT_LIBDIR%%
+ at dirrm %%QT_INCDIR%%/QtWebKit
+ at dirrmtry %%QT_INCDIR%%/Qt
+ at dirrmtry %%QT_INCDIR%%
More information about the Midnightbsd-cvs
mailing list