diff --git a/qtbase/Buildfile b/qtbase/Buildfile index a54e774..b6e3655 100644 --- a/qtbase/Buildfile +++ b/qtbase/Buildfile @@ -2,7 +2,7 @@ # URL: http://qt-project.org/doc/qt-5.0/qtcore/qtcore-index.html name=qtbase -version=5.5.1 +version=5.6.0 release=1 source=(http://download.qt-project.org/official_releases/qt/${version%.*}/$version/submodules/$name-opensource-src-$version.tar.xz qmake.conf qplatformdefs.h) diff --git a/qtconnectivity/Buildfile b/qtconnectivity/Buildfile index e1ffa3b..e4b4acf 100644 --- a/qtconnectivity/Buildfile +++ b/qtconnectivity/Buildfile @@ -2,7 +2,7 @@ # URL: http://doc.qt.io/qt-5/topics-network-connectivity.html name=qtconnectivity -version=5.5.1 +version=5.6.0 release=1 source=(http://download.qt-project.org/official_releases/qt/${version%.*}/$version/submodules/$name-opensource-src-$version.tar.xz) depends=(qtbase) diff --git a/qtdeclarative/Buildfile b/qtdeclarative/Buildfile index d84691a..f02d848 100644 --- a/qtdeclarative/Buildfile +++ b/qtdeclarative/Buildfile @@ -2,7 +2,7 @@ # URL: http://qt-project.org/doc/qt-4.8/qtquick.html name=qtdeclarative -version=5.5.1 +version=5.6.0 release=1 source=(http://download.qt-project.org/official_releases/qt/${version%.*}/$version/submodules/$name-opensource-src-$version.tar.xz qmltestrunner-fix-link.patch diff --git a/qtgraphicaleffects/Buildfile b/qtgraphicaleffects/Buildfile index 535b61b..610925b 100644 --- a/qtgraphicaleffects/Buildfile +++ b/qtgraphicaleffects/Buildfile @@ -2,7 +2,7 @@ # URL: http://qt-project.org/doc/qt-5.0/qtgraphicaleffects/qtgraphicaleffects-index.html name=qtgraphicaleffects -version=5.5.1 +version=5.6.0 release=1 source=(http://download.qt-project.org/official_releases/qt/${version%.*}/$version/submodules/$name-opensource-src-$version.tar.xz) depends=(qtbase qtdeclarative) diff --git a/qtimageformats/Buildfile b/qtimageformats/Buildfile index e26730b..ea6178a 100644 --- a/qtimageformats/Buildfile +++ b/qtimageformats/Buildfile @@ -2,7 +2,7 @@ # URL: http://qt-project.org/doc/qt-5.0/qtimageformats/qtimageformats-index.html name=qtimageformats -version=5.5.1 +version=5.6.0 release=1 source=(http://download.qt-project.org/official_releases/qt/${version%.*}/$version/submodules/$name-opensource-src-$version.tar.xz) depends=(qtbase) diff --git a/qtmultimedia/Buildfile b/qtmultimedia/Buildfile index f06870f..aa1dfd3 100644 --- a/qtmultimedia/Buildfile +++ b/qtmultimedia/Buildfile @@ -2,7 +2,7 @@ # URL: http://qt-project.org/doc/qt-5.0/qtmultimedia/qtmultimedia-index.html name=qtmultimedia -version=5.5.1 +version=5.6.0 release=1 source=(http://download.qt-project.org/official_releases/qt/${version%.*}/$version/submodules/$name-opensource-src-$version.tar.xz) depends=(qtbase qtdeclarative) diff --git a/qtquick1/Buildfile b/qtquick1/Buildfile index fcb07b7..f2a71aa 100644 --- a/qtquick1/Buildfile +++ b/qtquick1/Buildfile @@ -2,7 +2,7 @@ # URL: http://qt-project.org/doc/qt-5.0/qtquick/qtquick-index.html name=qtquick1 -version=5.5.1 +version=5.6.0 release=1 source=(http://download.qt-project.org/official_releases/qt/${version%.*}/$version/submodules/$name-opensource-src-$version.tar.xz) depends=(qtbase qtscript) diff --git a/qtscript/Buildfile b/qtscript/Buildfile index b4d60b0..4480599 100644 --- a/qtscript/Buildfile +++ b/qtscript/Buildfile @@ -2,7 +2,7 @@ # URL: http://qt-project.org/doc/qt-5.0/qtscript/qtscript-index.html name=qtscript -version=5.5.1 +version=5.6.0 release=1 source=(http://download.qt-project.org/official_releases/qt/${version%.*}/$version/submodules/$name-opensource-src-$version.tar.xz) depends=(qtbase) diff --git a/qtsensors/Buildfile b/qtsensors/Buildfile index a4331aa..219d06d 100644 --- a/qtsensors/Buildfile +++ b/qtsensors/Buildfile @@ -2,7 +2,7 @@ # URL: http://doc.qt.io/qt-5/qtsensors-index.html name=qtsensors -version=5.5.1 +version=5.6.0 release=1 source=(http://download.qt-project.org/official_releases/qt/${version%.*}/$version/submodules/$name-opensource-src-$version.tar.xz) depends=(qtbase qtdeclarative) diff --git a/qtserialport/Buildfile b/qtserialport/Buildfile index 8000df6..fd51fe9 100644 --- a/qtserialport/Buildfile +++ b/qtserialport/Buildfile @@ -2,7 +2,7 @@ # URL: http://doc.qt.io/qt-5/qtserialport-index.html name=qtserialport -version=5.5.1 +version=5.6.0 release=1 source=(http://download.qt-project.org/official_releases/qt/${version%.*}/$version/submodules/$name-opensource-src-$version.tar.xz) depends=(qtbase systemd) diff --git a/qtsvg/Buildfile b/qtsvg/Buildfile index e3b4d90..7518bfd 100644 --- a/qtsvg/Buildfile +++ b/qtsvg/Buildfile @@ -2,7 +2,7 @@ # URL: http://qt-project.org/doc/qt-5.0/qtsvg/qtsvg-index.html name=qtsvg -version=5.5.1 +version=5.6.0 release=1 source=(http://download.qt-project.org/official_releases/qt/${version%.*}/$version/submodules/$name-opensource-src-$version.tar.xz) depends=(qtbase) diff --git a/qtwebkit/Buildfile b/qtwebchannel/Buildfile similarity index 74% rename from qtwebkit/Buildfile rename to qtwebchannel/Buildfile index 762ae28..c107f69 100644 --- a/qtwebkit/Buildfile +++ b/qtwebchannel/Buildfile @@ -1,8 +1,8 @@ -# Description: QT5 Base - Core non-graphical classes used by other modules. -# URL: http://qt-project.org/doc/qt-5.0/qtcore/qtcore-index.html +# Description: QT WebChannel +# URL: http://doc.qt.io/qt-5/qtwebchannel-index.html -name=qtwebkit -version=5.5.1 +name=qtwebchannel +version=5.6.0 release=1 source=(http://download.qt-project.org/official_releases/qt/${version%.*}/$version/submodules/$name-opensource-src-$version.tar.xz) depends=(qtbase) @@ -28,8 +28,3 @@ build() { # Fix libtool files fix_la_files $PKG } - -check() -{ - check_tool ruby -} diff --git a/qtwebkit-examples/Buildfile b/qtwebkit-examples/Buildfile deleted file mode 100644 index 8762e1a..0000000 --- a/qtwebkit-examples/Buildfile +++ /dev/null @@ -1,31 +0,0 @@ -# Description: QT5 webkit examples -# URL: http://qt-project.org/doc/qt-5.0/qtwebkitexamples/qtwebkitexamples-index.html - -name=qtwebkit-examples -version=5.5.1 -release=1 -source=(http://download.qt-project.org/official_releases/qt/${version%.*}/$version/submodules/$name-opensource-src-$version.tar.xz) -depends=(qtwebkit qtxmlpatterns qtquick1) - -build() { - cd $name-opensource-src-$version - - # Set up environment for qmake - PATH=$SYSROOT/opt/qt5-native/bin:$PATH - - qmake -r - cd examples - make -j $JOBS - - # Install in a temp folder to ease cleanup - make INSTALL_ROOT=$PKG/tmp install - - # The files are installed with SYSROOT as prefix. Move to root of PKG - mv $PKG/tmp/$SYSROOT/* $PKG - - # Clean SYSROOT prefix path - rm -rf $PKG/tmp - - # Fix libtool files - fix_la_files $PKG -} diff --git a/qtwebkit/qtwebkit-fix-building-with-glib-2.43+.patch b/qtwebkit/qtwebkit-fix-building-with-glib-2.43+.patch deleted file mode 100644 index 248dc45..0000000 --- a/qtwebkit/qtwebkit-fix-building-with-glib-2.43+.patch +++ /dev/null @@ -1,238 +0,0 @@ -From ed5d6c93f7cf902e58aaf3f0abd54b3b258172ed Mon Sep 17 00:00:00 2001 -From: Allan Sandfeld Jensen -Date: Fri, 27 Feb 2015 14:14:44 +0100 -Subject: Fix building with glib 2.43+ - -The newest version of glib have introduced their own GMutexLocker -conflicting with the one defined in WebCore. - -Task-number: QTBUG-44714 -Change-Id: Ibdd1646e129eaed84c65dc0d96bebe80f2a61f4b -Reviewed-by: Andras Becsi ---- - .../gstreamer/WebKitWebSourceGStreamer.cpp | 48 +++++++++++----------- - 1 file changed, 24 insertions(+), 24 deletions(-) - -diff --git a/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp -index 5625873..a6d961f 100644 ---- a/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp -+++ b/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp -@@ -354,7 +354,7 @@ static void webKitWebSrcSetProperty(GObject* object, guint propID, const GValue* - - switch (propID) { - case PROP_IRADIO_MODE: { -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - priv->iradioMode = g_value_get_boolean(value); - break; - } -@@ -376,7 +376,7 @@ static void webKitWebSrcGetProperty(GObject* object, guint propID, GValue* value - WebKitWebSrc* src = WEBKIT_WEB_SRC(object); - WebKitWebSrcPrivate* priv = src->priv; - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - switch (propID) { - case PROP_IRADIO_MODE: - g_value_set_boolean(value, priv->iradioMode); -@@ -429,7 +429,7 @@ static gboolean webKitWebSrcStop(WebKitWebSrc* src) - - ASSERT(isMainThread()); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - - bool seeking = priv->seekID; - -@@ -493,7 +493,7 @@ static gboolean webKitWebSrcStart(WebKitWebSrc* src) - - ASSERT(isMainThread()); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - - priv->startID = 0; - -@@ -584,7 +584,7 @@ static GstStateChangeReturn webKitWebSrcChangeState(GstElement* element, GstStat - return ret; - } - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - switch (transition) { - case GST_STATE_CHANGE_READY_TO_PAUSED: - GST_DEBUG_OBJECT(src, "READY->PAUSED"); -@@ -615,7 +615,7 @@ static gboolean webKitWebSrcQueryWithParent(GstPad* pad, GstObject* parent, GstQ - gst_query_parse_duration(query, &format, NULL); - - GST_DEBUG_OBJECT(src, "duration query in format %s", gst_format_get_name(format)); -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - if (format == GST_FORMAT_BYTES && src->priv->size > 0) { - gst_query_set_duration(query, format, src->priv->size); - result = TRUE; -@@ -623,7 +623,7 @@ static gboolean webKitWebSrcQueryWithParent(GstPad* pad, GstObject* parent, GstQ - break; - } - case GST_QUERY_URI: { -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - gst_query_set_uri(query, src->priv->uri); - result = TRUE; - break; -@@ -668,7 +668,7 @@ static gchar* webKitWebSrcGetUri(GstURIHandler* handler) - WebKitWebSrc* src = WEBKIT_WEB_SRC(handler); - gchar* ret; - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - ret = g_strdup(src->priv->uri); - return ret; - } -@@ -683,7 +683,7 @@ static gboolean webKitWebSrcSetUri(GstURIHandler* handler, const gchar* uri, GEr - return FALSE; - } - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - - g_free(priv->uri); - priv->uri = 0; -@@ -719,7 +719,7 @@ static const gchar* webKitWebSrcGetUri(GstURIHandler* handler) - WebKitWebSrc* src = WEBKIT_WEB_SRC(handler); - gchar* ret; - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - ret = g_strdup(src->priv->uri); - return ret; - } -@@ -734,7 +734,7 @@ static gboolean webKitWebSrcSetUri(GstURIHandler* handler, const gchar* uri) - return FALSE; - } - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - - g_free(priv->uri); - priv->uri = 0; -@@ -772,7 +772,7 @@ static gboolean webKitWebSrcNeedDataMainCb(WebKitWebSrc* src) - - ASSERT(isMainThread()); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - // already stopped - if (!priv->needDataID) - return FALSE; -@@ -793,7 +793,7 @@ static void webKitWebSrcNeedDataCb(GstAppSrc*, guint length, gpointer userData) - - GST_DEBUG_OBJECT(src, "Need more data: %u", length); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - if (priv->needDataID || !priv->paused) { - return; - } -@@ -807,7 +807,7 @@ static gboolean webKitWebSrcEnoughDataMainCb(WebKitWebSrc* src) - - ASSERT(isMainThread()); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - // already stopped - if (!priv->enoughDataID) - return FALSE; -@@ -828,7 +828,7 @@ static void webKitWebSrcEnoughDataCb(GstAppSrc*, gpointer userData) - - GST_DEBUG_OBJECT(src, "Have enough data"); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - if (priv->enoughDataID || priv->paused) { - return; - } -@@ -842,7 +842,7 @@ static gboolean webKitWebSrcSeekMainCb(WebKitWebSrc* src) - - ASSERT(isMainThread()); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - // already stopped - if (!priv->seekID) - return FALSE; -@@ -860,7 +860,7 @@ static gboolean webKitWebSrcSeekDataCb(GstAppSrc*, guint64 offset, gpointer user - WebKitWebSrcPrivate* priv = src->priv; - - GST_DEBUG_OBJECT(src, "Seeking to offset: %" G_GUINT64_FORMAT, offset); -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - if (offset == priv->offset && priv->requestedOffset == priv->offset) - return TRUE; - -@@ -879,7 +879,7 @@ static gboolean webKitWebSrcSeekDataCb(GstAppSrc*, guint64 offset, gpointer user - void webKitWebSrcSetMediaPlayer(WebKitWebSrc* src, WebCore::MediaPlayer* player) - { - ASSERT(player); -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - src->priv->player = player; - s_cachedResourceLoader = player->cachedResourceLoader(); - } -@@ -906,7 +906,7 @@ char* StreamingClient::createReadBuffer(size_t requestedSize, size_t& actualSize - mapGstBuffer(buffer); - #endif - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - priv->buffer = adoptGRef(buffer); - locker.unlock(); - -@@ -921,7 +921,7 @@ void StreamingClient::handleResponseReceived(const ResourceResponse& response) - - GST_DEBUG_OBJECT(src, "Received response: %d", response.httpStatusCode()); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - - // If we seeked we need 206 == PARTIAL_CONTENT - if (priv->requestedOffset && response.httpStatusCode() != 206) { -@@ -1020,7 +1020,7 @@ void StreamingClient::handleDataReceived(const char* data, int length) - WebKitWebSrc* src = WEBKIT_WEB_SRC(m_src.get()); - WebKitWebSrcPrivate* priv = src->priv; - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - - GST_LOG_OBJECT(src, "Have %d bytes of data", priv->buffer ? getGstBufferSize(priv->buffer.get()) : length); - -@@ -1074,7 +1074,7 @@ void StreamingClient::handleNotifyFinished() - - GST_DEBUG_OBJECT(src, "Have EOS"); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - if (!priv->seekID) { - locker.unlock(); - gst_app_src_end_of_stream(priv->appsrc); -@@ -1210,7 +1210,7 @@ void ResourceHandleStreamingClient::wasBlocked(ResourceHandle*) - - GST_ERROR_OBJECT(src, "Request was blocked"); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - uri.set(g_strdup(src->priv->uri)); - locker.unlock(); - -@@ -1224,7 +1224,7 @@ void ResourceHandleStreamingClient::cannotShowURL(ResourceHandle*) - - GST_ERROR_OBJECT(src, "Cannot show URL"); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - uri.set(g_strdup(src->priv->uri)); - locker.unlock(); - --- -cgit v0.11.0 - diff --git a/qtwebsockets/Buildfile b/qtwebsockets/Buildfile index 2e61ee9..258aed4 100644 --- a/qtwebsockets/Buildfile +++ b/qtwebsockets/Buildfile @@ -2,7 +2,7 @@ # URL: http://doc.qt.io/qt-5/qtwebsockets-index.html name=qtwebsockets -version=5.5.1 +version=5.6.0 release=1 source=(http://download.qt-project.org/official_releases/qt/${version%.*}/$version/submodules/$name-opensource-src-$version.tar.xz) depends=(qtbase) diff --git a/qtxmlpatterns/Buildfile b/qtxmlpatterns/Buildfile index a1a8df1..5c3c5c7 100644 --- a/qtxmlpatterns/Buildfile +++ b/qtxmlpatterns/Buildfile @@ -2,7 +2,7 @@ # URL: http://qt-project.org/doc/qt-5.0/qtxmlpatterns/qtxmlpatterns-index.html name=qtxmlpatterns -version=5.5.1 +version=5.6.0 release=1 source=(http://download.qt-project.org/official_releases/qt/${version%.*}/$version/submodules/$name-opensource-src-$version.tar.xz) depends=(qtbase)