Attachment 187626 Details for Bug 219641 – Fix py-qt5-* and py-qt4-demo with python3

[patch] Fix py-qt5-* and py-qt4-demo with python3

pyqt.diff (text/plain), 1.72 KB, created by Antoine Brodin on 2017-10-31 20:36:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Antoine Brodin

Created: 2017-10-31 20:36:24 UTC

Size: 1.72 KB

patch

obsolete

>Index: Mk/Uses/pyqt.mk
>===================================================================
>--- Mk/Uses/pyqt.mk	(revision 453249)
>+++ Mk/Uses/pyqt.mk	(working copy)
>@@ -219,6 +219,7 @@
> 		-d ${PYTHONPREFIX_SITELIBDIR} \
> 		-q ${QMAKE} \
> 		--confirm-license \
>+		--sip ${LOCALBASE}/bin/sip-${PYTHON_VER} \
> 		--sipdir ${SIPDIR}
> 
> # One of the things PyQt looks for to determine whether to build the Qt DBus
>Index: devel/py-qt5-qscintilla2/Makefile
>===================================================================
>--- devel/py-qt5-qscintilla2/Makefile	(revision 453249)
>+++ devel/py-qt5-qscintilla2/Makefile	(working copy)
>@@ -29,7 +29,8 @@
> 
> QSCIDIR=	${PREFIX}/share/qt5/qsci
> CONFIGURE_ARGS=	--pyqt PyQt5 -d ${PYTHONPREFIX_SITELIBDIR}/PyQt5 -v ${SIPDIR} \
>-		--apidir ${QSCIDIR} --qmake ${QMAKE} --pyqt-sipdir ${SIPDIR}
>+		--apidir ${QSCIDIR} --qmake ${QMAKE} --pyqt-sipdir ${SIPDIR} \
>+		--sip ${LOCALBASE}/bin/sip-${PYTHON_VER}
> WRKSRC=		${WRKDIR}/${DISTNAME}/Python
> ALL_TARGET=	#empty
> 
>Index: misc/py-qt4-demo/Makefile
>===================================================================
>--- misc/py-qt4-demo/Makefile	(revision 453249)
>+++ misc/py-qt4-demo/Makefile	(working copy)
>@@ -16,6 +16,7 @@
> 
> NO_BUILD=	yes
> USES=		python pyqt:4
>+USE_PYTHON=	py3kplist
> 
> EXAMPLESDIR=	${PREFIX}/share/examples/py-qt4
> 
>Index: misc/py-qt5-demo/Makefile
>===================================================================
>--- misc/py-qt5-demo/Makefile	(revision 453249)
>+++ misc/py-qt5-demo/Makefile	(working copy)
>@@ -22,6 +22,7 @@
> 		sql_run svg_run test_run webkit_run xml_run \
> 		xmlpatterns_run sip_run qscintilla2_run \
> 		printsupport_run serialport_run webkitwidgets_run widgets_run
>+USE_PYTHON=	py3kplist
> 
> EXAMPLESDIR=	${PREFIX}/share/examples/py-qt5
>

Actions: View | Diff

Attachments on bug 219641: 183051 | 183052 | 183244 | 183245 | 183246 | 187619 | 187626