diff options
author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2016-01-24 18:10:14 +0000 |
---|---|---|
committer | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2016-01-24 18:10:14 +0000 |
commit | 4c67812e0161cb63098ede0c2645e53c5060ecd9 (patch) | |
tree | 66663b28c2c298161be86b00114ab18d6fad8670 /www | |
parent | 7b72d170ba3c89c7e408c333297d8ecfa3ba72f1 (diff) | |
download | ports-4c67812e0161cb63098ede0c2645e53c5060ecd9.tar.gz ports-4c67812e0161cb63098ede0c2645e53c5060ecd9.zip |
Update Qt5 to 5.5.1.
This is the latest stable release at time of writing.
Release announcement: http://blog.qt.io/blog/2015/07/01/qt-5-5-released/
New features in Qt 5.5: https://wiki.qt.io/New_Features_in_Qt_5.5
As usual, huge thanks to Tobias Berner (tcberner@gmail.com) for all his work
on these ports in kde@'s experimental area51 repository. He's the one who
started the update and did a lot of the initial work on Qt 5.5. Ralf Nolden
(nolden@kde.org) has contributed the initial version of most of our new Qt5
ports.
Also thanks to Yuri Victorovich (yuri@rawbw.com) for contributing PR 205805
with his own patch for the 5.5.1 update. Some of his changes there prompted
additional fixes and changes present in the final patch generated from our
experimental repository.
New ports:
- comms/qt5-connectivity, comms/qt5-sensors, devel/qt5-location,
graphics/qt5-3d, net/qt5-enginio, x11-toolkits/qt5-canvas3d,
x11-toolkits/qt5-uiplugin.
General changes in all Qt5 ports:
- All Qt5 ports are now built with -Wl,--as-needed to avoid overlinking,
which is a problem with qmake-based because the libraries passed to the
linker come from the modules .pri files and many are not necessary.
- With this change, several ports had their USE_QT5 lines adjusted to
explicitly include some libraries that were pulled in implicitly, and to
exclude libraries no longer required with -Wl,--as-needed.
Changes in specific ports:
- devel/qt5: Drop the SQL_PLUGINS and TOOLS options and depend on all Qt5
ports by default. It makes the Makefile much simpler, and those options
were already on by default.
- devel/qt5-core: The clang+base libstdc++ workaround has been expanded and
more C++11 features have been disabled when that combination is used by a
port (basically, FreeBSD 9 with USES=compiler:c++11-lang). The disabled
features have explanations for why they were disabled in the patched
header itself.
- devel/qt5-designer: uiplugins has been split out following a similar
change upstream. By depending on qt5-uiplugin, qt5-uitools avoids having
to depend on the big qt5-designer port.
- multimedia/qt5-multimedia: The port now uses GStreamer 1.0 instead of
0.10.
- net/qt5-network: The port now depends on libproxy for proxy settings.
Using libproxy allows proxy settings to be read from different sources,
and also allows .pac files to work with Qt.
- www/qt5-webkit: The port now uses GStreamer 1.0 instead of 0.10.
PR: 205805
PR: 206435
Notes
Notes:
svn path=/head/; revision=407169
Diffstat (limited to 'www')
-rw-r--r-- | www/qt5-webchannel/pkg-plist | 1 | ||||
-rw-r--r-- | www/qt5-websockets/pkg-plist | 7 | ||||
-rw-r--r-- | www/webkit-qt5/Makefile | 5 | ||||
-rw-r--r-- | www/webkit-qt5/files/patch-Source__WebCore__platform__graphics__gstreamer__WebKitWebSourceGstreamer.cpp | 221 |
4 files changed, 7 insertions, 227 deletions
diff --git a/www/qt5-webchannel/pkg-plist b/www/qt5-webchannel/pkg-plist index 1b0405c5b56d..f6aa4fc925fe 100644 --- a/www/qt5-webchannel/pkg-plist +++ b/www/qt5-webchannel/pkg-plist @@ -25,6 +25,7 @@ %%QT_MKSPECDIR%%/modules/qt_lib_webchannel.pri %%QT_MKSPECDIR%%/modules/qt_lib_webchannel_private.pri %%QT_QMLDIR%%/QtWebChannel/libdeclarative_webchannel.so +%%DEBUG%%%%QT_QMLDIR%%/QtWebChannel/libdeclarative_webchannel.so.debug %%QT_QMLDIR%%/QtWebChannel/plugins.qmltypes %%QT_QMLDIR%%/QtWebChannel/qmldir libdata/pkgconfig/Qt5WebChannel.pc diff --git a/www/qt5-websockets/pkg-plist b/www/qt5-websockets/pkg-plist index cecb86c56473..73a5840bc8c5 100644 --- a/www/qt5-websockets/pkg-plist +++ b/www/qt5-websockets/pkg-plist @@ -32,8 +32,9 @@ %%DEBUG%%%%QT_LIBDIR%%/libQt5WebSockets.so.%%FULLVER%%.debug %%QT_MKSPECDIR%%/modules/qt_lib_websockets.pri %%QT_MKSPECDIR%%/modules/qt_lib_websockets_private.pri -%%QT_QMLDIR%%/Qt/WebSockets/libdeclarative_qmlwebsockets.so -%%DEBUG%%%%QT_QMLDIR%%/Qt/WebSockets/libdeclarative_qmlwebsockets.so.debug -%%QT_QMLDIR%%/Qt/WebSockets/plugins.qmltypes +%%QT_QMLDIR%%/QtWebSockets/libdeclarative_qmlwebsockets.so +%%DEBUG%%%%QT_QMLDIR%%/QtWebSockets/libdeclarative_qmlwebsockets.so.debug +%%QT_QMLDIR%%/QtWebSockets/plugins.qmltypes +%%QT_QMLDIR%%/QtWebSockets/qmldir %%QT_QMLDIR%%/Qt/WebSockets/qmldir libdata/pkgconfig/Qt5WebSockets.pc diff --git a/www/webkit-qt5/Makefile b/www/webkit-qt5/Makefile index ace31bd39870..78a872e7821a 100644 --- a/www/webkit-qt5/Makefile +++ b/www/webkit-qt5/Makefile @@ -2,7 +2,6 @@ PORTNAME= webkit DISTVERSION= ${QT5_VERSION} -PORTREVISION= 2 CATEGORIES= www PKGNAMEPREFIX= qt5- @@ -19,7 +18,7 @@ USE_GL= gl USE_GNOME= libxml2 libxslt USE_PERL5= build USE_QT5= core gui network opengl printsupport qml quick sql \ - testlib widgets buildtools_build + widgets buildtools_build QT_DIST= ${PORTNAME} USE_RUBY= yes RUBY_NO_RUN_DEPENDS= yes @@ -39,7 +38,7 @@ QT_CONFIG= accessibility accessibility-atspi-bridge OPTIONS_DEFINE= GSTREAMER OPTIONS_DEFAULT=GSTREAMER -GSTREAMER_USE= GNOME=glib20 GSTREAMER=yes +GSTREAMER_USE= GNOME=glib20 GSTREAMER1=yes .include <bsd.port.pre.mk> diff --git a/www/webkit-qt5/files/patch-Source__WebCore__platform__graphics__gstreamer__WebKitWebSourceGstreamer.cpp b/www/webkit-qt5/files/patch-Source__WebCore__platform__graphics__gstreamer__WebKitWebSourceGstreamer.cpp deleted file mode 100644 index 049d3e3d376e..000000000000 --- a/www/webkit-qt5/files/patch-Source__WebCore__platform__graphics__gstreamer__WebKitWebSourceGstreamer.cpp +++ /dev/null @@ -1,221 +0,0 @@ -GMutexLocker was added to glib in 2.44. Make sure we use the version from -WebCore. - ---- Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp.orig 2015-03-22 17:02:03.015319000 +0100 -+++ Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2015-03-22 17:04:05.587550000 +0100 -@@ -354,7 +354,7 @@ - - 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 @@ - 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 @@ - - 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 @@ - - ASSERT(isMainThread()); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - - priv->startID = 0; - -@@ -584,7 +584,7 @@ - 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 @@ - 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 @@ - 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 @@ - 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 @@ - 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 @@ - 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 @@ - 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 @@ - - 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 @@ - - 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 @@ - - 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 @@ - - 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 @@ - - 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 @@ - 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 @@ - 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 @@ - 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 @@ - - 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 @@ - 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 @@ - - 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 @@ - - 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 @@ - - 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(); - |