1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-18 19:49:40 +00:00

Update PyQt5 to 5.11.3

- sip         upgrade to 4.19.13
- qscintilla2 upgrade to 2.10.8
- PyQt5       upgrade to 5.11.3

This has been worked on by arrowd and myself.

PR:		233954
Exp-run by:	antoine
This commit is contained in:
Tobias C. Berner 2018-12-16 15:25:40 +00:00
parent 1fb34516c1
commit b9ead510b9
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=487597
52 changed files with 2474 additions and 2347 deletions

View File

@ -60,10 +60,10 @@ MASTER_SITES_PYQT5= SF/pyqt/PyQt5/PyQt-${PORTVERSION} \
MASTER_SITES_QSCI2= SF/pyqt/QScintilla2/QScintilla-${PORTVERSION} \
GENTOO
SIP_VERSION= 4.19.8
QSCI2_VERSION= 2.10.4
SIP_VERSION= 4.19.13
QSCI2_VERSION= 2.10.8
PYQT4_VERSION= 4.12.1
PYQT5_VERSION= 5.10.1
PYQT5_VERSION= 5.11.3
SIP_DISTNAME= sip-${SIP_VERSION}
PYQT4_DISTNAME= PyQt4_gpl_x11-${PYQT4_VERSION}
@ -255,10 +255,12 @@ CONFIGURE_ARGS+=-b ${PREFIX}/bin \
--confirm-license \
--sip ${SIP} \
--sipdir ${PYQT_SIPDIR}
# Move the designer plugin and qml libraries to versioned folders.
.if ${_PYQT_VERSION:M5}
# Move the designer plugin and qml libraries to versioned folders.
CONFIGURE_ARGS+=--qml-plugindir ${PYQT_QMLDIR} \
--designer-plugindir ${PYQT_DESIGNERDIR}
# Further do not gernate the dinstinfo files.
CONFIGURE_ARGS+=--no-dist-info
.endif
# One of the things PyQt looks for to determine whether to build the Qt DBus
# main loop module (${PYQT_RELNAME}-dbussupport) is whether the dbus/ directory is

View File

@ -6,6 +6,9 @@ CATEGORIES= comms devel python
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt5 toolkit, QtSerialPort module
BUILD_DEPENDS= ${PY_ENUM34}
RUN_DEPENDS= ${PY_ENUM34}
CONFIGURE_ARGS= --enable QtSerialPort
PYQT_DIST= yes

View File

@ -6,6 +6,9 @@ CATEGORIES= databases devel python
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt5 toolkit, QtSql module
BUILD_DEPENDS= ${PY_ENUM34}
RUN_DEPENDS= ${PY_ENUM34}
CONFIGURE_ARGS= --enable QtSql
PYQT_DIST= yes

View File

@ -32,7 +32,7 @@ CMAKE_ARGS+= -DWITH_PolkitQt:BOOL=FALSE \
SUB_FILES= kdebindings4.pth
SUB_LIST= PYTHONPREFIX_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR}
PLIST_SUB+= SIPDIR=share/sip
PLIST_SUB+= PYQT_SIPDIR=share/sip
OPTIONS_DEFINE= EXAMPLES

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,7 @@
# $FreeBSD$
PORTNAME= dbussupport
PORTREVISION= 1
CATEGORIES= devel python
MAINTAINER= kde@FreeBSD.org
@ -17,7 +18,7 @@ PYQT_DIST= yes
USES= pkgconfig python pyqt:4 qt:4
USE_PYQT= sip_build
USE_PYTHON= flavors
USE_PYTHON= concurrent flavors py3kplist
USE_QT= corelib qmake_build moc_build
OPTIONS_DEFINE= DEBUG

View File

@ -2,6 +2,7 @@
# $FreeBSD$
PORTNAME= designerplugin
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel python
@ -20,7 +21,7 @@ PYQT_DIST= yes
USES= python pyqt:4 qt:4
USE_PYQT= sip_build
USE_PYTHON= flavors
USE_PYTHON= concurrent flavors py3kplist
USE_QT= corelib designer gui script xml moc_build qmake_build
OPTIONS_DEFINE= DEBUG

View File

@ -3,7 +3,6 @@
PORTNAME= qscintilla2
PORTVERSION= ${QSCI2_VERSION}
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel python
MASTER_SITES= ${MASTER_SITES_QSCI2}

View File

@ -1,3 +1,6 @@
%%PYTHON_SITELIBDIR%%/QScintilla-2.10.8.dist-info/INSTALLER
%%PYTHON_SITELIBDIR%%/QScintilla-2.10.8.dist-info/METADATA
%%PYTHON_SITELIBDIR%%/QScintilla-2.10.8.dist-info/RECORD
%%PYTHON_SITELIBDIR%%/PyQt4/Qsci.pyi
%%PYTHON_SITELIBDIR%%/PyQt4/Qsci.so
%%PYQT_SIPDIR%%/Qsci/qsciabstractapis.sip
@ -17,6 +20,7 @@
%%PYQT_SIPDIR%%/Qsci/qscilexercustom.sip
%%PYQT_SIPDIR%%/Qsci/qscilexerd.sip
%%PYQT_SIPDIR%%/Qsci/qscilexerdiff.sip
%%PYQT_SIPDIR%%/Qsci/qscilexeredifact.sip
%%PYQT_SIPDIR%%/Qsci/qscilexerfortran.sip
%%PYQT_SIPDIR%%/Qsci/qscilexerfortran77.sip
%%PYQT_SIPDIR%%/Qsci/qscilexerhtml.sip

