Attachment 216568 Details for Bug 245862 – Alternative versioning fix

[patch] Alternative versioning fix

p (text/plain), 1.10 KB, created by Adriaan de Groot on 2020-07-19 11:57:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adriaan de Groot

Created: 2020-07-19 11:57:53 UTC

Size: 1.10 KB

patch

obsolete

>diff --git Mk/Uses/qt.mk Mk/Uses/qt.mk
>index f47ab782f715..307c47e5ff52 100644
>--- Mk/Uses/qt.mk
>+++ Mk/Uses/qt.mk
>@@ -151,8 +151,9 @@ qt-3d_LIB=		libQt${_QT_LIBVER}3DCore.so
> qt-assistant_PORT=	devel/${_QT_RELNAME}-assistant
> qt-assistant_PATH=	${LOCALBASE}/${QT_BINDIR_REL}/assistant
> 
>+# Always build with *this* version's buildtools
> qt-buildtools_PORT=	devel/${_QT_RELNAME}-buildtools
>-qt-buildtools_PATH=	${LOCALBASE}/${QT_BINDIR_REL}/moc
>+qt-buildtools_PATH=	${_QT_RELNAME}-buildtools>=${_QT_VERSION}
> 
> qt-charts_PORT=		x11-toolkits/${_QT_RELNAME}-charts
> qt-charts_LIB=		libQt${_QT_LIBVER}Charts.so
>@@ -256,8 +257,9 @@ qt-qdoc-data_PATH=	${LOCALBASE}/${QT_DOCDIR_REL}/global/config.qdocconf
> qt-qev_PORT=		x11/${_QT_RELNAME}-qev
> qt-qev_PATH=		${LOCALBASE}/${QT_BINDIR_REL}/qev
> 
>+# Always build with *this* version's qmake
> qt-qmake_PORT=		devel/${_QT_RELNAME}-qmake
>-qt-qmake_PATH=		${LOCALBASE}/${QT_BINDIR_REL}/qmake
>+qt-qmake_PATH=		${_QT_RELNAME}-qmake>=${_QT_VERSION}
> 
> qt-quickcontrols_PORT=	x11-toolkits/${_QT_RELNAME}-quickcontrols
> qt-quickcontrols_PATH=	${LOCALBASE}/${QT_QMLDIR_REL}/QtQuick/Controls/qmldir

Actions: View | Diff

Attachments on bug 245862: 213821 | 216568