Attachment 190443 Details for Bug 225773 – PyQt5: Fix plist under python 3.4

PyQt5: Fix plist under python 3.4

patch-pyqt5-5.9.2_2.txt (text/plain), 4.01 KB, created by John W. O'Brien on 2018-02-08 21:12:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John W. O'Brien

Created: 2018-02-08 21:12:17 UTC

Size: 4.01 KB

patch

obsolete

>Index: devel/py-qt5-core/Makefile
>===================================================================
>--- devel/py-qt5-core/Makefile	(revision 461248)
>+++ devel/py-qt5-core/Makefile	(working copy)
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	core
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	devel python
> 
> MAINTAINER=	kde@FreeBSD.org
>@@ -31,6 +31,13 @@
> 
> .include <bsd.port.pre.mk>
> 
>+.if ${PYTHON_REL} >= 3500
>+TYPEHINTS=""
>+.else
>+TYPEHINTS="@comment "
>+.endif
>+PLIST_SUB+=	TYPEHINTS=${TYPEHINTS}
>+
> # Bug 180467: We need to remove the port_v${VERSION} directory that does not
> # correspond to the Python version being used to avoid failures in the
> # bytecompilation calls in post-install.
>@@ -50,5 +57,6 @@
> 	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
> 		-f -d ${PYTHONPREFIX_SITELIBDIR} \
> 		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5
>+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtCore.so
> 
> .include <bsd.port.post.mk>
>Index: devel/py-qt5-core/pkg-plist
>===================================================================
>--- devel/py-qt5-core/pkg-plist	(revision 461248)
>+++ devel/py-qt5-core/pkg-plist	(working copy)
>@@ -3,7 +3,7 @@
> %%PYTHON_SITELIBDIR%%/PyQt5/Qt.pyc
> %%PYTHON_SITELIBDIR%%/PyQt5/Qt.pyo
> %%PYTHON_SITELIBDIR%%/PyQt5/QtCore.so
>-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PyQt5/QtCore.pyi
>+%%TYPEHINTS%%%%PYTHON_SITELIBDIR%%/PyQt5/QtCore.pyi
> %%PYTHON_SITELIBDIR%%/PyQt5/__init__.py
> %%PYTHON_SITELIBDIR%%/PyQt5/__init__.pyc
> %%PYTHON_SITELIBDIR%%/PyQt5/__init__.pyo
>Index: x11-toolkits/py-qt5-gui/Makefile
>===================================================================
>--- x11-toolkits/py-qt5-gui/Makefile	(revision 461248)
>+++ x11-toolkits/py-qt5-gui/Makefile	(working copy)
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	gui
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	x11-toolkits devel python
> 
> MAINTAINER=	kde@FreeBSD.org
>@@ -24,4 +24,16 @@
> API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${QSCIDIR}
> API_CONFIGURE_OFF=	--no-qsci-api
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.pre.mk>
>+
>+.if ${PYTHON_REL} >= 3500
>+TYPEHINTS=""
>+.else
>+TYPEHINTS="@comment "
>+.endif
>+PLIST_SUB+=	TYPEHINTS=${TYPEHINTS}
>+
>+post-install:
>+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtGui.so
>+
>+.include <bsd.port.post.mk>
>Index: x11-toolkits/py-qt5-gui/pkg-plist
>===================================================================
>--- x11-toolkits/py-qt5-gui/pkg-plist	(revision 461248)
>+++ x11-toolkits/py-qt5-gui/pkg-plist	(working copy)
>@@ -1,5 +1,5 @@
> %%PYTHON_SITELIBDIR%%/PyQt5/QtGui.so
>-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PyQt5/QtGui.pyi
>+%%TYPEHINTS%%%%PYTHON_SITELIBDIR%%/PyQt5/QtGui.pyi
> %%PYQT_SIPDIR%%/QtGui/QtGuimod.sip
> %%PYQT_SIPDIR%%/QtGui/opengl_types.sip
> %%PYQT_SIPDIR%%/QtGui/qabstracttextdocumentlayout.sip
>Index: x11-toolkits/py-qt5-widgets/Makefile
>===================================================================
>--- x11-toolkits/py-qt5-widgets/Makefile	(revision 461248)
>+++ x11-toolkits/py-qt5-widgets/Makefile	(working copy)
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	widgets
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	x11-toolkits devel python
> 
> MAINTAINER=	kde@FreeBSD.org
>@@ -26,4 +26,16 @@
> API_LIB_DEPENDS=	libqscintilla2-qt5.so:devel/qscintilla2-qt5
> DEBUG_CONFIGURE_ON=	--debug --trace
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.pre.mk>
>+
>+.if ${PYTHON_REL} >= 3500
>+TYPEHINTS=""
>+.else
>+TYPEHINTS="@comment "
>+.endif
>+PLIST_SUB+=	TYPEHINTS=${TYPEHINTS}
>+
>+post-install:
>+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtWidgets.so
>+
>+.include <bsd.port.post.mk>
>Index: x11-toolkits/py-qt5-widgets/pkg-plist
>===================================================================
>--- x11-toolkits/py-qt5-widgets/pkg-plist	(revision 461248)
>+++ x11-toolkits/py-qt5-widgets/pkg-plist	(working copy)
>@@ -1,5 +1,5 @@
> %%PYTHON_SITELIBDIR%%/PyQt5/QtWidgets.so
>-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PyQt5/QtWidgets.pyi
>+%%TYPEHINTS%%%%PYTHON_SITELIBDIR%%/PyQt5/QtWidgets.pyi
> %%PYQT_SIPDIR%%/QtWidgets/QtWidgetsmod.sip
> %%PYQT_SIPDIR%%/QtWidgets/qabstractbutton.sip
> %%PYQT_SIPDIR%%/QtWidgets/qabstractitemdelegate.sip

Actions: View

Attachments on bug 225773: 190443