svn commit: r453263 - in head: Mk/Uses devel/py-qt5-qscintilla2 misc/py-qt4-demo misc/py-qt5-demo
Antoine Brodin
antoine at FreeBSD.org
Wed Nov 1 07:32:35 UTC 2017
Author: antoine
Date: Wed Nov 1 07:32:34 2017
New Revision: 453263
URL: https://svnweb.freebsd.org/changeset/ports/453263
Log:
- py-qt5-*: Fix build when using non default version of python, in this case
sip is installed as sip-${PYTHON_VER}
- py-qt*-demo: Fix packaging with python3, those ports have a python2 pkg-plist
so USE_PYTHON=py3kplist must be used to convert it
PR: 219641
Modified:
head/Mk/Uses/pyqt.mk
head/devel/py-qt5-qscintilla2/Makefile
head/misc/py-qt4-demo/Makefile
head/misc/py-qt5-demo/Makefile
Modified: head/Mk/Uses/pyqt.mk
==============================================================================
--- head/Mk/Uses/pyqt.mk Wed Nov 1 06:44:04 2017 (r453262)
+++ head/Mk/Uses/pyqt.mk Wed Nov 1 07:32:34 2017 (r453263)
@@ -219,6 +219,7 @@ CONFIGURE_ARGS+=-b ${PREFIX}/bin \
-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
Modified: head/devel/py-qt5-qscintilla2/Makefile
==============================================================================
--- head/devel/py-qt5-qscintilla2/Makefile Wed Nov 1 06:44:04 2017 (r453262)
+++ head/devel/py-qt5-qscintilla2/Makefile Wed Nov 1 07:32:34 2017 (r453263)
@@ -29,7 +29,8 @@ DEBUG_CONFIGURE_ON= --debug --trace
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
Modified: head/misc/py-qt4-demo/Makefile
==============================================================================
--- head/misc/py-qt4-demo/Makefile Wed Nov 1 06:44:04 2017 (r453262)
+++ head/misc/py-qt4-demo/Makefile Wed Nov 1 07:32:34 2017 (r453263)
@@ -16,6 +16,7 @@ DISTINFO_FILE= ${PYQT4_DISTINFO_FILE}
NO_BUILD= yes
USES= python pyqt:4
+USE_PYTHON= py3kplist
EXAMPLESDIR= ${PREFIX}/share/examples/py-qt4
Modified: head/misc/py-qt5-demo/Makefile
==============================================================================
--- head/misc/py-qt5-demo/Makefile Wed Nov 1 06:44:04 2017 (r453262)
+++ head/misc/py-qt5-demo/Makefile Wed Nov 1 07:32:34 2017 (r453263)
@@ -22,6 +22,7 @@ USE_PYQT= core_run dbus_run designer_run \
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
More information about the svn-ports-head
mailing list