Date: Thu, 6 Jul 2017 20:40:51 +0000 (UTC) From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r445169 - in head: Mk multimedia/shotcut sysutils/sysadm sysutils/sysadm-client www www/qt5-websockets www/qt5-websockets-qml www/qt5-websockets-qml/files www/qt5-websockets/files Message-ID: <201707062040.v66KepNx093527@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tcberner Date: Thu Jul 6 20:40:51 2017 New Revision: 445169 URL: https://svnweb.freebsd.org/changeset/ports/445169 Log: Split part of www/qt5-websockets into new port www/qt5-websockets-qml This splits qt5-websockets into a qt5-websockets port containing the core parts, and a qt5-websockets-qml port with the QML parts. The QML parts depend on Qt Quick, so on the GUI parts (and hence X11) while the core parts do not. PR: 220045 Submitted by: Adriaan de Groot <groot@kde.org> Added: head/www/qt5-websockets-qml/ - copied from r445168, head/www/qt5-websockets/ head/www/qt5-websockets-qml/files/ head/www/qt5-websockets-qml/files/patch-src_src.pro (contents, props changed) head/www/qt5-websockets/files/ head/www/qt5-websockets/files/patch-src_src.pro (contents, props changed) Modified: head/Mk/bsd.qt.mk head/multimedia/shotcut/Makefile head/sysutils/sysadm-client/Makefile head/sysutils/sysadm/Makefile head/www/Makefile head/www/qt5-websockets-qml/Makefile head/www/qt5-websockets-qml/pkg-plist head/www/qt5-websockets/Makefile head/www/qt5-websockets/pkg-plist Modified: head/Mk/bsd.qt.mk ============================================================================== --- head/Mk/bsd.qt.mk Thu Jul 6 19:36:05 2017 (r445168) +++ head/Mk/bsd.qt.mk Thu Jul 6 20:40:51 2017 (r445169) @@ -321,7 +321,7 @@ _USE_QT5_ONLY= 3d buildtools canvas3d charts concurren qdbus qdoc qdoc-data qev qml quick quickcontrols \ quickcontrols2 scxml sensors serialbus serialport \ sql-tds uiplugin uitools virtualkeyboard webchannel \ - websockets widgets x11extras + websockets websockets-qml widgets x11extras 3d_PORT= graphics/${_QT_RELNAME}-3d 3d_LIB= libQt${_QT_LIBVER}3DCore.so @@ -594,6 +594,9 @@ webchannel_LIB= libQt${_QT_LIBVER}WebChannel.so websockets_PORT= www/${_QT_RELNAME}-websockets websockets_LIB= libQt${_QT_LIBVER}WebSockets.so + +websockets-qml_PORT= www/${_QT_RELNAME}-websockets-qml +websockets-qml_LIB= ${QT_QMLDIR}/QtWebSockets/libdeclarative_qmlwebsockets.so webkit_PORT= www/${_QT_RELNAME}-webkit webkit_LIB= libQt${_QT_LIBVER}WebKit.so Modified: head/multimedia/shotcut/Makefile ============================================================================== --- head/multimedia/shotcut/Makefile Thu Jul 6 19:36:05 2017 (r445168) +++ head/multimedia/shotcut/Makefile Thu Jul 6 20:40:51 2017 (r445169) @@ -3,7 +3,7 @@ PORTNAME= shotcut PORTVERSION= ${FULLVERSION:R} DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MAINTAINER= avilla@FreeBSD.org Modified: head/sysutils/sysadm-client/Makefile ============================================================================== --- head/sysutils/sysadm-client/Makefile Thu Jul 6 19:36:05 2017 (r445168) +++ head/sysutils/sysadm-client/Makefile Thu Jul 6 20:40:51 2017 (r445169) @@ -2,7 +2,7 @@ PORTNAME= sysadm-client PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= v CATEGORIES= sysutils Modified: head/sysutils/sysadm/Makefile ============================================================================== --- head/sysutils/sysadm/Makefile Thu Jul 6 19:36:05 2017 (r445168) +++ head/sysutils/sysadm/Makefile Thu Jul 6 20:40:51 2017 (r445169) @@ -2,6 +2,7 @@ PORTNAME= sysadm PORTVERSION= 1.0 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= sysutils Modified: head/www/Makefile ============================================================================== --- head/www/Makefile Thu Jul 6 19:36:05 2017 (r445168) +++ head/www/Makefile Thu Jul 6 20:40:51 2017 (r445169) @@ -1860,6 +1860,7 @@ SUBDIR += qt5-webchannel SUBDIR += qt5-webkit SUBDIR += qt5-websockets + SUBDIR += qt5-websockets-qml SUBDIR += quickie SUBDIR += qupzilla-qt4 SUBDIR += qupzilla-qt5 Modified: head/www/qt5-websockets-qml/Makefile ============================================================================== --- head/www/qt5-websockets/Makefile Thu Jul 6 19:36:05 2017 (r445168) +++ head/www/qt5-websockets-qml/Makefile Thu Jul 6 20:40:51 2017 (r445169) @@ -1,15 +1,15 @@ # $FreeBSD$ -PORTNAME= websockets +PORTNAME= websockets-qml DISTVERSION= ${QT5_VERSION} CATEGORIES= www PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org -COMMENT= Qt implementation of WebSocket protocol +COMMENT= Qt implementation of WebSocket protocol (QML bindings) -USE_QT5= buildtools_build core network qml quick -QT_DIST= ${PORTNAME} +USE_QT5= buildtools_build core network qml quick websockets +QT_DIST= websockets USES= qmake USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} Added: head/www/qt5-websockets-qml/files/patch-src_src.pro ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/qt5-websockets-qml/files/patch-src_src.pro Thu Jul 6 20:40:51 2017 (r445169) @@ -0,0 +1,12 @@ +We only care about the qml bindings in 'imports'. +The proper part of websockets is built via www/qt5-websockets. + +--- src/src.pro.orig 2017-06-16 04:42:03 UTC ++++ src/src.pro +@@ -1,5 +1,4 @@ + TEMPLATE = subdirs + CONFIG += ordered + +-SUBDIRS += websockets +-qtHaveModule(quick): SUBDIRS += imports ++SUBDIRS += imports Modified: head/www/qt5-websockets-qml/pkg-plist ============================================================================== --- head/www/qt5-websockets/pkg-plist Thu Jul 6 19:36:05 2017 (r445168) +++ head/www/qt5-websockets-qml/pkg-plist Thu Jul 6 20:40:51 2017 (r445169) @@ -1,40 +1,5 @@ -%%QT_INCDIR%%/QtWebSockets/%%FULLVER%%/QtWebSockets/private/qdefaultmaskgenerator_p.h -%%QT_INCDIR%%/QtWebSockets/%%FULLVER%%/QtWebSockets/private/qsslserver_p.h -%%QT_INCDIR%%/QtWebSockets/%%FULLVER%%/QtWebSockets/private/qwebsocket_p.h -%%QT_INCDIR%%/QtWebSockets/%%FULLVER%%/QtWebSockets/private/qwebsocketcorsauthenticator_p.h -%%QT_INCDIR%%/QtWebSockets/%%FULLVER%%/QtWebSockets/private/qwebsocketdataprocessor_p.h -%%QT_INCDIR%%/QtWebSockets/%%FULLVER%%/QtWebSockets/private/qwebsocketframe_p.h -%%QT_INCDIR%%/QtWebSockets/%%FULLVER%%/QtWebSockets/private/qwebsockethandshakerequest_p.h -%%QT_INCDIR%%/QtWebSockets/%%FULLVER%%/QtWebSockets/private/qwebsockethandshakeresponse_p.h -%%QT_INCDIR%%/QtWebSockets/%%FULLVER%%/QtWebSockets/private/qwebsocketprotocol_p.h -%%QT_INCDIR%%/QtWebSockets/%%FULLVER%%/QtWebSockets/private/qwebsocketserver_p.h -%%QT_INCDIR%%/QtWebSockets/QMaskGenerator -%%QT_INCDIR%%/QtWebSockets/QWebSocket -%%QT_INCDIR%%/QtWebSockets/QWebSocketCorsAuthenticator -%%QT_INCDIR%%/QtWebSockets/QWebSocketServer -%%QT_INCDIR%%/QtWebSockets/QtWebSockets -%%QT_INCDIR%%/QtWebSockets/QtWebSocketsDepends -%%QT_INCDIR%%/QtWebSockets/QtWebSocketsVersion -%%QT_INCDIR%%/QtWebSockets/qmaskgenerator.h -%%QT_INCDIR%%/QtWebSockets/qtwebsocketsversion.h -%%QT_INCDIR%%/QtWebSockets/qwebsocket.h -%%QT_INCDIR%%/QtWebSockets/qwebsocketcorsauthenticator.h -%%QT_INCDIR%%/QtWebSockets/qwebsocketprotocol.h -%%QT_INCDIR%%/QtWebSockets/qwebsockets_global.h -%%QT_INCDIR%%/QtWebSockets/qwebsocketserver.h -%%QT_CMAKEDIR%%/Qt5WebSockets/Qt5WebSocketsConfig.cmake -%%QT_CMAKEDIR%%/Qt5WebSockets/Qt5WebSocketsConfigVersion.cmake -%%QT_LIBDIR%%/libQt5WebSockets.prl -%%QT_LIBDIR%%/libQt5WebSockets.so -%%QT_LIBDIR%%/libQt5WebSockets.so.5 -%%QT_LIBDIR%%/libQt5WebSockets.so.%%SHORTVER%% -%%QT_LIBDIR%%/libQt5WebSockets.so.%%FULLVER%% -%%DEBUG%%%%QT_LIBDIR%%/libQt5WebSockets.so.%%FULLVER%%.debug -%%QT_MKSPECDIR%%/modules/qt_lib_websockets.pri -%%QT_MKSPECDIR%%/modules/qt_lib_websockets_private.pri %%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 Modified: head/www/qt5-websockets/Makefile ============================================================================== --- head/www/qt5-websockets/Makefile Thu Jul 6 19:36:05 2017 (r445168) +++ head/www/qt5-websockets/Makefile Thu Jul 6 20:40:51 2017 (r445169) @@ -2,13 +2,14 @@ PORTNAME= websockets DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= www PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt implementation of WebSocket protocol -USE_QT5= buildtools_build core network qml quick +USE_QT5= buildtools_build core network QT_DIST= ${PORTNAME} USES= qmake USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} Added: head/www/qt5-websockets/files/patch-src_src.pro ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/qt5-websockets/files/patch-src_src.pro Thu Jul 6 20:40:51 2017 (r445169) @@ -0,0 +1,11 @@ +Disable the build of the qml part. + +Splitting them out allows us to use websockets in non-gui applications. + +--- src/src.pro.orig 2017-06-16 04:39:03 UTC ++++ src/src.pro +@@ -2,4 +2,3 @@ TEMPLATE = subdirs + CONFIG += ordered + + SUBDIRS += websockets +-qtHaveModule(quick): SUBDIRS += imports Modified: head/www/qt5-websockets/pkg-plist ============================================================================== --- head/www/qt5-websockets/pkg-plist Thu Jul 6 19:36:05 2017 (r445168) +++ head/www/qt5-websockets/pkg-plist Thu Jul 6 20:40:51 2017 (r445169) @@ -32,9 +32,4 @@ %%DEBUG%%%%QT_LIBDIR%%/libQt5WebSockets.so.%%FULLVER%%.debug %%QT_MKSPECDIR%%/modules/qt_lib_websockets.pri %%QT_MKSPECDIR%%/modules/qt_lib_websockets_private.pri -%%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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707062040.v66KepNx093527>