View File

@ -6,6 +6,9 @@ CATEGORIES= devel python
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt5 toolkit, QtCore module
BUILD_DEPENDS= ${PY_ENUM34}
RUN_DEPENDS= ${PY_ENUM34}
PYQT_MODULE= QtCore
CONFIGURE_ARGS= ${PYQT5_MODULES_ALL:N${PYQT_MODULE}:C/.*/--disable=&/} \
--enable=${PYQT_MODULE}

View File

@ -12,18 +12,18 @@ QtWebEngineWidgets.
Also causes .pyi files to be installed regardless of the Python version to
simplify plist handling.
--- configure.py.orig 2017-11-23 14:44:03 UTC
--- configure.py.orig 2018-10-01 13:38:10 UTC
+++ configure.py
@@ -98,7 +98,7 @@ MODULE_METADATA = {
@@ -102,7 +102,7 @@ MODULE_METADATA = {
'QtWebEngineCore': ModuleMetadata(qmake_QT=['webenginecore', '-gui']),
'QtWebEngineWidgets': ModuleMetadata(
qmake_QT=['webenginewidgets', 'webchannel',
- 'network', 'widgets'],
+ 'network', 'printsupport', 'widgets'],
+ 'network', 'printsupport', 'widgets'],
cpp11=True),
'QtWebKit': ModuleMetadata(qmake_QT=['webkit', 'network']),
'QtWebKitWidgets': ModuleMetadata(
@@ -503,7 +503,7 @@ class TargetConfiguration:
@@ -527,7 +527,7 @@ class TargetConfiguration:
self.no_pydbus = False
self.no_qml_plugin = False
self.no_tools = False
@ -32,7 +32,7 @@ simplify plist handling.
self.qmake = self._find_exe('qmake')
self.qmake_spec = ''
self.qmake_spec_default = ''
@@ -773,7 +773,7 @@ class TargetConfiguration:
@@ -805,7 +805,7 @@ class TargetConfiguration:
"""
# The platform may have changed so update the default.
@ -41,7 +41,7 @@ simplify plist handling.
self.prot_is_public = True
self.vend_inc_dir = self.py_venv_inc_dir
@@ -1450,8 +1450,9 @@ def generate_makefiles(target_config, verbose, parts,
@@ -1506,8 +1506,9 @@ def generate_makefiles(target_config, verbose, parts,
# Add the internal modules if they are required.
if not target_config.no_tools:
@ -53,7 +53,7 @@ simplify plist handling.
for mname in pyqt_modules:
metadata = MODULE_METADATA[mname]
@@ -1493,20 +1494,17 @@ def generate_makefiles(target_config, verbose, parts,
@@ -1549,22 +1550,20 @@ def generate_makefiles(target_config, verbose, parts,
f.close()
@ -68,22 +68,26 @@ simplify plist handling.
- wrappers.append((tool,
- generate_tool_wrapper(target_config, tool + '5',
- 'PyQt5.%s_main' % tool)))
-
- # Generate the pyuic5 wrapper.
- wrappers.append(('pyuic',
+ if "QtXml" in target_config.pyqt_modules:
+ # Generate the pylupdate5 and pyrcc5 wrappers.
+ for tool in ('pylupdate', 'pyrcc'):
+ wrappers.append((tool,
+ generate_tool_wrapper(target_config, tool + '5',
+ 'PyQt5.%s_main' % tool)))
- # Generate the pyuic5 wrapper.
- wrappers.append(('pyuic',
- generate_tool_wrapper(target_config, 'pyuic5',
- 'PyQt5.uic.pyuic')))
+ if "QtCore" in target_config.pyqt_modules:
+ # Generate the pyuic5 wrapper.
+ wrappers.append(('pyuic',
generate_tool_wrapper(target_config, 'pyuic5',
'PyQt5.uic.pyuic')))
+ generate_tool_wrapper(target_config, 'pyuic5',
+ 'PyQt5.uic.pyuic')))
@@ -1524,23 +1522,6 @@ def generate_makefiles(target_config, verbose, parts,
# Generate the Qt Designer plugin.
if not target_config.no_designer_plugin and 'QtDesigner' in target_config.pyqt_modules:
@@ -1580,23 +1579,6 @@ def generate_makefiles(target_config, verbose, parts,
source_path('examples', 'quick', 'tutorials', 'extending',
'chapter6-plugins'))
@ -107,7 +111,13 @@ simplify plist handling.
# Generate the Python dbus module.
if target_config.pydbus_module_dir != '':
mname = 'dbus'
@@ -1568,14 +1549,18 @@ def generate_makefiles(target_config, verbose, parts,
@@ -1627,27 +1609,31 @@ def generate_makefiles(target_config, verbose, parts,
all_installs.append(
root_dir + '/' + module_file_name(target_config, mname))
- all_installs.append(root_dir + '/' + module_file_name(target_config, 'Qt'))
+ # all_installs.append(root_dir + '/' + module_file_name(target_config, 'Qt'))
out_f.write('''TEMPLATE = subdirs
CONFIG += ordered nostrip
SUBDIRS = %s
@ -121,6 +131,9 @@ simplify plist handling.
-''' % (' '.join(subdirs), source_path('__init__.py'), root_dir))
+''' % (source_path('__init__.py'), root_dir))
- all_installs.append(root_dir + '/__init__.py')
+ # all_installs.append(root_dir + '/__init__.py')
- # Install the uic module.
- out_f.write('''
+ if not target_config.no_tools:
@ -129,7 +142,14 @@ simplify plist handling.
uic_package.files = %s
uic_package.path = %s
INSTALLS += uic_package
@@ -1603,6 +1588,8 @@ INSTALLS += tools
''' % (source_path('pyuic', 'uic'), root_dir))
- all_installs.append(root_dir + '/uic')
+ # all_installs.append(root_dir + '/uic')
# Install the tool main scripts and wrappers.
if wrappers:
@@ -1676,6 +1662,8 @@ INSTALLS += tools
# Install the .sip files.
if target_config.pyqt_sip_dir:
for mname, metadata in MODULE_METADATA.items():
@ -138,31 +158,35 @@ simplify plist handling.
if metadata.public and mname != 'Qt':
sip_files = matching_files(source_path('sip', mname, '*.sip'))
@@ -1618,7 +1605,7 @@ INSTALLS += sip%s
))
@@ -1695,7 +1683,7 @@ INSTALLS += sip%s
all_installs.append(mdir)
# Install the stub files.
- if target_config.py_version >= 0x030500 and target_config.pyqt_stubs_dir:
+ if target_config.pyqt_stubs_dir:
out_f.write('''
pep484_stubs.files = %s Qt.pyi
pep484_stubs.path = %s
@@ -1628,11 +1615,12 @@ INSTALLS += pep484_stubs
pyi_names = [mname + '.pyi'
for mname in target_config.pyqt_modules if mname[0] != '_']
@@ -1713,14 +1701,15 @@ INSTALLS += pep484_stubs
# Install the QScintilla .api file.
if target_config.qsci_api:
api_dir = target_config.qsci_api_dir + '/api/python'
+ api_list = ' '.join(['%s.api' % m for m in target_config.pyqt_modules])
out_f.write('''
-qscintilla_api.files = PyQt5.api
+qscintilla_api.files = %s
+qscintilla_api.files = %s
qscintilla_api.path = %s
INSTALLS += qscintilla_api
-''' % qmake_quote(target_config.qsci_api_dir + '/api/python'))
+''' % (api_list, qmake_quote(target_config.qsci_api_dir + '/api/python')))
-''' % qmake_quote(api_dir))
+''' % (api_list, qmake_quote(api_dir)))
out_f.close()
- all_installs.append(api_dir + '/PyQt5.api')
+ # all_installs.append(api_dir + '/PyQt5.api')
@@ -1864,7 +1852,7 @@ def inform_user(target_config, sip_version):
if distinfo:
# The command to run to generate the .dist-info directory.
@@ -1984,7 +1973,7 @@ def inform_user(target_config, sip_version):
os.path.join(
target_config.qsci_api_dir, 'api', 'python'))
@ -171,7 +195,7 @@ simplify plist handling.
inform("The PyQt5 PEP 484 stub files will be installed in %s." %
target_config.pyqt_stubs_dir)
@@ -2431,7 +2419,7 @@ def generate_sip_module_code(target_config, verbose, p
@@ -2553,7 +2542,7 @@ def generate_sip_module_code(target_config, verbose, p
argv.append('-a')
argv.append(mname + '.api')
@ -180,7 +204,7 @@ simplify plist handling.
argv.append('-y')
argv.append(mname + '.pyi')
@@ -2604,7 +2592,7 @@ target.files = $$PY_MODULE
@@ -2726,7 +2715,7 @@ target.files = $$PY_MODULE
pro_lines.append('INSTALLS += target')
# This optimisation could apply to other platforms.

View File

@ -1,12 +0,0 @@
Fix build with Qt 5.11 (fixed upstream)
--- sip/QtTest/qtestmouse.sip.orig 2018-09-04 08:52:38 UTC
+++ sip/QtTest/qtestmouse.sip
@@ -41,7 +41,6 @@ namespace QTest
void mousePress(QWidget *widget, Qt::MouseButton button, Qt::KeyboardModifiers modifier = 0, QPoint pos = QPoint(), int delay = -1);
void mouseRelease(QWidget *widget, Qt::MouseButton button, Qt::KeyboardModifiers modifier = 0, QPoint pos = QPoint(), int delay = -1);
void mouseEvent(QTest::MouseAction action, QWidget *widget, Qt::MouseButton button, Qt::KeyboardModifiers modifier, QPoint pos, int delay = -1);
- void waitForEvents() /ReleaseGIL/;
void mouseEvent(QTest::MouseAction action, QWindow *window, Qt::MouseButton button, Qt::KeyboardModifiers modifier, QPoint pos, int delay = -1);
void mousePress(QWindow *window, Qt::MouseButton button, Qt::KeyboardModifiers modifier = Qt::KeyboardModifiers(), QPoint pos = QPoint(), int delay = -1);
void mouseRelease(QWindow *window, Qt::MouseButton button, Qt::KeyboardModifiers modifier = Qt::KeyboardModifiers(), QPoint pos = QPoint(), int delay = -1);

View File

@ -2,8 +2,8 @@ bin/pyuic5
%%PYTHON_SITELIBDIR%%/PyQt5/Qt.py
%%PYTHON_SITELIBDIR%%/PyQt5/Qt.pyc
%%PYTHON_SITELIBDIR%%/PyQt5/Qt.pyo
%%PYTHON_SITELIBDIR%%/PyQt5/QtCore.so
%%PYTHON_SITELIBDIR%%/PyQt5/QtCore.pyi
%%PYTHON_SITELIBDIR%%/PyQt5/QtCore.so
%%PYTHON_SITELIBDIR%%/PyQt5/__init__.py
%%PYTHON_SITELIBDIR%%/PyQt5/__init__.pyc
%%PYTHON_SITELIBDIR%%/PyQt5/__init__.pyo
@ -97,6 +97,7 @@ bin/pyuic5
%%PYTHON_SITELIBDIR%%/PyQt5/uic/widget-plugins/qtwebkit.py
%%PYTHON_SITELIBDIR%%/PyQt5/uic/widget-plugins/qtwebkit.pyc
%%PYTHON_SITELIBDIR%%/PyQt5/uic/widget-plugins/qtwebkit.pyo
%%API%%%%PYQT_APIDIR%%/api/python/QtCore.api
%%PYQT_SIPDIR%%/QtCore/QtCoremod.sip
%%PYQT_SIPDIR%%/QtCore/qabstractanimation.sip
%%PYQT_SIPDIR%%/QtCore/qabstracteventdispatcher.sip
@ -173,6 +174,7 @@ bin/pyuic5
%%PYQT_SIPDIR%%/QtCore/qpycore_qmap.sip
%%PYQT_SIPDIR%%/QtCore/qpycore_qpair.sip
%%PYQT_SIPDIR%%/QtCore/qpycore_qset.sip
%%PYQT_SIPDIR%%/QtCore/qpycore_qvariantmap.sip
%%PYQT_SIPDIR%%/QtCore/qpycore_qvector.sip
%%PYQT_SIPDIR%%/QtCore/qpycore_virtual_error_handler.sip
%%PYQT_SIPDIR%%/QtCore/qrandom.sip
@ -221,4 +223,3 @@ bin/pyuic5
%%PYQT_SIPDIR%%/QtCore/qwaitcondition.sip
%%PYQT_SIPDIR%%/QtCore/qwineventnotifier.sip
%%PYQT_SIPDIR%%/QtCore/qxmlstream.sip
%%API%%%%PYQT_APIDIR%%/api/python/QtCore.api

View File

@ -6,6 +6,9 @@ CATEGORIES= devel python
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt5 toolkit, QtDBus module
BUILD_DEPENDS= ${PY_ENUM34}
RUN_DEPENDS= ${PY_ENUM34}
CONFIGURE_ARGS= --enable QtDBus
PYQT_DIST= yes

View File

@ -6,8 +6,10 @@ CATEGORIES= devel python
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt event loop support for dbus-python
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:devel/py-dbus@${PY_FLAVOR}
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:devel/py-dbus@${PY_FLAVOR}
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:devel/py-dbus@${PY_FLAVOR} \
${PY_ENUM34}
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:devel/py-dbus@${PY_FLAVOR} \
${PY_ENUM34}
CONFIGURE_ARGS= --enable QtCore
PYQT_DIST= yes

View File

@ -6,6 +6,9 @@ CATEGORIES= devel python
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt5 toolkit, QtDesigner module
BUILD_DEPENDS= ${PY_ENUM34}
RUN_DEPENDS= ${PY_ENUM34}
CONFIGURE_ARGS= --enable QtDesigner --no-designer-plugin
PYQT_DIST= yes

View File

@ -6,6 +6,9 @@ CATEGORIES= devel python
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt5 toolkit, QtDesigner plugin
BUILD_DEPENDS= ${PY_ENUM34}
RUN_DEPENDS= ${PY_ENUM34}
BUILD_WRKSRC= ${WRKSRC}/designer
INSTALL_WRKSRC= ${WRKSRC}/designer
DESTDIRNAME= INSTALL_ROOT

View File

@ -6,6 +6,9 @@ CATEGORIES= devel python
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt5 toolkit, QtHelp module
BUILD_DEPENDS= ${PY_ENUM34}
RUN_DEPENDS= ${PY_ENUM34}
CONFIGURE_ARGS= --enable QtHelp
PYQT_DIST= yes

View File

@ -1,3 +1,6 @@
%%PYTHON_SITELIBDIR%%/QScintilla-2.10.8.dist-info/INSTALLER
%%PYTHON_SITELIBDIR%%/QScintilla-2.10.8.dist-info/METADATA
%%PYTHON_SITELIBDIR%%/QScintilla-2.10.8.dist-info/RECORD
%%PYTHON_SITELIBDIR%%/PyQt5/Qsci.pyi
%%PYTHON_SITELIBDIR%%/PyQt5/Qsci.so
%%PYQT_SIPDIR%%/Qsci/qsciabstractapis.sip
@ -17,6 +20,7 @@
%%PYQT_SIPDIR%%/Qsci/qscilexercustom.sip
%%PYQT_SIPDIR%%/Qsci/qscilexerd.sip
%%PYQT_SIPDIR%%/Qsci/qscilexerdiff.sip
%%PYQT_SIPDIR%%/Qsci/qscilexeredifact.sip
%%PYQT_SIPDIR%%/Qsci/qscilexerfortran.sip
%%PYQT_SIPDIR%%/Qsci/qscilexerfortran77.sip
%%PYQT_SIPDIR%%/Qsci/qscilexerhtml.sip

View File

@ -6,6 +6,9 @@ CATEGORIES= devel python
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt5 toolkit, QtTest module
BUILD_DEPENDS= ${PY_ENUM34}
RUN_DEPENDS= ${PY_ENUM34}
CONFIGURE_ARGS= --enable QtTest
PYQT_DIST= yes

View File

@ -1,6 +1,7 @@
%%PYTHON_SITELIBDIR%%/PyQt5/QtTest.so
%%PYTHON_SITELIBDIR%%/PyQt5/QtTest.pyi
%%PYQT_SIPDIR%%/QtTest/QtTestmod.sip
%%PYQT_SIPDIR%%/QtTest/qabstractitemmodeltester.sip
%%PYQT_SIPDIR%%/QtTest/qsignalspy.sip
%%PYQT_SIPDIR%%/QtTest/qtestcase.sip
%%PYQT_SIPDIR%%/QtTest/qtestkeyboard.sip

View File

@ -9,7 +9,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt 5 toolkit (meta port)
USES= metaport python pyqt:5
USE_PYTHON= flavors
USE_PYTHON= concurrent flavors py3kplist
# Keep these synchronized with _USE_PYQT_ALL / _USE_PYQT5_ONLY in Mk/Use/pyqt.mk
OPTIONS_DEFINE= core dbus dbussupport demo designer \

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1487865147
SHA256 (PyQt5_gpl-5.10.1.tar.gz) = 9932e971e825ece4ea08f84ad95017837fa8f3f29c6b0496985fa1093661e9ef
SIZE (PyQt5_gpl-5.10.1.tar.gz) = 3110469
TIMESTAMP = 1539599822
SHA256 (PyQt5_gpl-5.11.3.tar.gz) = c9b57d15601d436faf35dacf8e0acefa220194829a653e771e80b189b3261073
SIZE (PyQt5_gpl-5.11.3.tar.gz) = 3121036

View File

@ -19,6 +19,7 @@ USE_PYQT= #
CONFIGURE_ARGS= -b ${PREFIX}/bin -d ${PYTHONPREFIX_SITELIBDIR} \
-e ${PYTHONPREFIX_INCLUDEDIR} -v ${DATADIR} \
--sipdir ${PYQT_SIPDIR} \
CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \
CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
INCDIR="${LOCALBASE}/include" LIBDIR="${LOCALBASE}/lib"
@ -28,10 +29,29 @@ PORTDOCS= *
OPTIONS_DEFINE= DOCS DEBUG
DEBUG_CONFIGURE_ON= --debug
# From upstreams site:
# When building PyQt5 v5.11 or later you must configure SIP to create a
# private copy of the sip module using a command line similar to the following:
# > python configure.py --sip-module PyQt5.sip --no-tools
# As this port is already flavored we cannot add further Qt4/Qt5 flavoring.
CONFIGURE_WRKSRC= ${WRKSRC}/default
BUILD_WRKSRC= ${CONFIGURE_WRKSRC}
INSTALL_WRKSRC= ${CONFIGURE_WRKSRC}
do-configure:
cd ${WRKSRC} && ${PYTHON_CMD} configure.py ${CONFIGURE_ARGS}
${REINPLACE_CMD} -e '/sip_bin.:/s|'\'',$$|-${PYTHON_VER}'\'',|' \
${WRKSRC}/sipconfig.py
# The default sip 'flavor'
${MKDIR} ${CONFIGURE_WRKSRC} && \
cd ${CONFIGURE_WRKSRC} && \
${PYTHON_CMD} ${WRKSRC}/configure.py ${CONFIGURE_ARGS} && \
${REINPLACE_CMD} -e '/sip_bin.:/s|'\'',$$|-${PYTHON_VER}'\'',|' ${CONFIGURE_WRKSRC}/sipconfig.py
# The now needed version for 5.11 (which will be the default from 2019-03-16).
${MKDIR} ${WRKSRC}/sip_qt5 && \
cd ${WRKSRC}/sip_qt5 && \
${PYTHON_CMD} ${WRKSRC}/configure.py ${CONFIGURE_ARGS} --sip-module PyQt5.sip --no-tools && \
${REINPLACE_CMD} -e '/sip_bin.:/s|'\'',$$|-${PYTHON_VER}'\'',|' ${WRKSRC}/sip_qt5/sipconfig.py
post-build:
cd ${WRKSRC}/sip_qt5 && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS}
post-install:
${MKDIR} ${STAGEDIR}${DOCSDIR} && cd ${WRKSRC}/doc/html && \
@ -42,7 +62,10 @@ post-install:
${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
-f -d ${PYTHONPREFIX_SITELIBDIR} \
${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/sip
${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/sip
${STRIP_CMD} ${STAGEDIR}/${PYTHON_SITELIBDIR}/sip.so
cd ${WRKSRC}/sip_qt5 && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install
${STRIP_CMD} ${STAGEDIR}/${PYTHON_SITELIBDIR}/PyQt5/sip.so
.include <bsd.port.mk>

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1520623489
SHA256 (sip-4.19.8.tar.gz) = 7eaf7a2ea7d4d38a56dd6d2506574464bddf7cf284c960801679942377c297bc
SIZE (sip-4.19.8.tar.gz) = 1024548
TIMESTAMP = 1539599371
SHA256 (sip-4.19.13.tar.gz) = e353a7056599bf5fbd5d3ff9842a6ab2ea3cf4e0304a0f925ec5862907c0d15e
SIZE (sip-4.19.13.tar.gz) = 1038815

View File

@ -1,7 +1,15 @@
bin/sip
%%PYTHON_INCLUDEDIR%%/sip.h
%%PYTHON_SITELIBDIR%%/sip.so
%%PYTHON_SITELIBDIR%%/PyQt5/sip.pyi
%%PYTHON_SITELIBDIR%%/PyQt5/sip.so
%%PYTHON_SITELIBDIR%%/PyQt5_sip-4.19.13.dist-info/INSTALLER
%%PYTHON_SITELIBDIR%%/PyQt5_sip-4.19.13.dist-info/METADATA
%%PYTHON_SITELIBDIR%%/PyQt5_sip-4.19.13.dist-info/RECORD
%%PYTHON_SITELIBDIR%%/sip-4.19.13.dist-info/INSTALLER
%%PYTHON_SITELIBDIR%%/sip-4.19.13.dist-info/METADATA
%%PYTHON_SITELIBDIR%%/sip-4.19.13.dist-info/RECORD
%%PYTHON_SITELIBDIR%%/sip.pyi
%%PYTHON_SITELIBDIR%%/sip.so
%%PYTHON_SITELIBDIR%%/sipconfig.py
%%PYTHON_SITELIBDIR%%/sipconfig.pyc
%%PYTHON_SITELIBDIR%%/sipconfig.pyo

View File

@ -2,7 +2,6 @@
PORTNAME= designerplugin-qt5
PORTVERSION= ${QSCI2_VERSION}
PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITES_QSCI2}
PKGNAMEPREFIX= qscintilla2-

View File

@ -3,7 +3,6 @@
PORTNAME= designerplugin
PORTVERSION= ${QSCI2_VERSION}
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITES_QSCI2}

View File

@ -2,7 +2,6 @@
PORTNAME= qscintilla2-qt5
PORTVERSION= ${QSCI2_VERSION}
PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITES_QSCI2}
DISTNAME= ${QSCI2_DISTNAME}

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1525014650
SHA256 (QScintilla_gpl-2.10.4.tar.gz) = 0353e694a67081e2ecdd7c80e1a848cf79a36dbba78b2afa36009482149b022d
SIZE (QScintilla_gpl-2.10.4.tar.gz) = 2721322
TIMESTAMP = 1543102039
SHA256 (QScintilla_gpl-2.10.8.tar.gz) = 46cd5b4e609ca5e13130ba8cc7028d44fd1dc5b037f97c492899006ed0c992eb
SIZE (QScintilla_gpl-2.10.8.tar.gz) = 2736054

View File

@ -16,6 +16,7 @@
%%QT_INCDIR%%/Qsci/qscilexercustom.h
%%QT_INCDIR%%/Qsci/qscilexerd.h
%%QT_INCDIR%%/Qsci/qscilexerdiff.h
%%QT_INCDIR%%/Qsci/qscilexeredifact.h
%%QT_INCDIR%%/Qsci/qscilexerfortran.h
%%QT_INCDIR%%/Qsci/qscilexerfortran77.h
%%QT_INCDIR%%/Qsci/qscilexerhtml.h
@ -52,8 +53,8 @@
%%QT_INCDIR%%/Qsci/qscistyledtext.h
%%QT_LIBDIR%%/libqscintilla2_qt5.so
%%QT_LIBDIR%%/libqscintilla2_qt5.so.13
%%QT_LIBDIR%%/libqscintilla2_qt5.so.13.1
%%QT_LIBDIR%%/libqscintilla2_qt5.so.13.1.1
%%QT_LIBDIR%%/libqscintilla2_qt5.so.13.2
%%QT_LIBDIR%%/libqscintilla2_qt5.so.13.2.1
%%QT_MKSPECDIR%%/features/qscintilla2.prf
%%QT_DATADIR%%/qsci/api/python/Python-2.4.api
%%QT_DATADIR%%/qsci/api/python/Python-2.5.api

View File

@ -3,7 +3,6 @@
PORTNAME= qscintilla2
PORTVERSION= ${QSCI2_VERSION}
PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITES_QSCI2}

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1525014650
SHA256 (QScintilla_gpl-2.10.4.tar.gz) = 0353e694a67081e2ecdd7c80e1a848cf79a36dbba78b2afa36009482149b022d
SIZE (QScintilla_gpl-2.10.4.tar.gz) = 2721322
TIMESTAMP = 1543101934
SHA256 (QScintilla_gpl-2.10.8.tar.gz) = 46cd5b4e609ca5e13130ba8cc7028d44fd1dc5b037f97c492899006ed0c992eb
SIZE (QScintilla_gpl-2.10.8.tar.gz) = 2736054

View File

@ -16,6 +16,7 @@
%%QT_INCDIR%%/Qsci/qscilexercustom.h
%%QT_INCDIR%%/Qsci/qscilexerd.h
%%QT_INCDIR%%/Qsci/qscilexerdiff.h
%%QT_INCDIR%%/Qsci/qscilexeredifact.h
%%QT_INCDIR%%/Qsci/qscilexerfortran.h
%%QT_INCDIR%%/Qsci/qscilexerfortran77.h
%%QT_INCDIR%%/Qsci/qscilexerhtml.h
@ -52,8 +53,8 @@
%%QT_INCDIR%%/Qsci/qscistyledtext.h
%%QT_LIBDIR%%/libqscintilla2_qt4.so
%%QT_LIBDIR%%/libqscintilla2_qt4.so.13
%%QT_LIBDIR%%/libqscintilla2_qt4.so.13.1
%%QT_LIBDIR%%/libqscintilla2_qt4.so.13.1.1
%%QT_LIBDIR%%/libqscintilla2_qt4.so.13.2
%%QT_LIBDIR%%/libqscintilla2_qt4.so.13.2.1
%%QT_MKSPECDIR%%/features/qscintilla2.prf
share/qt4/qsci/api/python/Python-2.4.api
share/qt4/qsci/api/python/Python-2.5.api

View File

@ -6,6 +6,9 @@ CATEGORIES= graphics devel python
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt5 toolkit, QtSvg module
BUILD_DEPENDS= ${PY_ENUM34}
RUN_DEPENDS= ${PY_ENUM34}
CONFIGURE_ARGS= --enable QtSvg
PYQT_DIST= yes

View File

@ -6,6 +6,9 @@ CATEGORIES= lang devel python
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt5 toolkit, QML module
BUILD_DEPENDS= ${PY_ENUM34}
RUN_DEPENDS= ${PY_ENUM34}
CONFIGURE_ARGS= --enable QtQml
PYQT_DIST= yes

View File

@ -3,6 +3,7 @@
PORTNAME= doc
PORTVERSION= ${PYQT4_VERSION}
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= misc devel python
MASTER_SITES= ${MASTER_SITES_PYQT4}
@ -20,18 +21,16 @@ NO_BUILD= yes
USES= python pyqt:4
USE_PYQT= #
USE_PYTHON= flavors
DOCSDIR= ${PREFIX}/share/doc/py-qt4
USE_PYTHON= concurrent flavors py3kplist
do-install:
cd ${WRKSRC} &&\
${MKDIR} ${STAGEDIR}${DOCSDIR} &&\
${MKDIR} ${STAGEDIR}${PYQT_DOCDIR} &&\
${INSTALL_DATA} LICENSE \
NEWS \
README \
THANKS\
${STAGEDIR}${DOCSDIR}
cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR}
${STAGEDIR}${PYQT_DOCDIR}
cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${PYQT_DOCDIR}
.include <bsd.port.mk>

File diff suppressed because it is too large Load Diff

View File

@ -6,6 +6,9 @@ CATEGORIES= multimedia devel python
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt5 toolkit, QtMultimedia module
BUILD_DEPENDS= ${PY_ENUM34}
RUN_DEPENDS= ${PY_ENUM34}
CONFIGURE_ARGS= --enable QtMultimedia
PYQT_DIST= yes

View File

@ -6,6 +6,9 @@ CATEGORIES= multimedia devel python
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt5 toolkit, QtMultimediaWidgets module
BUILD_DEPENDS= ${PY_ENUM34}
RUN_DEPENDS= ${PY_ENUM34}
CONFIGURE_ARGS= --enable QtMultimediaWidgets
PYQT_DIST= yes

View File

@ -6,6 +6,9 @@ CATEGORIES= net devel python
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt5 toolkit, QtNetwork module
BUILD_DEPENDS= ${PY_ENUM34}
RUN_DEPENDS= ${PY_ENUM34}
CONFIGURE_ARGS= --enable QtNetwork
PYQT_DIST= yes

View File

@ -6,6 +6,9 @@ CATEGORIES= print python
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt5 toolkit, QtPrintSupport module
BUILD_DEPENDS= ${PY_ENUM34}
RUN_DEPENDS= ${PY_ENUM34}
CONFIGURE_ARGS= --enable QtPrintSupport
PYQT_DIST= yes

View File

@ -6,6 +6,9 @@ CATEGORIES= textproc devel python
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt5 toolkit, QtXml module
BUILD_DEPENDS= ${PY_ENUM34}
RUN_DEPENDS= ${PY_ENUM34}
CONFIGURE_ARGS= --enable QtXml
PYQT_DIST= yes

View File

@ -6,6 +6,9 @@ CATEGORIES= textproc devel python
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt5 toolkit, QtXmlPatterns module
BUILD_DEPENDS= ${PY_ENUM34}
RUN_DEPENDS= ${PY_ENUM34}
CONFIGURE_ARGS= --enable QtXmlPatterns
PYQT_DIST= yes

View File

@ -8,6 +8,9 @@ COMMENT= Python bindings for the Qt5 toolkit, QtWebChannel module
# LICENSE set in Mk/Uses/pyqt.mk
BUILD_DEPENDS= ${PY_ENUM34}
RUN_DEPENDS= ${PY_ENUM34}
USES= python pyqt:5 qt:5
USE_PYQT= sip_build core_run gui_run network_run qml_run widgets_run
USE_PYTHON= concurrent flavors py3kplist

View File

@ -6,6 +6,9 @@ CATEGORIES= www devel python
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt5 toolkit, QtWebKit module
BUILD_DEPENDS= ${PY_ENUM34}
RUN_DEPENDS= ${PY_ENUM34}
CONFIGURE_ARGS= --enable QtWebKit
PYQT_DIST= yes

View File

@ -6,6 +6,9 @@ CATEGORIES= www devel python
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt5 toolkit, QtWebKitWidgets module
BUILD_DEPENDS= ${PY_ENUM34}
RUN_DEPENDS= ${PY_ENUM34}
CONFIGURE_ARGS= --enable QtWebKitWidgets
PYQT_DIST= yes

View File

@ -6,6 +6,9 @@ CATEGORIES= x11-toolkits devel python
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt5 toolkit, QtGui module
BUILD_DEPENDS= ${PY_ENUM34}
RUN_DEPENDS= ${PY_ENUM34}
CONFIGURE_ARGS= --enable QtGui
PYQT_DIST= yes

View File

@ -6,6 +6,9 @@ CATEGORIES= x11-toolkits devel python
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt5 toolkit, QtQuick module
BUILD_DEPENDS= ${PY_ENUM34}
RUN_DEPENDS= ${PY_ENUM34}
CONFIGURE_ARGS= --enable QtQuick
PYQT_DIST= yes

View File

@ -6,6 +6,9 @@ CATEGORIES= x11-toolkits devel python
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt5 toolkit, QtQuickWidgets module
BUILD_DEPENDS= ${PY_ENUM34}
RUN_DEPENDS= ${PY_ENUM34}
USES= python pyqt:5 qt:5
USE_GL= gl
USE_PYQT= sip_build core_run gui_run

View File

@ -6,6 +6,9 @@ CATEGORIES= x11-toolkits devel python
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt5 toolkit, QtWidgets module
BUILD_DEPENDS= ${PY_ENUM34}
RUN_DEPENDS= ${PY_ENUM34}
CONFIGURE_ARGS= --enable QtWidgets
PYQT_DIST= yes

View File

@ -6,6 +6,9 @@ CATEGORIES= x11 devel python
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt5 toolkit, QtOpenGL module
BUILD_DEPENDS= ${PY_ENUM34}
RUN_DEPENDS= ${PY_ENUM34}
CONFIGURE_ARGS= --enable QtOpenGL
PYQT_DIST= yes