mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-25 04:43:33 +00:00
Code Issues Releases Activity

Split part of www/qt5-websockets into new port www/qt5-websockets-qml

Browse Source 
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>
This commit is contained in:
Tobias C. Berner 2017-07-06 20:40:51 +00:00
parent 02c5f4f1ee
commit b7f2d323ae
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=445169
11 changed files with 54 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Mk/bsd.qt.mk
View File

@ -321,7 +321,7 @@ _USE_QT5_ONLY= 3d buildtools canvas3d charts concurrent connectivity \
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
@ -595,6 +595,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

2
multimedia/shotcut/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= shotcut
PORTVERSION= ${FULLVERSION:R}
DISTVERSIONPREFIX= v
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= multimedia
MAINTAINER= avilla@FreeBSD.org

2
sysutils/sysadm-client/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= sysadm-client
PORTVERSION= 1.0
PORTREVISION= 1
PORTREVISION= 2
DISTVERSIONPREFIX= v
CATEGORIES= sysutils

1
sysutils/sysadm/Makefile
View File

@ -2,6 +2,7 @@
PORTNAME= sysadm
PORTVERSION= 1.0
PORTREVISION= 1
DISTVERSIONPREFIX= v
CATEGORIES= sysutils

1
www/Makefile
View File

@ -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

16
www/qt5-websockets-qml/Makefile Normal file
View File

@ -0,0 +1,16 @@
# $FreeBSD$
PORTNAME= websockets-qml
DISTVERSION= ${QT5_VERSION}
CATEGORIES= www
PKGNAMEPREFIX= qt5-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt implementation of WebSocket protocol (QML bindings)
USE_QT5= buildtools_build core network qml quick websockets
QT_DIST= websockets
USES= qmake
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
.include <bsd.port.mk>

12
www/qt5-websockets-qml/files/patch-src_src.pro Normal file
View File

@ -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

5
www/qt5-websockets-qml/pkg-plist Normal file
View File

@ -0,0 +1,5 @@
%%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

3
www/qt5-websockets/Makefile
View File

@ -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}

11
www/qt5-websockets/files/patch-src_src.pro Normal file
View File

@ -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

5
www/qt5-websockets/pkg-plist
View File

@ -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