Attachment 183530 Details for Bug 220045 – Split port

[patch] Split port

websockets.diff (text/plain), 3.95 KB, created by groot on 2017-06-16 12:37:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: groot

Created: 2017-06-16 12:37:25 UTC

Size: 3.95 KB

patch

obsolete

>diff --git a/Mk/bsd.qt.mk b/Mk/bsd.qt.mk
>index a5800fc4a39f..7a519b190bb2 100644
>--- a/Mk/bsd.qt.mk
>+++ b/Mk/bsd.qt.mk
>@@ -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
>@@ -589,6 +589,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
> 
>diff --git a/www/qt5-websockets-qml/Makefile b/www/qt5-websockets-qml/Makefile
>new file mode 100644
>index 000000000000..3a75f8e41811
>--- /dev/null
>+++ b/www/qt5-websockets-qml/Makefile
>@@ -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>
>diff --git a/www/qt5-websockets-qml/files/patch-src_src.pro b/www/qt5-websockets-qml/files/patch-src_src.pro
>new file mode 100644
>index 000000000000..233aa90f4707
>--- /dev/null
>+++ b/www/qt5-websockets-qml/files/patch-src_src.pro
>@@ -0,0 +1,9 @@
>+--- 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
>diff --git a/www/qt5-websockets-qml/pkg-plist b/www/qt5-websockets-qml/pkg-plist
>new file mode 100644
>index 000000000000..b0d479958304
>--- /dev/null
>+++ b/www/qt5-websockets-qml/pkg-plist
>@@ -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
>diff --git a/www/qt5-websockets/Makefile b/www/qt5-websockets/Makefile
>index b92cc23a1e32..a36312c8613b 100644
>--- a/www/qt5-websockets/Makefile
>+++ b/www/qt5-websockets/Makefile
>@@ -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}
>diff --git a/www/qt5-websockets/files/patch-src_src.pro b/www/qt5-websockets/files/patch-src_src.pro
>new file mode 100644
>index 000000000000..1d7d3bae6aaa
>--- /dev/null
>+++ b/www/qt5-websockets/files/patch-src_src.pro
>@@ -0,0 +1,7 @@
>+--- 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
>diff --git a/www/qt5-websockets/pkg-plist b/www/qt5-websockets/pkg-plist
>index cd0517f99a05..ccf9af5d94dd 100644
>--- a/www/qt5-websockets/pkg-plist
>+++ b/www/qt5-websockets/pkg-plist
>@@ -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

Actions: View | Diff

Attachments on bug 220045: 183530