cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Qt/PySide2 to 5.15.2 / PyQt to 5.15.1 / SIP to 5.4.0

Browse Source 
This commit combines several updates.

- Update Qt to 5.12.2
- Update PyQt to 5.15.1
- Since PySide 5.15.1 is broken with Qt 5.15.2, so PySide and Shiboken are also updated to 5.15.2.
- Update sip to 5.4.0

SIP is a collection of tools  to create Python bindings for C and C++ libraries and used by PyQt and wxPython. There are some changes with sip5 [1]:
- python 3.5+ is required
- sip drops support of old deprecated methods as sipdistutils & cie.
- this version breaks also PyQt5 extension ABI. SIP files will be installed in ${PYTHON_SITELIBDIR}/PyQt${_PYQT_VERSION}/bindings
- some ports will use the new pyqtbuilder package with the pyproject.toml setup. Instead if the project have a setup.py, you should use sip-build to build it.
- if a port needs sip, it should also needs pysip. BTW, py-qt5-core requires pysip, so that should be enough for PyQt packages.

List of ports impacted by this change. Most of the patches have been integrated or are in the process of being integrated upstream:

- devel/libsavitar
- graphics/py-python-poppler-qt5
- net-im/scudcloud
- net/libarcus
- print/py-frescobaldi
- science/py-veusz
- graphics/qgis and graphics/qgis-ltr
- deskutils/calibre

A special note regarding calibre. New versions require sip>=5, we update it to the latest version (thanks to madpilot@)

science/scidavis will remove the PyQt binding soon and there is no patch planned, so we remove the python option (ok makc@)

While here, convert some ports to USE_PYQT (cad/cura, cad/uranium, devel/eric6, ...)

Thanks to tcberner and adridg!

[1] https://www.riverbankcomputing.com/static/Docs/sip/

PR:                250853
Exp-run by:        antoine
This commit is contained in:
Loïc Bartoletti 2020-12-08 20:03:07 +00:00
parent 96fd51619a
commit 47b26d9293
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=557300
130 changed files with 1610 additions and 614 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Mk/Uses/pyqt.mk
View File

@ -53,28 +53,27 @@ PYQT_MAINTAINER= kde@FreeBSD.org
MASTER_SITE_RIVERBANK= https://www.riverbankcomputing.com/static/Downloads/%SUBDIR%/
#MASTER_SITES_SIP= https://pypi.python.org/packages/source/s/sip/
# https://www.riverbankcomputing.com/static/Downloads/sip/4.19.15/sip-4.19.15.tar.gz
MASTER_SITES_SIP= RIVERBANK/sip/${PORTVERSION} \
SF/pyqt/sip/sip-${PORTVERSION} \
GENTOO
MASTER_SITES_SIP= https://pypi.python.org/packages/source/s/sip/
MASTER_SITES_PYQT5= https://pypi.python.org/packages/source/P/PyQt5/
MASTER_SITES_PYQTSIP= https://pypi.python.org/packages/source/P/PyQt5-sip/
MASTER_SITES_PYQTCHART= https://pypi.python.org/packages/source/P/PyQtChart/
MASTER_SITES_PYQTBUILDER= https://pypi.io/packages/source/P/PyQt-builder/
#https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.11.4/QScintilla-2.11.4.tar.gz
MASTER_SITES_QSCI2= RIVERBANK/QScintilla/${PORTVERSION} \
SF/pyqt/QScintilla2/QScintilla-${PORTVERSION} \
GENTOO
SIP_VERSION= 4.19.24
SIP_VERSION= 5.4.0
QSCI2_VERSION= 2.11.5
PYQT5_VERSION= 5.15.0
PYQT5_VERSION= 5.15.1
PYQTSIP_VERSION= 12.8.0
PYQTBUILDER_VERSION= 1.4.0
SIP_DISTNAME= sip-${SIP_VERSION}
PYQT5_DISTNAME= PyQt5-${PYQT5_VERSION}
PYQTSIP_DISTNAME= PyQt5_sip-${PYQTSIP_VERSION}
PYQTCHART_DISTNAME= PyQtChart-${PYQT_VERSION}
PYQTBUILDER_DISTNAME= PyQt-builder-${PYQTBUILDER_VERSION}
PYQT5_DISTINFO_FILE= ${.CURDIR:H:H}/devel/${PYQT_RELNAME}/distinfo
QSCI2_DISTNAME= QScintilla-${QSCI2_VERSION}
PYQT5_LICENSE= GPLv3
@ -109,8 +108,9 @@ _USE_PYQT_ALL= ${_USE_PYQT_COMMS} \
${_USE_PYQT_WWW} \
${_USE_PYQT_X11} \
${_USE_PYQT_X11-TOOLKITS}
_USE_SIP_ALL= sip # pysip
_USE_SIP_ALL= sip pysip
_USE_QSCINTILLA= qscintilla2
_USE_PYQTBUILDER= qtbuilder
# Unversioned variables for the rest of the file
PYQT_VERSION= ${PYQT${_PYQT_VERSION}_VERSION}
@ -123,8 +123,9 @@ PYQT_LICENSE= ${PYQT${_PYQT_VERSION}_LICENSE}
# PATH
py-sip_PATH= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}
# py-pysip_PATH= ${PYQT_PY_RELNAME}-sip>=${PYQTSIP_VERSION}
py-pysip_PATH= ${PYQT_PY_RELNAME}-sip>=${PYQTSIP_VERSION}
py-qscintilla2_PATH= ${PYQT_PY_RELNAME}-qscintilla2>=${QSCI2_VERSION}
py-qtbuilder_PATH= ${PYTHON_PKGNAMEPREFIX}qtbuilder>=${PYQTBUILDER_VERSION}
. for _component in ${_USE_PYQT_ALL}
py-${_component}_PATH?=${PYQT_PY_RELNAME}-${_component}>=${PYQT_VERSION}
@ -132,7 +133,8 @@ py-${_component}_PATH?=${PYQT_PY_RELNAME}-${_component}>=${PYQT_VERSION}
# PORT
py-sip_PORT= devel/py-sip
# py-pysip_PORT= devel/${PYQT_RELNAME}-sip
py-qtbuilder_PORT= devel/py-qtbuilder
py-pysip_PORT= devel/${PYQT_RELNAME}-sip
py-qscintilla2_PORT= devel/${PYQT_RELNAME}-qscintilla2
. for _categorie in comms databases devel graphics lang misc multimedia net print textproc www x11 x11-toolkits
@ -179,29 +181,29 @@ py-xml_DESC= Python bindings for QtXml module
py-xmlpatterns_DESC= Python bindings for QtXmlPatterns module
# The versionned executable of sip
SIP= ${LOCALBASE}/bin/sip-${PYTHON_VER}
SIP= ${LOCALBASE}/bin/sip5-${PYTHON_VER}
# Relative directories
_VERSION_SUBDIR_REL= PyQt${_PYQT_VERSION}/${PYTHON_VER}
_APIDIR_REL= share/${_VERSION_SUBDIR_REL}/qsci
_DOCDIR_REL= share/doc/${_VERSION_SUBDIR_REL}
_EXAMPLEDIR_REL= share/examples/${_VERSION_SUBDIR_REL}
_SIPDIR_REL= share/${_VERSION_SUBDIR_REL}/sip
_SIPDIR_REL= PyQt${_PYQT_VERSION}/bindings
_DESIGNERDIR_REL= ${QT_PLUGINDIR_REL}/designer/${_VERSION_SUBDIR_REL}
_QMLDIR_REL= ${QT_QMLDIR_REL}/${_VERSION_SUBDIR_REL}
# Absolute direcotries
# Absolute directories
PYQT_APIDIR= ${PREFIX}/${_APIDIR_REL}
PYQT_DOCDIR= ${PREFIX}/${_DOCDIR_REL}
PYQT_EXAMPLEDIR= ${PREFIX}/${_EXAMPLEDIR_REL}
PYQT_SIPDIR?= ${PREFIX}/${_SIPDIR_REL}
PYQT_SIPDIR?= ${PYTHON_SITELIBDIR}/${_SIPDIR_REL}
PYQT_DESIGNERDIR= ${PREFIX}/${_DESIGNERDIR_REL}
PYQT_QMLDIR= ${PREFIX}/${_QMLDIR_REL}
PLIST_SUB+= PYQT_APIDIR=${_APIDIR_REL} \
PYQT_DOCDIR=${_DOCDIR_REL} \
PYQT_EXAMPLEDIR=${_EXAMPLEDIR_REL} \
PYQT_SIPDIR=${_SIPDIR_REL} \
PYQT_SIPDIR=${PYQT_SIPDIR} \
PYQT_DESIGNERDIR=${_DESIGNERDIR_REL} \
PYQT_QMLDIR=${_QMLDIR_REL} \
PYQT_SIPVERSION=${SIP_VERSION} \
@ -256,7 +258,8 @@ do-configure:
# Set build, run and test depends -- we need to prefix them internally with "py-"
# else we conflict with the ones defined in bsd.qt.mk with the same name
_USE_PYQT_ALL+= ${_USE_SIP_ALL} \
${_USE_QSCINTILLA}
${_USE_QSCINTILLA} \
${_USE_PYQTBUILDER}
. for comp in ${_USE_PYQT_ALL:O:u}
_USE_PYQT_ALL_SUFFIXED+= py-${comp} py-${comp}_build py-${comp}_run py-${comp}_test
py-${comp}_BUILD_DEPENDS?= ${py-${comp}_PATH}:${py-${comp}_PORT}@${PY_FLAVOR}

2
Mk/Uses/qt.mk
View File

@ -24,7 +24,7 @@ _QT_MK_INCLUDED= qt.mk
# Qt versions currently supported by the framework.
_QT_SUPPORTED?= 5
QT5_VERSION?= 5.15.0
QT5_VERSION?= 5.15.2
# We accept the Qt version to be passed by either or all of the three mk files.
. if empty(qt_ARGS) && empty(qmake_ARGS) && empty(qt-dist_ARGS)

2
biology/py-ete3/Makefile
View File

@ -19,7 +19,7 @@ PY_DEPENDS= ${PYNUMPY} \
BUILD_DEPENDS= ${PY_DEPENDS}
RUN_DEPENDS= ${PY_DEPENDS}
USES= python pyqt:5 shebangfix
USES= python:3.5+ pyqt:5 shebangfix
SHEBANG_GLOB= *.py
USE_PYTHON= distutils concurrent autoplist
USE_PYQT= core gui opengl printsupport svg widgets

9
cad/cura/Makefile
View File

@ -13,10 +13,7 @@ LICENSE= AGPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= Uranium>0,1:cad/uranium
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}qt5-gui>0:x11-toolkits/py-qt5-gui@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}qt5-widgets>0:x11-toolkits/py-qt5-widgets@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}qt5-qml>0:lang/py-qt5-qml@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}zeroconf>0:net/py-zeroconf@${PY_FLAVOR} \
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zeroconf>0:net/py-zeroconf@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pyserial>0:comms/py-pyserial@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}Shapely>0:devel/py-shapely@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}numpy-stl>0:math/py-numpy-stl@${PY_FLAVOR} \
@ -31,7 +28,9 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}qt5-gui>0:x11-toolkits/py-qt5-gui@${PY_FLAVO
LIB_DEPENDS= libArcus.so:net/libarcus \
libSavitar.so:devel/libsavitar
USES= cmake gettext shebangfix python:3.4+ desktop-file-utils shared-mime-info
USES= cmake gettext shebangfix python:3.5+ pyqt:5 \
desktop-file-utils shared-mime-info
USE_PYQT= gui widgets qml
CMAKE_ARGS+= -DURANIUM_SCRIPTS_DIR:STRING="${LOCALBASE}/share/uranium/scripts"
USE_GITHUB= yes
GH_ACCOUNT= Ultimaker

4
cad/uranium/Makefile
View File

@ -14,11 +14,11 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}qt5-quick>0:x11-toolkits/py-qt5-quick@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}PyOpenGL>0:graphics/py-PyOpenGL@${PY_FLAVOR}
USES= cmake python:3.4+ gettext
USES= cmake gettext python:3.5+ pyqt:5
USE_PYQT= quick
USE_GITHUB= yes
GH_ACCOUNT= Ultimaker
GH_TAGNAME= 3ed9c4de

2
comms/py-qt5-sensors/Makefile
View File

@ -12,7 +12,7 @@ RUN_DEPENDS= ${PY_ENUM34}
CONFIGURE_ARGS= --enable QtSensors
PYQT_DIST= yes
USES= gl python pyqt:5 qt:5
USES= gl python:3.5+ pyqt:5 qt:5
USE_GL= gl
USE_PYQT= sip_build core_run
USE_PYTHON= concurrent flavors py3kplist

2
comms/py-qt5-serialport/Makefile
View File

@ -12,7 +12,7 @@ RUN_DEPENDS= ${PY_ENUM34}
CONFIGURE_ARGS= --enable QtSerialPort
PYQT_DIST= yes
USES= gl python pyqt:5 qt:5
USES= gl python:3.5+ pyqt:5 qt:5
USE_GL= gl
USE_PYQT= sip_build core_run
USE_PYTHON= concurrent flavors py3kplist

2
databases/py-qt5-sql/Makefile
View File

@ -12,7 +12,7 @@ RUN_DEPENDS= ${PY_ENUM34}
CONFIGURE_ARGS= --enable QtSql
PYQT_DIST= yes
USES= gl python pyqt:5 qt:5
USES= gl python:3.5+ pyqt:5 qt:5
USE_GL= gl
USE_PYQT= sip_build core_run widgets_run
USE_PYTHON= concurrent flavors py3kplist

13
deskutils/calibre/Makefile
View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= calibre
PORTVERSION= 4.23.0
PORTREVISION= 5
PORTVERSION= 5.6.0
CATEGORIES= deskutils python
MASTER_SITES= http://download.calibre-ebook.com/${PORTVERSION}/
@ -30,7 +29,8 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVO
${PYTHON_PKGNAMEPREFIX}msgpack>=0.3:devel/py-msgpack@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}regex>=0:textproc/py-regex@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}html5-parser>=0.4.3:www/py-html5-parser@${PY_FLAVOR} \
${PY_PILLOW}
${PY_PILLOW} \
${PYTHON_PKGNAMEPREFIX}zeroconf>0:net/py-zeroconf
RUN_DEPENDS= xdg-open:devel/xdg-utils \
${PYTHON_PKGNAMEPREFIX}css-parser>=1.0.4:www/py-css-parser@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython@${PY_FLAVOR} \
@ -49,14 +49,15 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils \
${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}html5-parser>=0.4.3:www/py-html5-parser@${PY_FLAVOR} \
${PY_PILLOW} \
pdftohtml:graphics/poppler-utils
pdftohtml:graphics/poppler-utils \
${PYTHON_PKGNAMEPREFIX}zeroconf>0:net/py-zeroconf
USES= desktop-file-utils gettext-runtime gl gnome localbase:ldflags \
pkgconfig pyqt:5 python:3.5+ qt:5 shared-mime-info shebangfix \
ssl tar:xz xorg
USE_RC_SUBR= calibre
SUB_LIST+= PYTHON_VERSION=${PYTHON_VERSION}
USE_PYQT= core gui network sip svg webengine widgets xmlpatterns
USE_PYQT= core gui network pysip qtbuilder sip svg webengine widgets xmlpatterns
USE_QT= buildtools_build core dbus gui qmake_build widgets
USE_GL= egl gl
USE_GNOME= glib20
@ -110,6 +111,6 @@ do-install:
@${RM} ${STAGEDIR}${PREFIX}/bin/calibre-uninstall \
${STAGEDIR}${PREFIX}/share/applications/defaults.list
@${RMDIR} ${STAGEDIR}${PREFIX}/share/desktop-directories
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/calibre/calibre/plugins/3/*
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/calibre/calibre/plugins/*
.include <bsd.port.mk>

6
deskutils/calibre/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1597997606
SHA256 (calibre-4.23.0.tar.xz) = 16de51473cf0e336f946a57251a1e4f4fbba1f857f17d8fc14aa132e7eb59518
SIZE (calibre-4.23.0.tar.xz) = 36908740
TIMESTAMP = 1606469769
SHA256 (calibre-5.6.0.tar.xz) = 484a2e120fdbcff6c544d4c216afef0ff784c7665d3fd44d98acb0420d8f5e55
SIZE (calibre-5.6.0.tar.xz) = 36653328

10
deskutils/calibre/files/patch-setup_build.py Normal file
View File

@ -0,0 +1,10 @@
--- setup/build.py.orig 2020-10-10 16:20:32 UTC
+++ setup/build.py
@@ -496,6 +496,7 @@ exceptions = {needs_exceptions}
include-dirs = {ext.inc_dirs}
qmake-QT = ["widgets"]
sip-file = "{os.path.basename(sipf)}"
+tags = ["WS_X11"]
''')
shutil.copy2(sipf, src_dir)

11
deskutils/calibre/files/patch-setup_translations.py Normal file
View File

@ -0,0 +1,11 @@
--- setup/translations.py.orig 2020-11-13 01:58:49 UTC
+++ setup/translations.py
@@ -159,7 +159,7 @@ class POT(Command): # {{{
f.seek(0), f.truncate(), f.write('\n'.join(lines).encode('utf-8'))
break
else:
- raise SystemExit(f'Failed to add file_filter for {slug=} to config file')
+ raise SystemExit(f'Failed to add file_filter for {slug} to config file')
self.git('add .tx/config')
self.upload_pot(resource=slug)
self.git(['add', dest])

23
deskutils/calibre/files/patch-src_calibre_linux.py
View File

@ -1,15 +1,6 @@
--- src/calibre/linux.py.orig 2018-01-05 05:41:54 UTC
--- src/calibre/linux.py.orig 2020-11-13 01:58:49 UTC
+++ src/calibre/linux.py
@@ -841,7 +841,7 @@ class PostInstall:
f.close()
des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop',
'calibre-ebook-viewer.desktop', 'calibre-ebook-edit.desktop')
- appdata = os.path.join(os.path.dirname(self.opts.staging_sharedir), 'metainfo')
+ appdata = os.path.join(os.path.dirname(self.opts.staging_sharedir), 'appdata')
if not os.path.exists(appdata):
try:
os.mkdir(appdata)
@@ -1008,7 +1008,7 @@ Name=E-book Viewer
@@ -1103,7 +1103,7 @@ Name=E-book viewer
GenericName=Viewer for E-books
Comment=Viewer for E-books in all the major formats
TryExec=ebook-viewer
@ -18,7 +9,7 @@
Icon=calibre-viewer
Categories=Graphics;Viewer;
'''
@@ -1021,7 +1021,7 @@ Name=E-book Editor
@@ -1116,7 +1116,7 @@ Name=E-book editor
GenericName=Editor for E-books
Comment=Edit E-books in various formats
TryExec=ebook-edit
@ -27,12 +18,12 @@
Icon=calibre-ebook-edit
Categories=Office;
'''
@@ -1034,7 +1034,7 @@ Name=calibre
@@ -1129,7 +1129,7 @@ Name=calibre
GenericName=E-book library management
Comment=E-book library management: Convert, view, share, catalogue all your e-books
TryExec=calibre
-Exec=calibre --detach %F
+Exec=calibre %F
-Exec=calibre --detach %U
+Exec=calibre %U
Icon=calibre-gui
Categories=Office;
'''
X-GNOME-UsesNotifications=true

11
deskutils/calibre/files/patch-src_calibre_utils_formatter.py Normal file
View File

@ -0,0 +1,11 @@
--- src/calibre/utils/formatter.py.orig 2020-11-13 01:58:49 UTC
+++ src/calibre/utils/formatter.py
@@ -536,7 +536,7 @@ class _Interpreter(object):
def do_node_first_non_empty(self, prog):
for expr in prog.expression_list:
- if v := self.expr(expr):
+ if v == self.expr(expr):
return v
NODE_OPS = {

92
deskutils/calibre/pkg-plist
View File

@ -18,10 +18,6 @@ bin/lrfviewer
bin/lrs2lrf
bin/markdown-calibre
bin/web2disk
lib/calibre/backports/__init__.py
lib/calibre/backports/functools_lru_cache.py
lib/calibre/backports/ipaddress.py
lib/calibre/biplist/__init__.py
lib/calibre/calibre/__init__.py
lib/calibre/calibre/constants.py
lib/calibre/calibre/customize/__init__.py
@ -32,6 +28,7 @@ lib/calibre/calibre/customize/ui.py
lib/calibre/calibre/customize/zipplugin.py
lib/calibre/calibre/db/__init__.py
lib/calibre/calibre/db/adding.py
lib/calibre/calibre/db/annotations.py
lib/calibre/calibre/db/backend.py
lib/calibre/calibre/db/backup.py
lib/calibre/calibre/db/cache.py
@ -363,14 +360,12 @@ lib/calibre/calibre/ebooks/metadata/sources/base.py
lib/calibre/calibre/ebooks/metadata/sources/big_book_search.py
lib/calibre/calibre/ebooks/metadata/sources/cli.py
lib/calibre/calibre/ebooks/metadata/sources/covers.py
lib/calibre/calibre/ebooks/metadata/sources/douban.py
lib/calibre/calibre/ebooks/metadata/sources/edelweiss.py
lib/calibre/calibre/ebooks/metadata/sources/google.py
lib/calibre/calibre/ebooks/metadata/sources/google_images.py
lib/calibre/calibre/ebooks/metadata/sources/identify.py
lib/calibre/calibre/ebooks/metadata/sources/openlibrary.py
lib/calibre/calibre/ebooks/metadata/sources/overdrive.py
lib/calibre/calibre/ebooks/metadata/sources/ozon.py
lib/calibre/calibre/ebooks/metadata/sources/prefs.py
lib/calibre/calibre/ebooks/metadata/sources/search_engines.py
lib/calibre/calibre/ebooks/metadata/sources/test.py
@ -638,6 +633,7 @@ lib/calibre/calibre/gui2/actions/add.py
lib/calibre/calibre/gui2/actions/add_to_library.py
lib/calibre/calibre/gui2/actions/annotate.py
lib/calibre/calibre/gui2/actions/author_mapper.py
lib/calibre/calibre/gui2/actions/browse_annots.py
lib/calibre/calibre/gui2/actions/catalog.py
lib/calibre/calibre/gui2/actions/choose_library.py
lib/calibre/calibre/gui2/actions/convert.py
@ -661,6 +657,7 @@ lib/calibre/calibre/gui2/actions/restart.py
lib/calibre/calibre/gui2/actions/save_to_disk.py
lib/calibre/calibre/gui2/actions/show_book_details.py
lib/calibre/calibre/gui2/actions/show_quickview.py
lib/calibre/calibre/gui2/actions/show_stored_templates.py
lib/calibre/calibre/gui2/actions/show_template_tester.py
lib/calibre/calibre/gui2/actions/similar_books.py
lib/calibre/calibre/gui2/actions/sort.py
@ -805,6 +802,7 @@ lib/calibre/calibre/gui2/dialogs/drm_error_ui.py
lib/calibre/calibre/gui2/dialogs/duplicates.py
lib/calibre/calibre/gui2/dialogs/edit_authors_dialog.py
lib/calibre/calibre/gui2/dialogs/edit_authors_dialog_ui.py
lib/calibre/calibre/gui2/dialogs/enum_values_edit.py
lib/calibre/calibre/gui2/dialogs/exim.py
lib/calibre/calibre/gui2/dialogs/jobs_ui.py
lib/calibre/calibre/gui2/dialogs/match_books.py
@ -855,11 +853,13 @@ lib/calibre/calibre/gui2/layout.py
lib/calibre/calibre/gui2/layout_menu.py
lib/calibre/calibre/gui2/library/__init__.py
lib/calibre/calibre/gui2/library/alternate_views.py
lib/calibre/calibre/gui2/library/annotations.py
lib/calibre/calibre/gui2/library/caches.py
lib/calibre/calibre/gui2/library/delegates.py
lib/calibre/calibre/gui2/library/models.py
lib/calibre/calibre/gui2/library/views.py
lib/calibre/calibre/gui2/linux_file_dialogs.py
lib/calibre/calibre/gui2/listener.py
lib/calibre/calibre/gui2/lrf_renderer/__init__.py
lib/calibre/calibre/gui2/lrf_renderer/bookview.py
lib/calibre/calibre/gui2/lrf_renderer/config_ui.py
@ -1029,6 +1029,14 @@ lib/calibre/calibre/gui2/toc/__init__.py
lib/calibre/calibre/gui2/toc/location.py
lib/calibre/calibre/gui2/toc/main.py
lib/calibre/calibre/gui2/tools.py
lib/calibre/calibre/gui2/tts/__init__.py
lib/calibre/calibre/gui2/tts/common.py
lib/calibre/calibre/gui2/tts/develop.py
lib/calibre/calibre/gui2/tts/errors.py
lib/calibre/calibre/gui2/tts/implementation.py
lib/calibre/calibre/gui2/tts/linux.py
lib/calibre/calibre/gui2/tts/macos.py
lib/calibre/calibre/gui2/tts/windows.py
lib/calibre/calibre/gui2/tweak_book/__init__.py
lib/calibre/calibre/gui2/tweak_book/boss.py
lib/calibre/calibre/gui2/tweak_book/char_select.py
@ -1093,6 +1101,7 @@ lib/calibre/calibre/gui2/update.py
lib/calibre/calibre/gui2/viewer/__init__.py
lib/calibre/calibre/gui2/viewer/annotations.py
lib/calibre/calibre/gui2/viewer/bookmarks.py
lib/calibre/calibre/gui2/viewer/config.py
lib/calibre/calibre/gui2/viewer/convert_book.py
lib/calibre/calibre/gui2/viewer/highlights.py
lib/calibre/calibre/gui2/viewer/integration.py
@ -1106,6 +1115,7 @@ lib/calibre/calibre/gui2/viewer/toc.py
lib/calibre/calibre/gui2/viewer/toolbars.py
lib/calibre/calibre/gui2/viewer/ui.py
lib/calibre/calibre/gui2/viewer/web_view.py
lib/calibre/calibre/gui2/viewer/widgets.py
lib/calibre/calibre/gui2/webengine.py
lib/calibre/calibre/gui2/widgets.py
lib/calibre/calibre/gui2/widgets2.py
@ -1142,32 +1152,31 @@ lib/calibre/calibre/library/schema_upgrades.py
lib/calibre/calibre/library/sqlite.py
lib/calibre/calibre/libunzip.py
lib/calibre/calibre/linux.py
lib/calibre/calibre/plugins/3/_patiencediff_c.so
lib/calibre/calibre/plugins/3/bzzdec.so
lib/calibre/calibre/plugins/3/cPalmdoc.so
lib/calibre/calibre/plugins/3/certgen.so
lib/calibre/calibre/plugins/3/chmlib.so
lib/calibre/calibre/plugins/3/freetype.so
lib/calibre/calibre/plugins/3/html_as_json.so
lib/calibre/calibre/plugins/3/html_syntax_highlighter.so
lib/calibre/calibre/plugins/3/hunspell.so
lib/calibre/calibre/plugins/3/hyphen.so
lib/calibre/calibre/plugins/3/icu.so
lib/calibre/calibre/plugins/3/imageops.so
lib/calibre/calibre/plugins/3/libheadless.so
lib/calibre/calibre/plugins/3/libmtp.so
lib/calibre/calibre/plugins/3/libusb.so
lib/calibre/calibre/plugins/3/lzma_binding.so
lib/calibre/calibre/plugins/3/lzx.so
lib/calibre/calibre/plugins/3/matcher.so
lib/calibre/calibre/plugins/3/msdes.so
lib/calibre/calibre/plugins/3/pictureflow.so
lib/calibre/calibre/plugins/3/podofo.so
lib/calibre/calibre/plugins/3/progress_indicator.so
lib/calibre/calibre/plugins/3/speedup.so
lib/calibre/calibre/plugins/3/sqlite_custom.so
lib/calibre/calibre/plugins/3/tokenizer.so
lib/calibre/calibre/plugins/3/unicode_names.so
lib/calibre/calibre/plugins/_patiencediff_c.so
lib/calibre/calibre/plugins/bzzdec.so
lib/calibre/calibre/plugins/cPalmdoc.so
lib/calibre/calibre/plugins/certgen.so
lib/calibre/calibre/plugins/freetype.so
lib/calibre/calibre/plugins/html_as_json.so
lib/calibre/calibre/plugins/html_syntax_highlighter.so
lib/calibre/calibre/plugins/hunspell.so
lib/calibre/calibre/plugins/hyphen.so
lib/calibre/calibre/plugins/icu.so
lib/calibre/calibre/plugins/imageops.so
lib/calibre/calibre/plugins/libheadless.so
lib/calibre/calibre/plugins/libmtp.so
lib/calibre/calibre/plugins/libusb.so
lib/calibre/calibre/plugins/lzx.so
lib/calibre/calibre/plugins/matcher.so
lib/calibre/calibre/plugins/msdes.so
lib/calibre/calibre/plugins/pictureflow.so
lib/calibre/calibre/plugins/podofo.so
lib/calibre/calibre/plugins/progress_indicator.so
lib/calibre/calibre/plugins/speedup.so
lib/calibre/calibre/plugins/sqlite_custom.so
lib/calibre/calibre/plugins/tokenizer.so
lib/calibre/calibre/plugins/unicode_names.so
lib/calibre/calibre/prints.py
lib/calibre/calibre/ptempfile.py
lib/calibre/calibre/rpdb.py
lib/calibre/calibre/spell/__init__.py
@ -1223,13 +1232,10 @@ lib/calibre/calibre/test_build.py
lib/calibre/calibre/translations/__init__.py
lib/calibre/calibre/translations/dynamic.py
lib/calibre/calibre/translations/msgfmt.py
lib/calibre/calibre/utils/Zeroconf.py
lib/calibre/calibre/utils/__init__.py
lib/calibre/calibre/utils/bibtex.py
lib/calibre/calibre/utils/browser.py
lib/calibre/calibre/utils/certgen.py
lib/calibre/calibre/utils/chm/__init__.py
lib/calibre/calibre/utils/chm/chm.py
lib/calibre/calibre/utils/cleantext.py
lib/calibre/calibre/utils/complete.py
lib/calibre/calibre/utils/config.py
@ -1334,11 +1340,11 @@ lib/calibre/calibre/utils/test_lock.py
lib/calibre/calibre/utils/text2int.py
lib/calibre/calibre/utils/threadpool.py
lib/calibre/calibre/utils/titlecase.py
lib/calibre/calibre/utils/unicode_getpass.py
lib/calibre/calibre/utils/unicode_names.py
lib/calibre/calibre/utils/unrar.py
lib/calibre/calibre/utils/unsmarten.py
lib/calibre/calibre/utils/windows/__init__.py
lib/calibre/calibre/utils/windows/winsapi.py
lib/calibre/calibre/utils/windows/wintest.py
lib/calibre/calibre/utils/winreg/__init__.py
lib/calibre/calibre/utils/winreg/dde.py
@ -1360,10 +1366,6 @@ lib/calibre/calibre/web/feeds/templates.py
lib/calibre/calibre/web/fetch/__init__.py
lib/calibre/calibre/web/fetch/simple.py
lib/calibre/calibre/web/fetch/utils.py
lib/calibre/calibre_lzma/__init__.py
lib/calibre/calibre_lzma/errors.py
lib/calibre/calibre_lzma/lzma1.py
lib/calibre/calibre_lzma/xz.py
lib/calibre/css_selectors/__init__.py
lib/calibre/css_selectors/errors.py
lib/calibre/css_selectors/ordered_set.py
@ -1419,6 +1421,7 @@ lib/calibre/polyglot/reprlib.py
lib/calibre/polyglot/smtplib.py
lib/calibre/polyglot/socketserver.py
lib/calibre/polyglot/urllib.py
lib/calibre/sgmllib.py
lib/calibre/templite/__init__.py
lib/calibre/tinycss/__init__.py
lib/calibre/tinycss/color3.py
@ -1451,6 +1454,7 @@ lib/calibre/tinycss/version.py
%%DATADIR%%/catalog/section_list_templates.conf
%%DATADIR%%/catalog/stylesheet.css
%%DATADIR%%/catalog/template.xhtml
%%DATADIR%%/changelog.json
%%DATADIR%%/content-server/calibre.png
%%DATADIR%%/content-server/empty.html
%%DATADIR%%/content-server/index-generated.html
@ -1596,6 +1600,7 @@ lib/calibre/tinycss/version.py
%%DATADIR%%/images/h-ellipsis.png
%%DATADIR%%/images/help.png
%%DATADIR%%/images/heuristics.png
%%DATADIR%%/images/highlight.png
%%DATADIR%%/images/highlight_only_off.png
%%DATADIR%%/images/highlight_only_on.png
%%DATADIR%%/images/hotmail.png
@ -1783,6 +1788,7 @@ lib/calibre/tinycss/version.py
%%DATADIR%%/quick_start/fra.epub
%%DATADIR%%/quick_start/ita.epub
%%DATADIR%%/quick_start/swe.epub
%%DATADIR%%/quick_start/tur.epub
%%DATADIR%%/rapydscript/compiler.js.xz
%%DATADIR%%/scripts.calibre_msgpack
%%DATADIR%%/template-functions.json
@ -1803,9 +1809,9 @@ lib/calibre/tinycss/version.py
%%DATADIR%%/viewer.html
%%DATADIR%%/viewer.js
%%PYTHON_SITELIBDIR%%/init_calibre.py
share/appdata/calibre-ebook-edit.appdata.xml
share/appdata/calibre-ebook-viewer.appdata.xml
share/appdata/calibre-gui.appdata.xml
share/metainfo/calibre-ebook-edit.metainfo.xml
share/metainfo/calibre-ebook-viewer.metainfo.xml
share/metainfo/calibre-gui.metainfo.xml
share/applications/calibre-ebook-edit.desktop
share/applications/calibre-ebook-viewer.desktop
share/applications/calibre-gui.desktop

60
deskutils/kaddressbook/files/patch-git-8aee8d40ae2a1c920d3520163d550d3b49720226.diff Normal file
View File

@ -0,0 +1,60 @@
Author: Volker Krause <vkrause@kde.org>
Date: Sun Oct 25 18:22:58 2020 +0100
Compile with recent Qt 5.15
More QPrinter methods got deprecated there. DevicePixel no longer exists
as a unit, visually Point looks pretty much the same though.
diff --git src/printing/compact/compactstyle.cpp src/printing/compact/compactstyle.cpp
index d950a963..71e74c0f 100644
--- src/printing/compact/compactstyle.cpp
+++ src/printing/compact/compactstyle.cpp
@@ -168,7 +168,7 @@ void CompactStyle::print(const KContacts::Addressee::List &contacts, PrintProgre
// print
QPrinter *printer = wizard()->printer();
- printer->setPageMargins(20, 20, 20, 20, QPrinter::DevicePixel);
+ printer->setPageMargins(QMarginsF(20, 20, 20, 20), QPageLayout::Point);
progress->addMessage(i18n("Setting up document"));
diff --git src/printing/grantlee/grantleeprintstyle.cpp src/printing/grantlee/grantleeprintstyle.cpp
index d7afe8ef..49b5e494 100644
--- src/printing/grantlee/grantleeprintstyle.cpp
+++ src/printing/grantlee/grantleeprintstyle.cpp
@@ -38,7 +38,7 @@ GrantleePrintStyle::~GrantleePrintStyle()
void GrantleePrintStyle::print(const KContacts::Addressee::List &contacts, PrintProgress *progress)
{
QPrinter *printer = wizard()->printer();
- printer->setPageMargins(20, 20, 20, 20, QPrinter::DevicePixel);
+ printer->setPageMargins(QMarginsF(20, 20, 20, 20), QPageLayout::Point);
progress->addMessage(i18n("Setting up document"));
diff --git src/printing/mike/mikesstyle.cpp src/printing/mike/mikesstyle.cpp
index 9f698c53..81a4bd6f 100644
--- src/printing/mike/mikesstyle.cpp
+++ src/printing/mike/mikesstyle.cpp
@@ -107,7 +107,7 @@ MikesStyle::~MikesStyle()
void MikesStyle::print(const KContacts::Addressee::List &contacts, PrintProgress *progress)
{
QPrinter *printer = wizard()->printer();
- printer->setPageMargins(20, 20, 20, 20, QPrinter::DevicePixel);
+ printer->setPageMargins(QMarginsF(20, 20, 20, 20), QPageLayout::Point);
progress->addMessage(i18n("Setting up document"));
diff --git src/printing/ringbinder/ringbinderstyle.cpp src/printing/ringbinder/ringbinderstyle.cpp
index 60a39c86..5f600d6a 100644
--- src/printing/ringbinder/ringbinderstyle.cpp
+++ src/printing/ringbinder/ringbinderstyle.cpp
@@ -159,7 +159,7 @@ void RingBinderPrintStyle::print(const KContacts::Addressee::List &contacts, Pri
config.sync();
QPrinter *printer = wizard()->printer();
- printer->setPageMargins(50, 20, 0, 50, QPrinter::DevicePixel);
+ printer->setPageMargins(QMarginsF(50, 20, 0, 50), QPageLayout::Point);
progress->addMessage(i18n("Setting up document"));

5
devel/eric6/Makefile
View File

@ -6,16 +6,13 @@ DISTNAME= ${PORTNAME}-nolang-${DISTVERSION}
PORTREVISION= 1
CATEGORIES= devel python
# Note to MAINTAINER: this should be converted to USES=pyqt, USE_PYQT=[...]
BUILD_DEPENDS+= ${PYQT_PY_RELNAME}-chart>=${PYQT_VERSION}:x11-toolkits/py-qt5-chart@${PY_FLAVOR}
RUN_DEPENDS+= ${PYQT_PY_RELNAME}-chart>=${PYQT_VERSION}:x11-toolkits/py-qt5-chart@${PY_FLAVOR}
RUN_DEPENDS+= ${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:databases/py-sqlite3@${PY_FLAVOR}
CONFLICTS_INSTALL= ${FLAVORS:N${FLAVOR}:C/^/${PORTNAME}${PKGNAMESUFFIX}-/:C/$/-[0-9]*/}
USES+= desktop-file-utils python:3.5+ pyqt:5 shebangfix
USE_PYTHON= flavors
USE_PYQT= core gui qscintilla2 webengine \
USE_PYQT= chart core gui qscintilla2 webengine \
help_run network_run svg_run sql_run
INSTALL_PY= install.py -c -f eric6config.freebsd -i ${STAGEDIR}
SHEBANG_FILES= *.py eric/eric6/*.py eric/scripts/*.py

9
devel/libsavitar/Makefile
View File

@ -2,20 +2,23 @@
PORTNAME= libSavitar
DISTVERSION= 4.5.0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= devel cad
DIST_SUBDIR= Ultimaker
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
PATCHFILES= 195633cf0c5f.patch:-p1
MAINTAINER= db@FreeBSD.org
COMMENT= C++ implementation of 3mf loading/python bindings
LICENSE= LGPL3
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>0:devel/py-sip@${PY_FLAVOR}
LIB_DEPENDS= libpugixml.so:textproc/pugixml
USES= cmake compiler:c++11-lang python:3.4+
USES= cmake compiler:c++11-lang python:3.5+ pyqt:5
USE_PYQT= sip pysip
USE_GITHUB= yes
GH_ACCOUNT= Ultimaker
GH_TAGNAME= 96eba0e

4
devel/libsavitar/distinfo
View File

@ -1,3 +1,5 @@
TIMESTAMP = 1583953836
TIMESTAMP = 1602393384
SHA256 (Ultimaker/Ultimaker-libSavitar-4.5.0-96eba0e_GH0.tar.gz) = f64e9b20d6783247a88ddc751a80d20eec2073465c0b46fbba45c1ab9c01eb75
SIZE (Ultimaker/Ultimaker-libSavitar-4.5.0-96eba0e_GH0.tar.gz) = 98038
SHA256 (Ultimaker/195633cf0c5f.patch) = 5c4fce2fbf144ae92882234dc5b703a7e1f9594a80cfefbaaa083b4c7d81b0f4
SIZE (Ultimaker/195633cf0c5f.patch) = 5331

4
devel/py-qt5-core/Makefile
View File

@ -15,9 +15,9 @@ CONFIGURE_ARGS= ${PYQT5_MODULES_ALL:N${PYQT_MODULE}:C/.*/--disable=&/} \
PYQT_DIST= yes
USES= python pyqt:5 qt:5
USES= python:3.5+ pyqt:5 qt:5
USE_PYTHON= concurrent flavors py3kplist
USE_PYQT= sip
USE_PYQT= sip pysip
USE_QT= core buildtools_build qmake_build
OPTIONS_DEFINE= API DEBUG

2
devel/py-qt5-dbus/Makefile
View File

@ -12,7 +12,7 @@ RUN_DEPENDS= ${PY_ENUM34}
CONFIGURE_ARGS= --enable QtDBus
PYQT_DIST= yes
USES= python pyqt:5 qt:5
USES= python:3.5+ pyqt:5 qt:5
USE_PYQT= sip_build core_run
USE_PYTHON= concurrent flavors py3kplist
USE_QT= core dbus qmake_build

2
devel/py-qt5-dbussupport/Makefile
View File

@ -15,7 +15,7 @@ LIB_DEPENDS= libdbus-1.so:devel/dbus
CONFIGURE_ARGS= --enable QtCore
PYQT_DIST= yes
USES= pkgconfig python pyqt:5 qt:5
USES= pkgconfig python:3.5+ pyqt:5 qt:5
USE_PYQT= sip_build
USE_PYTHON= concurrent flavors py3kplist
USE_QT= core buildtools_build qmake_build

2
devel/py-qt5-designer/Makefile
View File

@ -12,7 +12,7 @@ RUN_DEPENDS= ${PY_ENUM34}
CONFIGURE_ARGS= --enable QtDesigner --no-designer-plugin
PYQT_DIST= yes
USES= gl python pyqt:5 qt:5
USES= gl python:3.5+ pyqt:5 qt:5
USE_GL= gl
USE_PYQT= sip_build core_run widgets_run
USE_PYTHON= concurrent flavors py3kplist

2
devel/py-qt5-designerplugin/Makefile
View File

@ -17,7 +17,7 @@ CONFIGURE_ARGS= --enable QtDesigner
PYQT_DIST= yes
USES= gl python pyqt:5 qt:5
USES= gl python:3.5+ pyqt:5 qt:5
USE_GL= gl
USE_PYQT= sip_build
USE_PYTHON= concurrent flavors py3kplist

2
devel/py-qt5-help/Makefile
View File

@ -12,7 +12,7 @@ RUN_DEPENDS= ${PY_ENUM34}
CONFIGURE_ARGS= --enable QtHelp
PYQT_DIST= yes
USES= gl python pyqt:5 qt:5
USES= gl python:3.5+ pyqt:5 qt:5
USE_GL= gl
USE_PYQT= sip_build core_run widgets_run
USE_PYTHON= concurrent flavors py3kplist

2
devel/py-qt5-location/Makefile
View File

@ -12,7 +12,7 @@ RUN_DEPENDS= ${PY_ENUM34}
CONFIGURE_ARGS= --enable QtLocation
PYQT_DIST= yes
USES= gl python pyqt:5 qt:5
USES= gl python:3.5+ pyqt:5 qt:5
USE_GL= gl
USE_PYQT= sip_build core_run widgets_run
USE_PYTHON= concurrent flavors py3kplist

2
devel/py-qt5-qscintilla2/Makefile
View File

@ -17,7 +17,7 @@ DESTDIRNAME= INSTALL_ROOT
HAS_CONFIGURE= yes
USES= python pyqt:5 gl qmake:no_env qt:5
USES= python:3.5+ pyqt:5 gl qmake:no_env qt:5
USE_GL= gl
USE_PYQT= core gui printsupport widgets
USE_PYTHON= concurrent flavors py3kplist

2
devel/py-qt5-remoteobjects/Makefile
View File

@ -12,7 +12,7 @@ RUN_DEPENDS= ${PY_ENUM34}
CONFIGURE_ARGS= --enable QtRemoteObjects
PYQT_DIST= yes
USES= gl python pyqt:5 qt:5
USES= gl python:3.5+ pyqt:5 qt:5
USE_GL= gl
USE_PYQT= sip_build core_run widgets_run
USE_PYTHON= concurrent flavors py3kplist

2
devel/py-qt5-test/Makefile
View File

@ -12,7 +12,7 @@ RUN_DEPENDS= ${PY_ENUM34}
CONFIGURE_ARGS= --enable QtTest
PYQT_DIST= yes
USES= gl python pyqt:5 qt:5
USES= gl python:3.5+ pyqt:5 qt:5
USE_GL= gl
USE_PYQT= sip_build core_run widgets_run
USE_PYTHON= concurrent flavors py3kplist

2
devel/py-qt5/Makefile
View File

@ -8,7 +8,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for the Qt 5 toolkit (meta port)
USES= metaport python pyqt:5
USES= metaport python:3.5+ pyqt:5
USE_PYTHON= concurrent flavors py3kplist
# Keep these synchronized with _USE_PYQT_ALL in Mk/Use/pyqt.mk

6
devel/py-qt5/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1595064383
SHA256 (PyQt5-5.15.0.tar.gz) = c6f75488ffd5365a65893bc64ea82a6957db126fbfe33654bcd43ae1c30c52f9
SIZE (PyQt5-5.15.0.tar.gz) = 3262004
TIMESTAMP = 1602000543
SHA256 (PyQt5-5.15.1.tar.gz) = d9a76b850246d08da9863189ecb98f6c2aa9b4d97a3e85e29330a264aed0f9a1
SIZE (PyQt5-5.15.1.tar.gz) = 3264559

8
devel/py-qtbuilder/Makefile
View File

@ -1,16 +1,16 @@
# $FreeBSD$
PORTNAME= qtbuilder
PORTVERSION= 1.4.0 # ${QTBUILDER_VERSION}
PORTVERSION= ${PYQTBUILDER_VERSION}
CATEGORIES= devel python
MASTER_SITES= https://pypi.io/packages/source/P/PyQt-builder/ # ${MASTER_SITES_QTBUILDER}
MASTER_SITES= ${MASTER_SITES_PYQTBUILDER}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= PyQt-builder-${PORTVERSION} # ${QTBUILDER_DISTNAME}
DISTNAME= ${PYQTBUILDER_DISTNAME}
MAINTAINER= kde@FreeBSD.org
COMMENT= The PEP 517 compliant PyQt build system
USES= python
USES= python:3.5+ pyqt:5
USE_PYTHON= autoplist concurrent distutils flavors py3kplist
USE_PYQT= #

68
devel/py-sip/Makefile
View File

@ -12,60 +12,20 @@ DISTNAME= ${SIP_DISTNAME}
MAINTAINER= kde@FreeBSD.org
COMMENT= Python to C and C++ bindings generator
USES= python pyqt:sip
USE_PYTHON= concurrent py3kplist flavors
LICENSE= SIP GPLv2 GPLv3
LICENSE_COMB= multi
LICENSE_NAME_SIP= SIP License
LICENSE_GROUPS_SIP= FSF GPL OSI
LICENSE_PERMS_SIP= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
LICENSE_FILE_SIP= ${WRKSRC}/LICENSE
LICENSE_FILE_GPLv2= ${WRKSRC}/LICENSE-GPL2
LICENSE_FILE_GPLv3= ${WRKSRC}/LICENSE-GPL3
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}toml>0:textproc/py-toml@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR}
USES= python:3.5+ pyqt:sip
USE_PYTHON= autoplist concurrent distutils flavors py3kplist
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"
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
CONFIGURE_WRKSRC= ${WRKSRC}/default
BUILD_WRKSRC= ${CONFIGURE_WRKSRC}
INSTALL_WRKSRC= ${CONFIGURE_WRKSRC}
PYQT_SIPDIR= ${LOCALBASE}/share/PyQt5/${PYTHON_VER}/sip
do-configure:
# 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 && \
${COPYTREE_SHARE} \. ${STAGEDIR}${DOCSDIR}
${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
-f -d ${PYTHONPREFIX_SITELIBDIR} \
${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
-f -d ${PYTHONPREFIX_SITELIBDIR} \
${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
${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>

6
devel/py-sip/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1600752207
SHA256 (sip-4.19.24.tar.gz) = edcd3790bb01938191eef0f6117de0bf56d1136626c0ddb678f3a558d62e41e5
SIZE (sip-4.19.24.tar.gz) = 1055461
TIMESTAMP = 1603131908
SHA256 (sip-5.4.0.tar.gz) = 4282ab45948674f5ef74278a8e70d1302f65c95b519a0af19409002f5715d641
SIZE (sip-5.4.0.tar.gz) = 1106676

28
devel/py-sip/files/patch-siputils.py
View File

@ -1,28 +0,0 @@
sip 4.16.5 has switched the Makefile lines that invoke the moc utility from
an invocation with an explicit source file name to "$<".
This works with GNU make, but not make(1), where it $< evaluates to nothing
in this context.
Switch back to the previous version to avoid having to depend on devel/gmake
(figuring out which ports need it is not trivial).
--- siputils.py
+++ siputils.py
@@ -1683,7 +1683,7 @@
cpp = "moc_" + root + ".cpp"
mfile.write("\n%s: %s\n" % (cpp, mf))
- mfile.write("\t$(MOC) -o %s $<\n" % cpp)
+ mfile.write("\t$(MOC) -o %s %s\n" % (cpp, mf))
mfile.write("\n$(TARGET): $(OFILES)\n")
@@ -1980,7 +1980,7 @@
mf = os.path.join(self._src_dir, mf)
mfile.write("\n%s: %s\n" % (cpp, mf))
- mfile.write("\t$(MOC) -o %s $<\n" % cpp)
+ mfile.write("\t$(MOC) -o %s %s\n" % (cpp, mf))
mfile.write("\n$(TARGET): $(OFILES)\n")

18
devel/py-sip/pkg-plist
View File

@ -1,18 +0,0 @@
bin/sip
%%PYTHON_INCLUDEDIR%%/sip.h
%%PYTHON_SITELIBDIR%%/PyQt5/sip.pyi
%%PYTHON_SITELIBDIR%%/PyQt5/sip.so
%%PYTHON_SITELIBDIR%%/PyQt5_sip-%%PYQT_SIPVERSION%%.dist-info/INSTALLER
%%PYTHON_SITELIBDIR%%/PyQt5_sip-%%PYQT_SIPVERSION%%.dist-info/METADATA
%%PYTHON_SITELIBDIR%%/PyQt5_sip-%%PYQT_SIPVERSION%%.dist-info/RECORD
%%PYTHON_SITELIBDIR%%/sip-%%PYQT_SIPVERSION%%.dist-info/INSTALLER
%%PYTHON_SITELIBDIR%%/sip-%%PYQT_SIPVERSION%%.dist-info/METADATA
%%PYTHON_SITELIBDIR%%/sip-%%PYQT_SIPVERSION%%.dist-info/RECORD
%%PYTHON_SITELIBDIR%%/sip.pyi
%%PYTHON_SITELIBDIR%%/sip.so
%%PYTHON_SITELIBDIR%%/sipconfig.py
%%PYTHON_SITELIBDIR%%/sipconfig.pyc
%%PYTHON_SITELIBDIR%%/sipconfig.pyo
%%PYTHON_SITELIBDIR%%/sipdistutils.py
%%PYTHON_SITELIBDIR%%/sipdistutils.pyc
%%PYTHON_SITELIBDIR%%/sipdistutils.pyo

2
devel/pyside2-tools/Makefile
View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= pyside2-tools
DISTVERSION= 5.15.1
DISTVERSION= 5.15.2
CATEGORIES= devel
MASTER_SITES= QT/official_releases/QtForPython/shiboken2/PySide2-${DISTVERSION}-src
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

6
devel/pyside2-tools/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1601627385
SHA256 (pyside-setup-opensource-src-5.15.1.tar.xz) = f175c1d8813257904cf0efeb58e44f68d53b9916f73adaf9ce19514c0271c3fa
SIZE (pyside-setup-opensource-src-5.15.1.tar.xz) = 3454052
TIMESTAMP = 1606840487
SHA256 (pyside-setup-opensource-src-5.15.2.tar.xz) = b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418
SIZE (pyside-setup-opensource-src-5.15.2.tar.xz) = 3472624

12
devel/pyside2/Makefile
View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= pyside2
DISTVERSION= 5.15.1
DISTVERSION= 5.15.2
CATEGORIES= devel
MASTER_SITES= QT/official_releases/QtForPython/shiboken2/PySide2-${DISTVERSION}-src
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@ -43,4 +43,14 @@ USE_QT+= webengine
PLIST_SUB+= WEBENGINE="@comment "
.endif
# AVOID a build_fs_violation with poudriere
post-build:
${RM} -r ${PYTHON_SITELIBDIR}/shiboken2/files.dir/shibokensupport/__pycache__
${RM} -r ${PYTHON_SITELIBDIR}/shiboken2/files.dir/shibokensupport/signature/__pycache__
${RM} -r ${PYTHON_SITELIBDIR}/shiboken2/files.dir/shibokensupport/signature/lib/__pycache__
post-stage:
${RM} -r ${PYTHON_SITELIBDIR}/shiboken2/files.dir/shibokensupport/__pycache__
${RM} -r ${PYTHON_SITELIBDIR}/shiboken2/files.dir/shibokensupport/signature/__pycache__
${RM} -r ${PYTHON_SITELIBDIR}/shiboken2/files.dir/shibokensupport/signature/lib/__pycache__
.include <bsd.port.post.mk>

6
devel/pyside2/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1601626288
SHA256 (pyside-setup-opensource-src-5.15.1.tar.xz) = f175c1d8813257904cf0efeb58e44f68d53b9916f73adaf9ce19514c0271c3fa
SIZE (pyside-setup-opensource-src-5.15.1.tar.xz) = 3454052
TIMESTAMP = 1606754632
SHA256 (pyside-setup-opensource-src-5.15.2.tar.xz) = b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418
SIZE (pyside-setup-opensource-src-5.15.2.tar.xz) = 3472624

9
devel/qt5-assistant/files/patch-src__src.pro
View File

@ -1,9 +1,9 @@
Only enter the directories we want to build, otherwise we might fail due to
missing dependencies.
--- src/src.pro.orig 2019-02-14 20:24:23 UTC
--- src/src.pro.orig 2020-11-20 20:09:00 UTC
+++ src/src.pro
@@ -1,54 +1,3 @@
@@ -1,55 +1,3 @@
TEMPLATE = subdirs
-qtHaveModule(widgets) {
@ -12,10 +12,11 @@ missing dependencies.
- } else {
- QT_FOR_CONFIG += widgets
- qtConfig(pushbutton):qtConfig(toolbutton) {
- SUBDIRS = assistant \
- designer \
- SUBDIRS = designer \
- pixeltool
-
- !static|contains(QT_PLUGINS, qsqlite): SUBDIRS += assistant
-
- linguist.depends = designer
- }
- qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator

2
devel/qt5-buildtools/pkg-plist
View File

@ -6,5 +6,3 @@
%%QT_LIBDIR%%/libQt5Bootstrap.a
%%QT_LIBDIR%%/libQt5Bootstrap.prl
%%QT_MKSPECDIR%%/modules/qt_lib_bootstrap_private.pri
%%QT_CMAKEDIR%%/Qt5Bootstrap/Qt5BootstrapConfig.cmake
%%QT_CMAKEDIR%%/Qt5Bootstrap/Qt5BootstrapConfigVersion.cmake

1
devel/qt5-core/Makefile
View File

@ -2,7 +2,6 @@
PORTNAME= core
DISTVERSION= ${QT5_VERSION}
PORTREVISION= 4
CATEGORIES= devel
PKGNAMEPREFIX= qt5-

45
devel/qt5-core/files/patch-src_corelib_time_qtimezoneprivate__tz.cpp
View File

@ -1,28 +1,39 @@
--- src/corelib/time/qtimezoneprivate_tz.cpp.orig 2020-05-11 08:15:08 UTC
--- src/corelib/time/qtimezoneprivate_tz.cpp.orig 2020-09-12 18:44:11 UTC
+++ src/corelib/time/qtimezoneprivate_tz.cpp
@@ -1153,6 +1153,25 @@ QByteArray QTzTimeZonePrivate::systemTimeZoneId() cons
}
}
@@ -1155,6 +1155,8 @@ class ZoneNameReader : public QObject (public)
return m_name;
+ // On some FreeBSD systems, /etc/localtime is a regular file while
+ // the actual name is in /var/db/zoneinfo
+ if (ianaId.isEmpty()) {
m_name = etcLocalTime();
+ if (m_name.isEmpty())
+ m_name = varDBZoneinfo();
if (!m_name.isEmpty()) {
m_last = local;
return m_name;
@@ -1203,6 +1205,27 @@ class ZoneNameReader : public QObject (public)
return path.midRef(index + zoneinfo.size()).toUtf8();
} while (!path.isEmpty() && --iteration > 0);
+ return QByteArray();
+ }
+
+ static QByteArray varDBZoneinfo()
+ {
+ // On some FreeBSD systems, /etc/localtime is a regular file while
+ // the actual name is in /var/db/zoneinfo
+ QFile tzif(QStringLiteral("/var/db/zoneinfo"));
+ if (tzif.open(QIODevice::ReadOnly)) {
+ const int maximumTZNameLength = 256;
+ QByteArray tzcontents( tzif.read( maximumTZNameLength ) );
+ if (tzcontents.size() >= 2) {
+ // Shortest TZ would be UTC, or r/z, but there's special
+ // cases "GB" and "US"
+ const int newlineIndex = tzcontents.indexOf('\n');
+ if (newlineIndex < 0) // No newline in file
+ ianaId = tzcontents;
+ if (newlineIndex > 2) // Newline, chop it off
+ ianaId = tzcontents.left(newlineIndex);
+ return tzcontents;
+ // Shortest TZ name in FreeBSD is "GB", "NZ" or "US"
+ if (newlineIndex >= 2) // Newline, chop it off
+ return tzcontents.left(newlineIndex);
+ // Newline on position 0 or 1 is an invalid name
+ }
+ }
+ }
+
// Some systems (e.g. uClibc) have a default value for $TZ in /etc/TZ:
if (ianaId.isEmpty()) {
QFile zone(QStringLiteral("/etc/TZ"));
return QByteArray();
}

9
devel/qt5-designer/files/patch-src__src.pro
View File

@ -1,9 +1,9 @@
Only enter the directories we want to build, otherwise we might fail due to
missing dependencies.
--- src/src.pro.orig 2019-02-14 20:38:18 UTC
--- src/src.pro.orig 2020-11-20 20:19:40 UTC
+++ src/src.pro
@@ -1,54 +1,3 @@
@@ -1,55 +1,3 @@
TEMPLATE = subdirs
-qtHaveModule(widgets) {
@ -12,10 +12,11 @@ missing dependencies.
- } else {
- QT_FOR_CONFIG += widgets
- qtConfig(pushbutton):qtConfig(toolbutton) {
- SUBDIRS = assistant \
- designer \
- SUBDIRS = designer \
- pixeltool
-
- !static|contains(QT_PLUGINS, qsqlite): SUBDIRS += assistant
-
- linguist.depends = designer
- }
- qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator

6
devel/qt5-help/files/patch-src__assistant__assistant.pro
View File

@ -3,9 +3,9 @@ missing dependencies.
assistant/ is built in devel/qt5-assistant.
--- src/assistant/assistant.pro.orig 2019-01-15 05:20:10 UTC
--- src/assistant/assistant.pro.orig 2020-08-24 09:20:54 UTC
+++ src/assistant/assistant.pro
@@ -3,7 +3,6 @@ TEMPLATE = subdirs
@@ -8,7 +8,6 @@ TEMPLATE = subdirs
SUBDIRS += \
help \
@ -13,7 +13,7 @@ assistant/ is built in devel/qt5-assistant.
qhelpgenerator \
qcollectiongenerator
@@ -11,7 +10,6 @@ assistant.depends = help
@@ -16,7 +15,6 @@ assistant.depends = help
qhelpgenerator.depends = help
qtNomakeTools( \

9
devel/qt5-help/files/patch-src__src.pro
View File

@ -1,9 +1,9 @@
Only enter the directories we want to build, otherwise we might fail due to
missing dependencies.
--- src/src.pro.orig 2019-02-14 19:59:04 UTC
--- src/src.pro.orig 2020-11-20 20:01:31 UTC
+++ src/src.pro
@@ -1,54 +1,3 @@
@@ -1,55 +1,3 @@
TEMPLATE = subdirs
-qtHaveModule(widgets) {
@ -12,10 +12,11 @@ missing dependencies.
- } else {
- QT_FOR_CONFIG += widgets
- qtConfig(pushbutton):qtConfig(toolbutton) {
- SUBDIRS = assistant \
- designer \
- SUBDIRS = designer \
- pixeltool
-
- !static|contains(QT_PLUGINS, qsqlite): SUBDIRS += assistant
-
- linguist.depends = designer
- }
- qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator

9
devel/qt5-linguist/files/patch-src__src.pro
View File

@ -1,9 +1,9 @@
Only enter the directories we want to build, otherwise we might fail due to
missing dependencies.
--- src/src.pro.orig 2019-02-14 20:52:15 UTC
--- src/src.pro.orig 2020-11-21 06:11:19 UTC
+++ src/src.pro
@@ -1,54 +1,3 @@
@@ -1,55 +1,3 @@
TEMPLATE = subdirs
-qtHaveModule(widgets) {
@ -12,10 +12,11 @@ missing dependencies.
- } else {
- QT_FOR_CONFIG += widgets
- qtConfig(pushbutton):qtConfig(toolbutton) {
- SUBDIRS = assistant \
- designer \
- SUBDIRS = designer \
- pixeltool
-
- !static|contains(QT_PLUGINS, qsqlite): SUBDIRS += assistant
-
- linguist.depends = designer
- }
- qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator

9
devel/qt5-linguisttools/files/patch-src__src.pro
View File

@ -1,9 +1,9 @@
Only enter the directories we want to build, otherwise we might fail due to
missing dependencies.
--- src/src.pro.orig 2019-02-14 20:23:20 UTC
--- src/src.pro.orig 2020-11-20 20:18:27 UTC
+++ src/src.pro
@@ -1,54 +1,3 @@
@@ -1,55 +1,3 @@
TEMPLATE = subdirs
-qtHaveModule(widgets) {
@ -12,10 +12,11 @@ missing dependencies.
- } else {
- QT_FOR_CONFIG += widgets
- qtConfig(pushbutton):qtConfig(toolbutton) {
- SUBDIRS = assistant \
- designer \
- SUBDIRS = designer \
- pixeltool
-
- !static|contains(QT_PLUGINS, qsqlite): SUBDIRS += assistant
-
- linguist.depends = designer
- }
- qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator

12
devel/qt5-qdbus/files/patch-src_src.pro
View File

@ -1,9 +1,9 @@
Only enter the directories we want to build, otherwise we might fail due to
missing dependencies
--- src/src.pro.orig 2019-02-14 19:41:39 UTC
--- src/src.pro.orig 2020-11-20 20:10:45 UTC
+++ src/src.pro
@@ -1,54 +1,3 @@
@@ -1,55 +1,3 @@
TEMPLATE = subdirs
-qtHaveModule(widgets) {
@ -12,10 +12,11 @@ missing dependencies
- } else {
- QT_FOR_CONFIG += widgets
- qtConfig(pushbutton):qtConfig(toolbutton) {
- SUBDIRS = assistant \
- designer \
- SUBDIRS = designer \
- pixeltool
-
- !static|contains(QT_PLUGINS, qsqlite): SUBDIRS += assistant
-
- linguist.depends = designer
- }
- qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator
@ -39,7 +40,7 @@ missing dependencies
- SUBDIRS += macdeployqt
-}
-
qtHaveModule(dbus): SUBDIRS += qdbus
-qtHaveModule(dbus): SUBDIRS += qdbus
-
-win32|winrt:SUBDIRS += windeployqt
-winrt:SUBDIRS += winrtrunner
@ -58,3 +59,4 @@ missing dependencies
- winrtrunner.depends += qtattributionsscanner
- linguist.depends += qtattributionsscanner
-}
+SUBDIRS += qdbus

12
devel/qt5-qdbusviewer/files/patch-src__src.pro
View File

@ -1,9 +1,9 @@
Only enter the directories we want to build, otherwise we might fail due to
missing dependencies.
--- src/src.pro.orig 2019-02-14 20:02:00 UTC
--- src/src.pro.orig 2020-11-20 20:04:42 UTC
+++ src/src.pro
@@ -1,54 +1,3 @@
@@ -1,55 +1,3 @@
TEMPLATE = subdirs
-qtHaveModule(widgets) {
@ -12,10 +12,11 @@ missing dependencies.
- } else {
- QT_FOR_CONFIG += widgets
- qtConfig(pushbutton):qtConfig(toolbutton) {
- SUBDIRS = assistant \
- designer \
- SUBDIRS = designer \
- pixeltool
-
- !static|contains(QT_PLUGINS, qsqlite): SUBDIRS += assistant
-
- linguist.depends = designer
- }
- qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator
@ -39,7 +40,7 @@ missing dependencies.
- SUBDIRS += macdeployqt
-}
-
qtHaveModule(dbus): SUBDIRS += qdbus
-qtHaveModule(dbus): SUBDIRS += qdbus
-
-win32|winrt:SUBDIRS += windeployqt
-winrt:SUBDIRS += winrtrunner
@ -58,3 +59,4 @@ missing dependencies.
- winrtrunner.depends += qtattributionsscanner
- linguist.depends += qtattributionsscanner
-}
+SUBDIRS = qdbus

4
devel/qt5-qdoc/files/patch-src_qdoc_qdoc.pro
View File

@ -1,6 +1,6 @@
--- src/qdoc/qdoc.pro.orig 2019-12-31 21:11:48 UTC
--- src/qdoc/qdoc.pro.orig 2020-08-24 09:20:54 UTC
+++ src/qdoc/qdoc.pro
@@ -152,6 +152,6 @@ cmake_qdoc_config_version_file.output = $$MODULE_BASE_
@@ -158,6 +158,6 @@ cmake_qdoc_config_version_file.output = $$MODULE_BASE_
QMAKE_SUBSTITUTES += cmake_qdoc_config_file cmake_qdoc_config_version_file
cmake_qdoc_tools_files.files += $$cmake_qdoc_config_file.output $$cmake_qdoc_config_version_file.output

9
devel/qt5-qdoc/files/patch-src_src.pro
View File

@ -1,9 +1,9 @@
Only enter the directories we want to build, otherwise we might fail due to
missing dependencies.
--- src/src.pro.orig 2019-02-14 20:14:11 UTC
--- src/src.pro.orig 2020-11-20 20:20:35 UTC
+++ src/src.pro
@@ -1,54 +1,5 @@
@@ -1,55 +1,5 @@
TEMPLATE = subdirs
-qtHaveModule(widgets) {
@ -12,10 +12,11 @@ missing dependencies.
- } else {
- QT_FOR_CONFIG += widgets
- qtConfig(pushbutton):qtConfig(toolbutton) {
- SUBDIRS = assistant \
- designer \
- SUBDIRS = designer \
- pixeltool
-
- !static|contains(QT_PLUGINS, qsqlite): SUBDIRS += assistant
-
- linguist.depends = designer
- }
- qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator

9
devel/qt5-uitools/files/patch-src__src.pro
View File

@ -1,9 +1,9 @@
Only enter the directories we want to build, otherwise we might fail due to
missing dependencies.
--- src/src.pro.orig 2019-02-14 20:09:32 UTC
--- src/src.pro.orig 2020-11-20 20:09:40 UTC
+++ src/src.pro
@@ -1,54 +1,3 @@
@@ -1,55 +1,3 @@
TEMPLATE = subdirs
-qtHaveModule(widgets) {
@ -12,10 +12,11 @@ missing dependencies.
- } else {
- QT_FOR_CONFIG += widgets
- qtConfig(pushbutton):qtConfig(toolbutton) {
- SUBDIRS = assistant \
- designer \
- SUBDIRS = designer \
- pixeltool
-
- !static|contains(QT_PLUGINS, qsqlite): SUBDIRS += assistant
-
- linguist.depends = designer
- }
- qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator

170
devel/qt5/distinfo
View File

@ -1,85 +1,85 @@
TIMESTAMP = 1595426464
SHA256 (KDE/Qt/5.15.0/qt3d-everywhere-src-5.15.0.tar.xz) = 61856f0c453b79e98b7a1e65ea8f59976fa78230ffa8dec959b5f4b45383dffd
SIZE (KDE/Qt/5.15.0/qt3d-everywhere-src-5.15.0.tar.xz) = 81921676
SHA256 (KDE/Qt/5.15.0/qtactiveqt-everywhere-src-5.15.0.tar.xz) = 1b455eacfb9ef49912d7a79040ea409a6ab88dfa192d313e6b5e02a79d741b51
SIZE (KDE/Qt/5.15.0/qtactiveqt-everywhere-src-5.15.0.tar.xz) = 267788
SHA256 (KDE/Qt/5.15.0/qtandroidextras-everywhere-src-5.15.0.tar.xz) = c9019185221e94e37e250c84acaebfb7b2f5342e8ad60cdcff052ac2b85ec671
SIZE (KDE/Qt/5.15.0/qtandroidextras-everywhere-src-5.15.0.tar.xz) = 183492
SHA256 (KDE/Qt/5.15.0/qtbase-everywhere-src-5.15.0.tar.xz) = 9e7af10aece15fa9500369efde69cb220eee8ec3a6818afe01ce1e7d484824c5
SIZE (KDE/Qt/5.15.0/qtbase-everywhere-src-5.15.0.tar.xz) = 49931940
SHA256 (KDE/Qt/5.15.0/qtcharts-everywhere-src-5.15.0.tar.xz) = 44a24fc16abcaf9ae97ecf3215f6f3b44ebdb3b73bcb4ed3549a51519e4883a7
SIZE (KDE/Qt/5.15.0/qtcharts-everywhere-src-5.15.0.tar.xz) = 4250568
SHA256 (KDE/Qt/5.15.0/qtconnectivity-everywhere-src-5.15.0.tar.xz) = f911fb8f8bf3a9958785d0378d25ced8989047938b7138d619854a94fa0b27dd
SIZE (KDE/Qt/5.15.0/qtconnectivity-everywhere-src-5.15.0.tar.xz) = 2803792
SHA256 (KDE/Qt/5.15.0/qtdatavis3d-everywhere-src-5.15.0.tar.xz) = 8f07747f371f7c515c667240a795105c89aa83c08d88ee92fa1ef7efccea10a3
SIZE (KDE/Qt/5.15.0/qtdatavis3d-everywhere-src-5.15.0.tar.xz) = 5190804
SHA256 (KDE/Qt/5.15.0/qtdeclarative-everywhere-src-5.15.0.tar.xz) = 9c3c93fb7d340b2f7d738d12408c047318c78973cb45bfc5ff6b3a57e1fef699
SIZE (KDE/Qt/5.15.0/qtdeclarative-everywhere-src-5.15.0.tar.xz) = 21493268
SHA256 (KDE/Qt/5.15.0/qtdoc-everywhere-src-5.15.0.tar.xz) = 07ca8db98c317f25cc9a041c48a6824baf63893bf5b535d6f8d266dea8c7659f
SIZE (KDE/Qt/5.15.0/qtdoc-everywhere-src-5.15.0.tar.xz) = 5742500
SHA256 (KDE/Qt/5.15.0/qtgamepad-everywhere-src-5.15.0.tar.xz) = dda54d9f90897944bed5e6af48a904a677fd97eb6f57ab08a2b232c431caf31a
SIZE (KDE/Qt/5.15.0/qtgamepad-everywhere-src-5.15.0.tar.xz) = 386724
SHA256 (KDE/Qt/5.15.0/qtgraphicaleffects-everywhere-src-5.15.0.tar.xz) = 0d2ea4bc73b9df13a4b739dcbc1e3c7b298c7e682f7f9252b232e3bde7b63eda
SIZE (KDE/Qt/5.15.0/qtgraphicaleffects-everywhere-src-5.15.0.tar.xz) = 14040716
SHA256 (KDE/Qt/5.15.0/qtimageformats-everywhere-src-5.15.0.tar.xz) = 83f32101b1a898fcb8ed6f11a657d1125484ac0c2223014b61849d9010efebc8
SIZE (KDE/Qt/5.15.0/qtimageformats-everywhere-src-5.15.0.tar.xz) = 1811092
SHA256 (KDE/Qt/5.15.0/qtlocation-everywhere-src-5.15.0.tar.xz) = c68b0778a521e5522641c41b1778999dd408ebfda1e0de166a83743268be5f3f
SIZE (KDE/Qt/5.15.0/qtlocation-everywhere-src-5.15.0.tar.xz) = 6542152
SHA256 (KDE/Qt/5.15.0/qtlottie-everywhere-src-5.15.0.tar.xz) = 2053f474dcd7184fdcae2507f47af6527f6ca25b4424483f9265853c3626c833
SIZE (KDE/Qt/5.15.0/qtlottie-everywhere-src-5.15.0.tar.xz) = 82384
SHA256 (KDE/Qt/5.15.0/qtmacextras-everywhere-src-5.15.0.tar.xz) = 95a8c35b30373224cdd6d1ca0bdda1a314b20e91551a4824e8ca7e50ce8ff439
SIZE (KDE/Qt/5.15.0/qtmacextras-everywhere-src-5.15.0.tar.xz) = 69248
SHA256 (KDE/Qt/5.15.0/qtmultimedia-everywhere-src-5.15.0.tar.xz) = 0708d867697f392dd3600c5c1c88f5c61b772a5250a4d059dca67b844af0fbd7
SIZE (KDE/Qt/5.15.0/qtmultimedia-everywhere-src-5.15.0.tar.xz) = 3796364
SHA256 (KDE/Qt/5.15.0/qtnetworkauth-everywhere-src-5.15.0.tar.xz) = 96c6107f6e85662a05f114c5b9bd3503a3100bd940e1494c73a99e77f9e7cf85
SIZE (KDE/Qt/5.15.0/qtnetworkauth-everywhere-src-5.15.0.tar.xz) = 141360
SHA256 (KDE/Qt/5.15.0/qtpurchasing-everywhere-src-5.15.0.tar.xz) = 2127f180c4889055d88e2b402b62be80a5a213a0e48d2056cc9a01d9913b3a16
SIZE (KDE/Qt/5.15.0/qtpurchasing-everywhere-src-5.15.0.tar.xz) = 208560
SHA256 (KDE/Qt/5.15.0/qtquick3d-everywhere-src-5.15.0.tar.xz) = 6d3b91b653ba5e33fd5b37cd785ded6cf1dd83d35250c3addb77eb35f90e52cb
SIZE (KDE/Qt/5.15.0/qtquick3d-everywhere-src-5.15.0.tar.xz) = 67824160
SHA256 (KDE/Qt/5.15.0/qtquickcontrols-everywhere-src-5.15.0.tar.xz) = 7072cf4cd27e9f18b36b1c48dec7c79608cf87ba847d3fc3de133f220ec1acee
SIZE (KDE/Qt/5.15.0/qtquickcontrols-everywhere-src-5.15.0.tar.xz) = 5981340
SHA256 (KDE/Qt/5.15.0/qtquickcontrols2-everywhere-src-5.15.0.tar.xz) = 839abda9b58cd8656b2e5f46afbb484e63df466481ace43318c4c2022684648f
SIZE (KDE/Qt/5.15.0/qtquickcontrols2-everywhere-src-5.15.0.tar.xz) = 8164236
SHA256 (KDE/Qt/5.15.0/qtquicktimeline-everywhere-src-5.15.0.tar.xz) = 16ffeb733ba15815121fca5705ed5220ce0a0eb2ec0431ad0d55da9426a03c00
SIZE (KDE/Qt/5.15.0/qtquicktimeline-everywhere-src-5.15.0.tar.xz) = 102460
SHA256 (KDE/Qt/5.15.0/qtremoteobjects-everywhere-src-5.15.0.tar.xz) = 86fcfdce77f13c7babdec4dc1d0c4b7b6b02e40120a4250dc59e911c53c08abf
SIZE (KDE/Qt/5.15.0/qtremoteobjects-everywhere-src-5.15.0.tar.xz) = 369100
SHA256 (KDE/Qt/5.15.0/qtscript-everywhere-src-5.15.0.tar.xz) = 02dc21b309621876a89671be27cea86a58e74a96aa28da65fe1b37a3aad29373
SIZE (KDE/Qt/5.15.0/qtscript-everywhere-src-5.15.0.tar.xz) = 2654416
SHA256 (KDE/Qt/5.15.0/qtscxml-everywhere-src-5.15.0.tar.xz) = 9c3a72bf5ebd07553b0049cc1943f04cff93b7e53bde8c81d652422dbf12ff72
SIZE (KDE/Qt/5.15.0/qtscxml-everywhere-src-5.15.0.tar.xz) = 433368
SHA256 (KDE/Qt/5.15.0/qtsensors-everywhere-src-5.15.0.tar.xz) = 12b17ed6cbe6c49c8ab71958bc5d8ad1c42bf20e2fa72613ede11001e98144da
SIZE (KDE/Qt/5.15.0/qtsensors-everywhere-src-5.15.0.tar.xz) = 2050404
SHA256 (KDE/Qt/5.15.0/qtserialbus-everywhere-src-5.15.0.tar.xz) = cee067c84d025e221b83d109b58ea16c4d2dc0af0aea45cc6724acd33a1b7379
SIZE (KDE/Qt/5.15.0/qtserialbus-everywhere-src-5.15.0.tar.xz) = 351232
SHA256 (KDE/Qt/5.15.0/qtserialport-everywhere-src-5.15.0.tar.xz) = ba19369069a707dffddca8d9c477bb2bb4aa26630dfee6792254c4bf9bd57a67
SIZE (KDE/Qt/5.15.0/qtserialport-everywhere-src-5.15.0.tar.xz) = 316596
SHA256 (KDE/Qt/5.15.0/qtspeech-everywhere-src-5.15.0.tar.xz) = 7219a878c14a24d0ca18d52df1717361b13aee96ac9790baf9ad2b383492dd61
SIZE (KDE/Qt/5.15.0/qtspeech-everywhere-src-5.15.0.tar.xz) = 101240
SHA256 (KDE/Qt/5.15.0/qtsvg-everywhere-src-5.15.0.tar.xz) = ee4d287e2e205ca8c08921b9cbe0fc58bf46be080b5359ad4d7fbdee44aeee0d
SIZE (KDE/Qt/5.15.0/qtsvg-everywhere-src-5.15.0.tar.xz) = 1870588
SHA256 (KDE/Qt/5.15.0/qttools-everywhere-src-5.15.0.tar.xz) = ddbcb49aab3a2e3672582c6e2e7bec0058feff790f67472343c79e2895e0e437
SIZE (KDE/Qt/5.15.0/qttools-everywhere-src-5.15.0.tar.xz) = 8850752
SHA256 (KDE/Qt/5.15.0/qttranslations-everywhere-src-5.15.0.tar.xz) = 45c43268d9df50784d4d8ca345fce9288a1055fd074ac0ef508097f7aeba22fe
SIZE (KDE/Qt/5.15.0/qttranslations-everywhere-src-5.15.0.tar.xz) = 1356928
SHA256 (KDE/Qt/5.15.0/qtvirtualkeyboard-everywhere-src-5.15.0.tar.xz) = f22f9204ab65578d9c8aa832a8a39108f826e00a7d391c7884ff490c587f34be
SIZE (KDE/Qt/5.15.0/qtvirtualkeyboard-everywhere-src-5.15.0.tar.xz) = 10957752
SHA256 (KDE/Qt/5.15.0/qtwayland-everywhere-src-5.15.0.tar.xz) = 084133e10bfbd32a28125639660c59975f23457bba6a79b30a25802cec76a9fb
SIZE (KDE/Qt/5.15.0/qtwayland-everywhere-src-5.15.0.tar.xz) = 562408
SHA256 (KDE/Qt/5.15.0/qtwebchannel-everywhere-src-5.15.0.tar.xz) = ea80510b363e6f92ce99932f06d176e43459c4a5159fe97b5ef96fcfbab5ed4f
SIZE (KDE/Qt/5.15.0/qtwebchannel-everywhere-src-5.15.0.tar.xz) = 202844
SHA256 (KDE/Qt/5.15.0/qtwebengine-everywhere-src-5.15.0.tar.xz) = c38e2fda7ed1b7d5a90f26abf231ec0715d78a5bc39a94673d8e39d75f04c5df
SIZE (KDE/Qt/5.15.0/qtwebengine-everywhere-src-5.15.0.tar.xz) = 278257432
SHA256 (KDE/Qt/5.15.0/qtwebglplugin-everywhere-src-5.15.0.tar.xz) = f7b81f25ddf7b3a0046daa7224bc1e18c8b754b00b1a33775f30f827a5cdca15
SIZE (KDE/Qt/5.15.0/qtwebglplugin-everywhere-src-5.15.0.tar.xz) = 73956
SHA256 (KDE/Qt/5.15.0/qtwebsockets-everywhere-src-5.15.0.tar.xz) = 87c2f6542778f9b65b3f208740c1d0db643fd0bede21404b9abb265355da5092
SIZE (KDE/Qt/5.15.0/qtwebsockets-everywhere-src-5.15.0.tar.xz) = 253616
SHA256 (KDE/Qt/5.15.0/qtwebview-everywhere-src-5.15.0.tar.xz) = b87ea205ce79c6b438ebe596e91fa80ba11f6aac7e89ffbf52b337d0fc8d6660
SIZE (KDE/Qt/5.15.0/qtwebview-everywhere-src-5.15.0.tar.xz) = 133044
SHA256 (KDE/Qt/5.15.0/qtwinextras-everywhere-src-5.15.0.tar.xz) = d77f2cb2ce83bdbfd0a970bc8d7d11c96b2df16befc257d6594f79dfd92abff0
SIZE (KDE/Qt/5.15.0/qtwinextras-everywhere-src-5.15.0.tar.xz) = 763572
SHA256 (KDE/Qt/5.15.0/qtx11extras-everywhere-src-5.15.0.tar.xz) = c72b6c188284facddcf82835af048240e721dc8d6d9e8a7bd71d76fd876881a1
SIZE (KDE/Qt/5.15.0/qtx11extras-everywhere-src-5.15.0.tar.xz) = 135648
SHA256 (KDE/Qt/5.15.0/qtxmlpatterns-everywhere-src-5.15.0.tar.xz) = 2752cf2aa25ebfda89c3736457e27b3d0c7c7ed290dcfd52c209f9f905998507
SIZE (KDE/Qt/5.15.0/qtxmlpatterns-everywhere-src-5.15.0.tar.xz) = 1403484
TIMESTAMP = 1605899522
SHA256 (KDE/Qt/5.15.2/qt3d-everywhere-src-5.15.2.tar.xz) = 03ed6a48c813c75296c19f5d721184ab168280b69d2656cf16f877d3d4c55c1d
SIZE (KDE/Qt/5.15.2/qt3d-everywhere-src-5.15.2.tar.xz) = 81925416
SHA256 (KDE/Qt/5.15.2/qtactiveqt-everywhere-src-5.15.2.tar.xz) = 868161fee0876d17079cd5bed58d1667bf19ffd0018cbe515129f11510ad2a5c
SIZE (KDE/Qt/5.15.2/qtactiveqt-everywhere-src-5.15.2.tar.xz) = 268380
SHA256 (KDE/Qt/5.15.2/qtandroidextras-everywhere-src-5.15.2.tar.xz) = 5813278690d89a9c232eccf697fc280034de6f9f02a7c40d95ad5fcf8ac8dabd
SIZE (KDE/Qt/5.15.2/qtandroidextras-everywhere-src-5.15.2.tar.xz) = 276344
SHA256 (KDE/Qt/5.15.2/qtbase-everywhere-src-5.15.2.tar.xz) = 909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8
SIZE (KDE/Qt/5.15.2/qtbase-everywhere-src-5.15.2.tar.xz) = 50179672
SHA256 (KDE/Qt/5.15.2/qtcharts-everywhere-src-5.15.2.tar.xz) = e0750e4195bd8a8b9758ab4d98d437edbe273cd3d289dd6a8f325df6d13f3d11
SIZE (KDE/Qt/5.15.2/qtcharts-everywhere-src-5.15.2.tar.xz) = 4251992
SHA256 (KDE/Qt/5.15.2/qtconnectivity-everywhere-src-5.15.2.tar.xz) = 0380327871f76103e5b8c2a305988d76d352b6a982b3e7b3bc3cdc184c64bfa0
SIZE (KDE/Qt/5.15.2/qtconnectivity-everywhere-src-5.15.2.tar.xz) = 2815492
SHA256 (KDE/Qt/5.15.2/qtdatavis3d-everywhere-src-5.15.2.tar.xz) = 226a6575d573ad78aca459709722c496c23aee526aa0c38eb7c93b0bea1eb6fd
SIZE (KDE/Qt/5.15.2/qtdatavis3d-everywhere-src-5.15.2.tar.xz) = 5191436
SHA256 (KDE/Qt/5.15.2/qtdeclarative-everywhere-src-5.15.2.tar.xz) = c600d09716940f75d684f61c5bdaced797f623a86db1627da599027f6c635651
SIZE (KDE/Qt/5.15.2/qtdeclarative-everywhere-src-5.15.2.tar.xz) = 21559880
SHA256 (KDE/Qt/5.15.2/qtdoc-everywhere-src-5.15.2.tar.xz) = a47809f00f1bd690ca4e699cb32ffe7717d43da84e0167d1f562210da7714ce4
SIZE (KDE/Qt/5.15.2/qtdoc-everywhere-src-5.15.2.tar.xz) = 5746492
SHA256 (KDE/Qt/5.15.2/qtgamepad-everywhere-src-5.15.2.tar.xz) = c77611f7898326d69176ad67a9b886f617cdedc368ec29f223d63537d25b075c
SIZE (KDE/Qt/5.15.2/qtgamepad-everywhere-src-5.15.2.tar.xz) = 387084
SHA256 (KDE/Qt/5.15.2/qtgraphicaleffects-everywhere-src-5.15.2.tar.xz) = ec8d67f64967d5046410490b549c576f9b9e8b47ec68594ae84aa8870173dfe4
SIZE (KDE/Qt/5.15.2/qtgraphicaleffects-everywhere-src-5.15.2.tar.xz) = 14040900
SHA256 (KDE/Qt/5.15.2/qtimageformats-everywhere-src-5.15.2.tar.xz) = bf8285c7ce04284527ab823ddc7cf48a1bb79131db3a7127342167f4814253d7
SIZE (KDE/Qt/5.15.2/qtimageformats-everywhere-src-5.15.2.tar.xz) = 1806740
SHA256 (KDE/Qt/5.15.2/qtlocation-everywhere-src-5.15.2.tar.xz) = 984fcb09e108df49a8dac35d5ce6dffc49caafd2acb1c2f8a5173a6a21f392a0
SIZE (KDE/Qt/5.15.2/qtlocation-everywhere-src-5.15.2.tar.xz) = 6556764
SHA256 (KDE/Qt/5.15.2/qtlottie-everywhere-src-5.15.2.tar.xz) = cec6095ab8f714e609d2ad3ea8c4fd819461ce8793adc42abe37d0f6dc432517
SIZE (KDE/Qt/5.15.2/qtlottie-everywhere-src-5.15.2.tar.xz) = 82424
SHA256 (KDE/Qt/5.15.2/qtmacextras-everywhere-src-5.15.2.tar.xz) = 6959b0f2cec71cd66800f36cab797430860e55fa33c9c23698d6a08fc2b8776e
SIZE (KDE/Qt/5.15.2/qtmacextras-everywhere-src-5.15.2.tar.xz) = 69484
SHA256 (KDE/Qt/5.15.2/qtmultimedia-everywhere-src-5.15.2.tar.xz) = 0c3758810e5131aabcf76e4965e4c18b8911af54d9edd9305d2a8278d8346df5
SIZE (KDE/Qt/5.15.2/qtmultimedia-everywhere-src-5.15.2.tar.xz) = 3828172
SHA256 (KDE/Qt/5.15.2/qtnetworkauth-everywhere-src-5.15.2.tar.xz) = fcc2ec42faa68561efa8f00cd72e662fbc06563ebc6de1dc42d96bb2997acd85
SIZE (KDE/Qt/5.15.2/qtnetworkauth-everywhere-src-5.15.2.tar.xz) = 141688
SHA256 (KDE/Qt/5.15.2/qtpurchasing-everywhere-src-5.15.2.tar.xz) = 87120d319ff2f8106e78971f7296d72a66dfe91e763d213199aea55046e93227
SIZE (KDE/Qt/5.15.2/qtpurchasing-everywhere-src-5.15.2.tar.xz) = 208804
SHA256 (KDE/Qt/5.15.2/qtquick3d-everywhere-src-5.15.2.tar.xz) = 5b0546323365ce34e4716f22f305ebb4902e222c1a0910b65ee448443c2f94bb
SIZE (KDE/Qt/5.15.2/qtquick3d-everywhere-src-5.15.2.tar.xz) = 55767288
SHA256 (KDE/Qt/5.15.2/qtquickcontrols-everywhere-src-5.15.2.tar.xz) = c393fb7384b1f047f10e91a6832cf3e6a4c2a41408b8cb2d05af2283e8549fb5
SIZE (KDE/Qt/5.15.2/qtquickcontrols-everywhere-src-5.15.2.tar.xz) = 5982344
SHA256 (KDE/Qt/5.15.2/qtquickcontrols2-everywhere-src-5.15.2.tar.xz) = 671b6ce5f4b8ecc94db622d5d5fb29ef4ff92819be08e5ea55bfcab579de8919
SIZE (KDE/Qt/5.15.2/qtquickcontrols2-everywhere-src-5.15.2.tar.xz) = 8284692
SHA256 (KDE/Qt/5.15.2/qtquicktimeline-everywhere-src-5.15.2.tar.xz) = b9c247227607437acec7c7dd18ad46179d20369c9d22bdb1e9fc128dfb832a28
SIZE (KDE/Qt/5.15.2/qtquicktimeline-everywhere-src-5.15.2.tar.xz) = 102624
SHA256 (KDE/Qt/5.15.2/qtremoteobjects-everywhere-src-5.15.2.tar.xz) = 6781b6bc90888254ea77ce812736dac00c67fa4eeb3095f5cd65e4b9c15dcfc2
SIZE (KDE/Qt/5.15.2/qtremoteobjects-everywhere-src-5.15.2.tar.xz) = 374740
SHA256 (KDE/Qt/5.15.2/qtscript-everywhere-src-5.15.2.tar.xz) = a299715369afbd1caa4d7fa2875d442eab91adcaacafce54a36922442624673e
SIZE (KDE/Qt/5.15.2/qtscript-everywhere-src-5.15.2.tar.xz) = 2663016
SHA256 (KDE/Qt/5.15.2/qtscxml-everywhere-src-5.15.2.tar.xz) = 60b9590b9a41c60cee7b8a8c8410ee4625f0389c1ff8d79883ec5a985638a7dc
SIZE (KDE/Qt/5.15.2/qtscxml-everywhere-src-5.15.2.tar.xz) = 434204
SHA256 (KDE/Qt/5.15.2/qtsensors-everywhere-src-5.15.2.tar.xz) = 3f0011f9e9942cad119146b54d960438f4568a22a274cdad4fae06bb4e0e4839
SIZE (KDE/Qt/5.15.2/qtsensors-everywhere-src-5.15.2.tar.xz) = 2056944
SHA256 (KDE/Qt/5.15.2/qtserialbus-everywhere-src-5.15.2.tar.xz) = aeeb7e5c0d3f8503215b22e1a84c0002ca67cf63862f6e3c6ef44a67ca31bd88
SIZE (KDE/Qt/5.15.2/qtserialbus-everywhere-src-5.15.2.tar.xz) = 356360
SHA256 (KDE/Qt/5.15.2/qtserialport-everywhere-src-5.15.2.tar.xz) = 59c559d748417306bc1b2cf2315c1e63eed011ace38ad92946af71f23e2ef79d
SIZE (KDE/Qt/5.15.2/qtserialport-everywhere-src-5.15.2.tar.xz) = 321496
SHA256 (KDE/Qt/5.15.2/qtspeech-everywhere-src-5.15.2.tar.xz) = c810fb9eecb08026434422a32e79269627f3bc2941be199e86ec410bdfe883f5
SIZE (KDE/Qt/5.15.2/qtspeech-everywhere-src-5.15.2.tar.xz) = 101940
SHA256 (KDE/Qt/5.15.2/qtsvg-everywhere-src-5.15.2.tar.xz) = 8bc3c2c1bc2671e9c67d4205589a8309b57903721ad14c60ea21a5d06acb585e
SIZE (KDE/Qt/5.15.2/qtsvg-everywhere-src-5.15.2.tar.xz) = 1886268
SHA256 (KDE/Qt/5.15.2/qttools-everywhere-src-5.15.2.tar.xz) = c189d0ce1ff7c739db9a3ace52ac3e24cb8fd6dbf234e49f075249b38f43c1cc
SIZE (KDE/Qt/5.15.2/qttools-everywhere-src-5.15.2.tar.xz) = 8894728
SHA256 (KDE/Qt/5.15.2/qttranslations-everywhere-src-5.15.2.tar.xz) = d5788e86257b21d5323f1efd94376a213e091d1e5e03b45a95dd052b5f570db8
SIZE (KDE/Qt/5.15.2/qttranslations-everywhere-src-5.15.2.tar.xz) = 1419504
SHA256 (KDE/Qt/5.15.2/qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz) = 9a3193913be30f09a896e3b8c2f9696d2e9b3f88a63ae9ca8c97a2786b68cf55
SIZE (KDE/Qt/5.15.2/qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz) = 10955076
SHA256 (KDE/Qt/5.15.2/qtwayland-everywhere-src-5.15.2.tar.xz) = 193732229ff816f3aaab9a5e2f6bed71ddddbf1988ce003fe8dd84a92ce9aeb5
SIZE (KDE/Qt/5.15.2/qtwayland-everywhere-src-5.15.2.tar.xz) = 564884
SHA256 (KDE/Qt/5.15.2/qtwebchannel-everywhere-src-5.15.2.tar.xz) = 127fe79c43b386713f151ed7d411cd81e45e29f9c955584f29736f78c9303ec1
SIZE (KDE/Qt/5.15.2/qtwebchannel-everywhere-src-5.15.2.tar.xz) = 209208
SHA256 (KDE/Qt/5.15.2/qtwebengine-everywhere-src-5.15.2.tar.xz) = c8afca0e43d84f7bd595436fbe4d13a5bbdb81ec5104d605085d07545b6f91e0
SIZE (KDE/Qt/5.15.2/qtwebengine-everywhere-src-5.15.2.tar.xz) = 280142544
SHA256 (KDE/Qt/5.15.2/qtwebglplugin-everywhere-src-5.15.2.tar.xz) = 81e782b517ed29e10bea1aa90c9f59274c98a910f2c8b105fa78368a36b41446
SIZE (KDE/Qt/5.15.2/qtwebglplugin-everywhere-src-5.15.2.tar.xz) = 74144
SHA256 (KDE/Qt/5.15.2/qtwebsockets-everywhere-src-5.15.2.tar.xz) = a0b42d85dd34ff6e2d23400e02f83d8b85bcd80e60efd1521d12d9625d4a233f
SIZE (KDE/Qt/5.15.2/qtwebsockets-everywhere-src-5.15.2.tar.xz) = 259000
SHA256 (KDE/Qt/5.15.2/qtwebview-everywhere-src-5.15.2.tar.xz) = be9f46167e4977ead5ef5ecf883fdb812a4120f2436383583792f65557e481e7
SIZE (KDE/Qt/5.15.2/qtwebview-everywhere-src-5.15.2.tar.xz) = 133428
SHA256 (KDE/Qt/5.15.2/qtwinextras-everywhere-src-5.15.2.tar.xz) = 65b8272005dec00791ab7d81ab266d1e3313a3bbd8e54e546d984cf4c4ab550e
SIZE (KDE/Qt/5.15.2/qtwinextras-everywhere-src-5.15.2.tar.xz) = 763948
SHA256 (KDE/Qt/5.15.2/qtx11extras-everywhere-src-5.15.2.tar.xz) = 7014702ee9a644a5a93da70848ac47c18851d4f8ed622b29a72eed9282fc6e3e
SIZE (KDE/Qt/5.15.2/qtx11extras-everywhere-src-5.15.2.tar.xz) = 143972
SHA256 (KDE/Qt/5.15.2/qtxmlpatterns-everywhere-src-5.15.2.tar.xz) = 76ea2162a7c349188d7e7e4f6c77b78e8a205494c90fee3cea3487a1ae2cf2fa
SIZE (KDE/Qt/5.15.2/qtxmlpatterns-everywhere-src-5.15.2.tar.xz) = 5209380

2
devel/shiboken2/Makefile
View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= shiboken2
DISTVERSION= 5.15.1
DISTVERSION= 5.15.2
CATEGORIES= devel
MASTER_SITES= QT/official_releases/QtForPython/shiboken2/PySide2-${DISTVERSION}-src
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

6
devel/shiboken2/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1601626006
SHA256 (pyside-setup-opensource-src-5.15.1.tar.xz) = f175c1d8813257904cf0efeb58e44f68d53b9916f73adaf9ce19514c0271c3fa
SIZE (pyside-setup-opensource-src-5.15.1.tar.xz) = 3454052
TIMESTAMP = 1606807809
SHA256 (pyside-setup-opensource-src-5.15.2.tar.xz) = b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418
SIZE (pyside-setup-opensource-src-5.15.2.tar.xz) = 3472624

1
devel/shiboken2/pkg-plist
View File

@ -22,6 +22,7 @@ include/shiboken2/shiboken.h
include/shiboken2/shibokenbuffer.h
include/shiboken2/shibokenmacros.h
include/shiboken2/signature.h
include/shiboken2/signature_p.h
include/shiboken2/threadstatesaver.h
include/shiboken2/typespec.h
include/shiboken2/voidptr.h

2
devel/tortoisehg/Makefile
View File

@ -15,7 +15,7 @@ RUN_DEPENDS= ${PY_MERCURIAL} \
${PYTHON_PKGNAMEPREFIX}iniparse>=0.4:devel/py-iniparse@${PY_FLAVOR} \
${PY_PYGMENTS}
USES= pyqt:5 python
USES= pyqt:5 python:3.5+
USE_PYQT= core gui network qscintilla2 xml
USE_PYTHON= distutils autoplist

13
graphics/fractgen/files/patch-git-48cf904f47d9eb3819e6e5f6c19feaae0a3bf901.diff Normal file
View File

@ -0,0 +1,13 @@
diff --git src/fractalgenerator.cc src/fractalgenerator.cc
index dc8fb31..8f5d399 100644
--- src/fractalgenerator.cc
+++ src/fractalgenerator.cc
@@ -128,7 +128,7 @@ FractalGeneratorApp::FractalGeneratorApp(QWidget* parent, const QString& fileNam
helpMenu->addAction(tr("&About"), this, SLOT(slotHelpAbout()));
Printer.setColorMode(QPrinter::Color);
- Printer.setOrientation(QPrinter::Landscape);
+ Printer.setPageOrientation(QPageLayout::Landscape);
Printer.setOutputFileName(tr("Fractal.pdf"));
statusBar()->showMessage(tr("Welcome to FractGen!"), 3000);

16
graphics/py-python-poppler-qt5/Makefile
View File

@ -13,18 +13,22 @@ COMMENT= Python bindings for the Poppler-Qt PDF rendering library
LICENSE= LGPL21 LGPL3
LICENSE_COMB= dual
BUILD_DEPENDS= qmake:devel/qt5-qmake
LIB_DEPENDS= libpoppler-qt5.so:graphics/poppler-qt5
USES= compiler:c++11-lang pkgconfig pyqt:5 python:3.4+ qmake qt:5
USES= compiler:c++11-lang pkgconfig pyqt:5 python:3.5+ qt:5
USE_GITHUB= yes
GH_ACCOUNT= frescobaldi
USE_PYQT= gui xml sip_build
USE_PYTHON= autoplist distutils
USE_PYQT= gui xml sip_build qtbuilder
PYDISTUTILS_BUILD_TARGET= build_ext
PYDISTUTILS_BUILDARGS+= --pyqt-sip-dir=${PYQT_SIPDIR}
do-build:
(cd ${WRKSRC} ; sip-build --verbose --no-make --build-dir build ; ${MAKE} -C ./build )
do-install:
(cd ${WRKSRC} ; ${MAKE} -C ./build install INSTALL_ROOT=${STAGEDIR} )
post-install:
@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/popplerqt5.so
${RLN} ${STAGEDIR}${PYTHON_SITELIBDIR}/popplerqt5.cpython-${PYTHON_SUFFIX}m.so ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/popplerqt5.so
@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/popplerqt5.cpython-${PYTHON_SUFFIX}m.so
.include <bsd.port.mk>

13
graphics/py-python-poppler-qt5/files/patch-poppler-qt5.sip Normal file
View File

@ -0,0 +1,13 @@
From https://github.com/frescobaldi/python-poppler-qt5/pull/41/commits/4ee58b6ee02772db915fdc5e70e336e0e5b2f34c
--- poppler-qt5.sip.orig 2019-11-22 05:56:45 UTC
+++ poppler-qt5.sip
@@ -19,7 +19,7 @@
#include <qt5/poppler-qt5.h>
%End
-%Include version.sip // auto-generated by the setup.py script
+%Include version.sip // auto-generated by the project.py script
%Include types.sip
%Include poppler-annotation.sip

94
graphics/py-python-poppler-qt5/files/patch-project.py Normal file
View File

@ -0,0 +1,94 @@
From https://github.com/frescobaldi/python-poppler-qt5/pull/41/commits/4ee58b6ee02772db915fdc5e70e336e0e5b2f34c
--- project.py.orig 2020-10-11 18:59:42 UTC
+++ project.py
@@ -0,0 +1,89 @@
+"""The build configuration file for Python-Poppler-Qt5, used by sip."""
+
+from os.path import join
+import re
+import subprocess
+from pyqtbuild import PyQtBindings, PyQtProject
+from sipbuild import Option
+import PyQt5
+
+
+class PythonPopplerQt5(PyQtProject):
+ """The Project class."""
+
+ def __init__(self):
+ super().__init__()
+ self.bindings_factories = [PopplerQt5Bindings]
+
+ def update(self, tool):
+ """Allows SIP to find PyQt5 .sip files."""
+ super().update(tool)
+ self.sip_include_dirs.append(join(PyQt5.__path__[0], 'bindings'))
+
+
+class PopplerQt5Bindings(PyQtBindings):
+ """The Poppler-Qt5 Bindings class."""
+
+ def __init__(self, project):
+ super().__init__(project, name='Poppler-Qt5',
+ sip_file='poppler-qt5.sip',
+ qmake_QT=['xml'])
+
+ def get_options(self):
+ """Our custom options that a user can pass to sip-build."""
+ options = super().get_options()
+ options.append(
+ Option('poppler_version',
+ help='version of the poppler library',
+ metavar='VERSION'))
+ return options
+
+ @staticmethod
+ def run_pkg_config(option):
+ output = subprocess.check_output(
+ ['pkg-config', option, 'poppler-qt5'],
+ text=True)
+ return output.rstrip()
+
+ def apply_user_defaults(self, tool):
+ # Set include_dirs, library_dirs and libraries based on pkg-config data
+ cflags = self.run_pkg_config('--cflags-only-I').split()
+ libs = self.run_pkg_config('--libs').split()
+ self.include_dirs.extend(
+ flag[2:] for flag in cflags if flag.startswith('-I'))
+ self.library_dirs.extend(
+ flag[2:] for flag in libs if flag.startswith('-L'))
+ self.libraries.extend(
+ flag[2:] for flag in libs if flag.startswith('-l'))
+
+ # Generate version.sip file
+ if self.poppler_version is not None:
+ poppler_qt5_version = self.poppler_version
+ else:
+ poppler_qt5_version = self.run_pkg_config('--modversion')
+ poppler_qt5_version = tuple(map(int, poppler_qt5_version.split('.')))
+ python_poppler_qt5_version = self.project.version_str.split('.')
+ format_dict = {
+ 'vlen': 'i' * len(python_poppler_qt5_version),
+ 'vargs': ', '.join(python_poppler_qt5_version),
+ 'pvlen': 'i' * len(poppler_qt5_version),
+ 'pvargs': ', '.join(map(str, poppler_qt5_version)),
+ }
+ with open('version.sip.in') as template_file:
+ version_sip_template = template_file.read()
+ with open('version.sip', 'w') as version_file:
+ version_file.write(version_sip_template.format(**format_dict))
+
+ # Add Poppler version tag
+ if poppler_qt5_version:
+ with open('timeline.sip') as timeline_file:
+ timeline = timeline_file.read()
+ for match in re.finditer(r'POPPLER_V(\d+)_(\d+)_(\d+)', timeline):
+ if poppler_qt5_version < tuple(map(int, match.group(1, 2, 3))):
+ break
+ tag = match.group()
+ else:
+ tag = 'POPPLER_V0_20_0'
+ self.tags.append(tag)
+ self.tags.append("WS_X11")
+ super().apply_user_defaults(tool)

42
graphics/py-python-poppler-qt5/files/patch-pyproject.toml Normal file
View File

@ -0,0 +1,42 @@
From https://github.com/frescobaldi/python-poppler-qt5/pull/41/commits/4ee58b6ee02772db915fdc5e70e336e0e5b2f34c
--- pyproject.toml.orig 2020-10-11 18:59:42 UTC
+++ pyproject.toml
@@ -0,0 +1,37 @@
+[build-system]
+requires = ["sip >=5", "PyQt-builder", "PyQt5"]
+build-backend = "sipbuild.api"
+
+[tool.sip.metadata]
+name = "python-poppler-qt5"
+version = "0.75.0"
+summary = "A Python binding to Poppler-Qt5"
+description-file = "README.rst"
+home-page = "https://github.com/frescobaldi/python-poppler-qt5"
+maintainer = "Wilbert Berendsen"
+maintainer-email = "wbsoft@xs4all.nl"
+license = "LGPL"
+classifier = [
+ "Development Status :: 5 - Production/Stable",
+ "Intended Audience :: Developers",
+ "License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)",
+ "Operating System :: MacOS :: MacOS X",
+ "Operating System :: Microsoft :: Windows",
+ "Operating System :: POSIX",
+ "Programming Language :: Python :: 3",
+ "Topic :: Multimedia :: Graphics :: Viewers"
+]
+requires-dist = "PyQt5"
+
+[tool.sip.project]
+sip-files-dir = "."
+sdist-excludes = [
+ "version.sip",
+ ".git/*",
+ ".git/*/*",
+ ".git/*/*/*",
+ ".git/*/*/*/*",
+ ".git/*/*/*/*/*",
+ ".git/*/*/*/*/*/*",
+ ".git/*/*/*/*/*/*/*"
+]

60
graphics/py-python-poppler-qt5/files/patch-types.sip Normal file
View File

@ -0,0 +1,60 @@
From https://github.com/frescobaldi/python-poppler-qt5/pull/33/commits/6cc4d83b172ffb2d206e696ce508e508cd46b7c3
--- types.sip.orig 2019-11-22 05:56:45 UTC
+++ types.sip
@@ -182,7 +182,7 @@ template <TYPE>
if ((l = PyList_New(sipCpp->size())) == NULL)
return NULL;
- const sipMappedType* qlinkedlist_type = sipFindMappedType("QLinkedList<TYPE>");
+ const sipTypeDef* qlinkedlist_type = sipFindType("QLinkedList<TYPE>");
// Set the list elements.
for (int i = 0; i < sipCpp->size(); ++i)
@@ -190,7 +190,7 @@ template <TYPE>
QLinkedList<TYPE>* t = new QLinkedList<TYPE>(sipCpp->at(i));
PyObject *tobj;
- if ((tobj = sipConvertFromMappedType(t, qlinkedlist_type, sipTransferObj)) == NULL)
+ if ((tobj = sipConvertFromType(t, qlinkedlist_type, sipTransferObj)) == NULL)
{
Py_DECREF(l);
delete t;
@@ -203,7 +203,7 @@ template <TYPE>
%End
%ConvertToTypeCode
- const sipMappedType* qlinkedlist_type = sipFindMappedType("QLinkedList<TYPE>");
+ const sipTypeDef* qlinkedlist_type = sipFindType("QLinkedList<TYPE>");
// Check the type if that is all that is required.
if (sipIsErr == NULL)
@@ -212,7 +212,7 @@ template <TYPE>
return 0;
for (int i = 0; i < PySequence_Size(sipPy); ++i)
- if (!sipCanConvertToMappedType(PySequence_ITEM(sipPy, i), qlinkedlist_type, SIP_NOT_NONE))
+ if (!sipCanConvertToType(PySequence_ITEM(sipPy, i), qlinkedlist_type, SIP_NOT_NONE))
return 0;
return 1;
@@ -224,16 +224,16 @@ template <TYPE>
for (int i = 0; i < PySequence_Size(sipPy); ++i)
{
int state;
- QLinkedList<TYPE> * t = reinterpret_cast< QLinkedList<TYPE> * >(sipConvertToMappedType(PySequence_ITEM(sipPy, i), qlinkedlist_type, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
+ QLinkedList<TYPE> * t = reinterpret_cast< QLinkedList<TYPE> * >(sipConvertToType(PySequence_ITEM(sipPy, i), qlinkedlist_type, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
if (*sipIsErr)
{
- sipReleaseInstance(t, sipClass_TYPE, state);
+ sipReleaseType(t, qlinkedlist_type, state);
delete ql;
return 0;
}
ql->append(*t);
- sipReleaseInstance(t, sipClass_TYPE, state);
+ sipReleaseType(t, qlinkedlist_type, state);
}
*sipCppPtr = ql;

26
graphics/py-python-poppler-qt5/files/patch-version.sip.in Normal file
View File

@ -0,0 +1,26 @@
From https://github.com/frescobaldi/python-poppler-qt5/pull/41/commits/4ee58b6ee02772db915fdc5e70e336e0e5b2f34c
--- version.sip.in.orig 2020-10-11 18:59:42 UTC
+++ version.sip.in
@@ -0,0 +1,21 @@
+// Generated by project.py -- Do not edit
+
+PyObject *version();
+%Docstring
+The version of the popplerqt5 python module.
+%End
+
+PyObject *poppler_version();
+%Docstring
+The version of the Poppler library it was built with.
+%End
+
+%ModuleCode
+
+PyObject *version()
+{{ return Py_BuildValue("({vlen})", {vargs}); }};
+
+PyObject *poppler_version()
+{{ return Py_BuildValue("({pvlen})", {pvargs}); }};
+
+%End

26
graphics/py-python-poppler-qt5/pkg-plist Normal file
View File

@ -0,0 +1,26 @@
%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-annotation.sip
%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-convert.sip
%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-document.sip
%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-embedded-file.sip
%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-font-info.sip
%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-font-iterator.sip
%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-form.sip
%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-link-destination.sip
%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-link.sip
%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-media.sip
%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-movie-object.sip
%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-opt-content-model.sip
%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-page-transition.sip
%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-page.sip
%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-qt5.sip
%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-sound-object.sip
%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-text-box.sip
%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/popplerqt5.toml
%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/timeline.sip
%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/types.sip
%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/version.sip
%%PYTHON_SITELIBDIR%%/popplerqt5.cpython-%%PYTHON_SUFFIX%%m.so
%%PYTHON_SITELIBDIR%%/popplerqt5.so
%%PYTHON_SITELIBDIR%%/python_poppler_qt5-0.75.0.dist-info/INSTALLER
%%PYTHON_SITELIBDIR%%/python_poppler_qt5-0.75.0.dist-info/METADATA
%%PYTHON_SITELIBDIR%%/python_poppler_qt5-0.75.0.dist-info/RECORD

2
graphics/py-qt5-svg/Makefile
View File

@ -12,7 +12,7 @@ RUN_DEPENDS= ${PY_ENUM34}
CONFIGURE_ARGS= --enable QtSvg
PYQT_DIST= yes
USES= gl python pyqt:5 qt:5
USES= gl python:3.5+ pyqt:5 qt:5
USE_GL= gl
USE_PYQT= sip_build core_run gui_run widgets_run
USE_PYTHON= concurrent flavors py3kplist

8
graphics/qgis-ltr/Makefile
View File

@ -8,6 +8,11 @@ PORTREVISION= 1
CATEGORIES= graphics geography
PKGNAMESUFFIX= -ltr
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
PATCHFILES= 33192f38bc7d.patch:-p1 \
12203f0ce527.patch:-p1 \
6e9d42d70099.patch:-p1
MAINTAINER= rhurlin@FreeBSD.org
COMMENT= Free and Open Source Geographic Information System
@ -86,7 +91,6 @@ RUN_DEPENDS= astyle:devel/astyle \
${PYTHON_PKGNAMEPREFIX}pyproj>=2.1.3:graphics/py-pyproj@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pyrsgis>=0.2.6:graphics/py-pyrsgis@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pytz>=2020.1:devel/py-pytz@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}qt5-quick>=5.13.1:x11-toolkits/py-qt5-quick@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}scikit-image>=0.14.3:graphics/py-scikit-image@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}Shapely>=1.6.4:devel/py-shapely@${PY_FLAVOR} \
@ -109,7 +113,7 @@ USE_QT= 3d buildtools_build core concurrent dbus declarative \
network printsupport qmake_build script serialport \
sql sql-pgsql sql-sqlite3 svg testlib uitools \
webengine widgets webkit xml
USE_PYQT= core gui network qml quickwidgets qscintilla2 \
USE_PYQT= core gui network qml quick quickwidgets qscintilla2 \
sip sql svg webkit_run webkitwidgets_run xml
CONFLICTS_INSTALL= qgis

6
graphics/qgis-ltr/distinfo
View File

@ -1,3 +1,9 @@
TIMESTAMP = 1606668510
SHA256 (qgis-QGIS-final-3_10_12_GH0.tar.gz) = 2ccd292588246c2ce00739d378028f7d859b9b8bd44ef0216d9846c9854ef130
SIZE (qgis-QGIS-final-3_10_12_GH0.tar.gz) = 122038716
SHA256 (33192f38bc7d.patch) = 97d3f882bea11c5342ddf53f6c055f9f38c5af18edb2d52c116f1dab4a49189b
SIZE (33192f38bc7d.patch) = 12604
SHA256 (12203f0ce527.patch) = bb30342fbf19f1a9150abd97fb1b5d6bbe3f3062bb217a7179332d0b02168235
SIZE (12203f0ce527.patch) = 2452
SHA256 (6e9d42d70099.patch) = 44c3ecc27c839492d9eae2d352e0ea9f37c11a419fb3f8862350b1e52cb359a6
SIZE (6e9d42d70099.patch) = 1513

11
graphics/qgis/Makefile
View File

@ -7,6 +7,8 @@ DISTVERSION= 3_16_1
PORTREVISION= 1
CATEGORIES= graphics geography
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
MAINTAINER= rhurlin@FreeBSD.org
COMMENT= Free and Open Source Geographic Information System
@ -85,7 +87,6 @@ RUN_DEPENDS= astyle:devel/astyle \
${PYTHON_PKGNAMEPREFIX}pyproj>=2.1.3:graphics/py-pyproj@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pyrsgis>=0.2.6:graphics/py-pyrsgis@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pytz>=2020.1:devel/py-pytz@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}qt5-quick>=5.13.1:x11-toolkits/py-qt5-quick@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}scikit-image>=0.14.3:graphics/py-scikit-image@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}Shapely>=1.6.4:devel/py-shapely@${PY_FLAVOR} \
@ -108,8 +109,9 @@ USE_QT= 3d buildtools_build core concurrent dbus declarative \
network printsupport qmake_build script serialport \
sql sql-pgsql sql-sqlite3 svg testlib uitools \
webengine widgets webkit xml
USE_PYQT= core gui network qml quickwidgets qscintilla2 \
sip sql svg webkit_run webkitwidgets_run xml
USE_PYQT= core gui network qml quick quickwidgets qscintilla2 \
pysip sip sql svg webkit_run webkitwidgets_run xml
CONFLICTS_INSTALL= qgis-ltr
@ -160,9 +162,6 @@ post-patch:
@${REINPLACE_CMD} -e 's|"-mllvm -inline-threshold=128"|"-O1"|g' \
${WRKSRC}/src/core/CMakeLists.txt
.endif
@${REINPLACE_CMD} -e 's|%%PYQT_SIPDIR%%|${PYQT_SIPDIR}|' \
${WRKSRC}/cmake/FindPyQt5.py \
${WRKSRC}/cmake/FindSIP.py
pre-configure:
${MKDIR} ${CONFIGURE_WRKSRC}/bin && ${LN} -s ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/bin/python3

11
graphics/qgis/files/patch-cmake_FindPyQt5.py
View File

@ -1,11 +0,0 @@
--- cmake/FindPyQt5.py.orig 2020-08-20 07:52:34 UTC
+++ cmake/FindPyQt5.py
@@ -61,7 +61,7 @@ else: # Code for SIP v5
import shutil
cfg = {
'pyqt_mod_dir': os.path.dirname(PyQt5.__file__),
- 'pyqt_sip_dir': os.path.join(get_python_lib(plat_specific=1), "PyQt5", "bindings"),
+ 'pyqt_sip_dir': "%%PYQT_SIPDIR%%",
'pyqt_bin_dir': os.path.dirname(shutil.which("pyuic5")),
}

9
graphics/qgis/files/patch-cmake_FindSIP.py
View File

@ -1,9 +0,0 @@
--- cmake/FindSIP.py.orig 2020-08-20 07:34:51 UTC
+++ cmake/FindSIP.py
@@ -56,5 +56,5 @@ else: # Code for SIP v5
print("sip_bin:%s" % shutil.which("sip5"))
from distutils.sysconfig import get_python_lib
- python_modules_dir = get_python_lib(plat_specific=1)
+ python_modules_dir = "%%PYQT_SIPDIR%%"
print("default_sip_dir:%s" % python_modules_dir)

3
graphics/qt5-3d/pkg-plist
View File

@ -1185,7 +1185,6 @@
%%QT_CMAKEDIR%%/Qt53DQuickScene2D/Qt53DQuickScene2DConfigVersion.cmake
%%QT_CMAKEDIR%%/Qt53DRender/Qt53DRenderConfig.cmake
%%QT_CMAKEDIR%%/Qt53DRender/Qt53DRenderConfigVersion.cmake
%%QT_CMAKEDIR%%/Qt53DRender/Qt53DRender_AssimpSceneImportPlugin.cmake
%%QT_CMAKEDIR%%/Qt53DRender/Qt53DRender_DefaultGeometryLoaderPlugin.cmake
%%QT_CMAKEDIR%%/Qt53DRender/Qt53DRender_GLTFGeometryLoaderPlugin.cmake
%%QT_CMAKEDIR%%/Qt53DRender/Qt53DRender_GLTFSceneExportPlugin.cmake
@ -1298,8 +1297,6 @@
%%DEBUG%%%%QT_PLUGINDIR%%/renderers/libopenglrenderer.so.debug
%%QT_PLUGINDIR%%/renderplugins/libscene2d.so
%%DEBUG%%%%QT_PLUGINDIR%%/renderplugins/libscene2d.so.debug
%%QT_PLUGINDIR%%/sceneparsers/libassimpsceneimport.so
%%DEBUG%%%%QT_PLUGINDIR%%/sceneparsers/libassimpsceneimport.so.debug
%%QT_PLUGINDIR%%/sceneparsers/libgltfsceneexport.so
%%DEBUG%%%%QT_PLUGINDIR%%/sceneparsers/libgltfsceneexport.so.debug
%%QT_PLUGINDIR%%/sceneparsers/libgltfsceneimport.so

9
graphics/qt5-pixeltool/files/patch-src__src.pro
View File

@ -1,9 +1,9 @@
Only enter the directories we want to build, otherwise we might fail due to
missing dependencies.
--- src/src.pro.orig 2019-02-14 20:02:42 UTC
--- src/src.pro.orig 2020-11-20 20:03:15 UTC
+++ src/src.pro
@@ -1,54 +1,3 @@
@@ -1,55 +1,3 @@
TEMPLATE = subdirs
-qtHaveModule(widgets) {
@ -12,10 +12,11 @@ missing dependencies.
- } else {
- QT_FOR_CONFIG += widgets
- qtConfig(pushbutton):qtConfig(toolbutton) {
- SUBDIRS = assistant \
- designer \
- SUBDIRS = designer \
- pixeltool
-
- !static|contains(QT_PLUGINS, qsqlite): SUBDIRS += assistant
-
- linguist.depends = designer
- }
- qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator

2
lang/py-qt5-qml/Makefile
View File

@ -12,7 +12,7 @@ RUN_DEPENDS= ${PY_ENUM34}
CONFIGURE_ARGS= --enable QtQml
PYQT_DIST= yes
USES= gl python pyqt:5 qt:5
USES= gl python:3.5+ pyqt:5 qt:5
USE_GL= gl
USE_PYQT= sip_build core_run network_run
USE_PYTHON= concurrent flavors py3kplist

5
math/asymptote/Makefile
View File

@ -19,17 +19,16 @@ ONLY_FOR_ARCHS= amd64 i386
LIB_DEPENDS= libcurl.so:ftp/curl \
libsigsegv.so:devel/libsigsegv
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cson>=0.8:devel/py-cson@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}qt5-svg>0:graphics/py-qt5-svg@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}qt5-widgets>0:x11-toolkits/py-qt5-widgets@${PY_FLAVOR} \
${PY_PILLOW}
USES= compiler:c++14-lang gettext-runtime ghostscript gl gmake gnome ncurses perl5 python:3.6+ \
shebangfix tar:tgz
pyqt:5 shebangfix tar:tgz
SHEBANG_FILES= GUI/*.py
USE_GL= gl glu glut
USE_GNOME= librsvg2:run
USE_PERL5= build
USE_TEX= dvipsk formats
USE_PYQT= svg_run widgets_run
CPPFLAGS+= -I${LOCALBASE}/include
GNU_CONFIGURE= yes

2
misc/py-qt5-demo/Makefile
View File

@ -15,7 +15,7 @@ NO_BUILD= yes
PORTSCOUT= limit:^${PYQT5_VERSION}
USES= python pyqt:5
USES= python:3.5+ pyqt:5
USE_PYQT= core_run dbus_run designer_run \
designerplugin_run gui_run multimedia_run \
multimediawidgets_run network_run opengl_run \

6
misc/qt5-examples/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1590590417
SHA256 (KDE/Qt/5.15.0/qt-everywhere-src-5.15.0.tar.xz) = 22b63d7a7a45183865cc4141124f12b673e7a17b1fe2b91e433f6547c5d548c3
SIZE (KDE/Qt/5.15.0/qt-everywhere-src-5.15.0.tar.xz) = 592401236
TIMESTAMP = 1605899661
SHA256 (KDE/Qt/5.15.2/qt-everywhere-src-5.15.2.tar.xz) = 3a530d1b243b5dec00bc54937455471aaa3e56849d2593edb8ded07228202240
SIZE (KDE/Qt/5.15.2/qt-everywhere-src-5.15.2.tar.xz) = 586690220

81
misc/qt5-examples/pkg-plist
View File

@ -101,6 +101,17 @@
%%QT_EXAMPLEDIR%%/activeqt/wrapper/wrapperax.rc
%%QT_EXAMPLEDIR%%/aggregate/examples.pro
%%QT_EXAMPLEDIR%%/androidextras/androidextras.pro
%%QT_EXAMPLEDIR%%/androidextras/customactivity/activityhandler.cpp
%%QT_EXAMPLEDIR%%/androidextras/customactivity/activityhandler.h
%%QT_EXAMPLEDIR%%/androidextras/customactivity/android/AndroidManifest.xml
%%QT_EXAMPLEDIR%%/androidextras/customactivity/android/res/layout/second_activity.xml
%%QT_EXAMPLEDIR%%/androidextras/customactivity/android/res/values/strings.xml
%%QT_EXAMPLEDIR%%/androidextras/customactivity/android/src/org/qtproject/example/activityhandler/CustomActivity.java
%%QT_EXAMPLEDIR%%/androidextras/customactivity/customactivity.pro
%%QT_EXAMPLEDIR%%/androidextras/customactivity/doc/src/qtandroidextras-example-customactivity.qdoc
%%QT_EXAMPLEDIR%%/androidextras/customactivity/main.cpp
%%QT_EXAMPLEDIR%%/androidextras/customactivity/main.qml
%%QT_EXAMPLEDIR%%/androidextras/customactivity/qml.qrc
%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/android/AndroidManifest.xml
%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/android/res/drawable-hdpi/icon.png
%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/android/res/drawable-ldpi/icon.png
@ -116,6 +127,15 @@
%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/main.cpp
%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/main.qml
%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/qml.qrc
%%QT_EXAMPLEDIR%%/androidextras/musiclist/android/AndroidManifest.xml
%%QT_EXAMPLEDIR%%/androidextras/musiclist/android/src/org/qtproject/example/musiclist/MusicList.java
%%QT_EXAMPLEDIR%%/androidextras/musiclist/doc/src/qtandroidextras-example-musiclist.qdoc
%%QT_EXAMPLEDIR%%/androidextras/musiclist/main.cpp
%%QT_EXAMPLEDIR%%/androidextras/musiclist/main.qml
%%QT_EXAMPLEDIR%%/androidextras/musiclist/musiclist.cpp
%%QT_EXAMPLEDIR%%/androidextras/musiclist/musiclist.h
%%QT_EXAMPLEDIR%%/androidextras/musiclist/musiclist.pro
%%QT_EXAMPLEDIR%%/androidextras/musiclist/qml.qrc
%%QT_EXAMPLEDIR%%/androidextras/notification/android/AndroidManifest.xml
%%QT_EXAMPLEDIR%%/androidextras/notification/android/res/drawable-hdpi/icon.png
%%QT_EXAMPLEDIR%%/androidextras/notification/android/res/drawable-ldpi/icon.png
@ -133,6 +153,63 @@
%%QT_EXAMPLEDIR%%/androidextras/notification/notificationclient.cpp
%%QT_EXAMPLEDIR%%/androidextras/notification/notificationclient.h
%%QT_EXAMPLEDIR%%/androidextras/notification/qml/main.qml
%%QT_EXAMPLEDIR%%/androidextras/services/common/common.pri
%%QT_EXAMPLEDIR%%/androidextras/services/common/common_broadcast.pri
%%QT_EXAMPLEDIR%%/androidextras/services/common/common_ro.pri
%%QT_EXAMPLEDIR%%/androidextras/services/common/main.qml
%%QT_EXAMPLEDIR%%/androidextras/services/common/qml.qrc
%%QT_EXAMPLEDIR%%/androidextras/services/common/qtandroidservice.cpp
%%QT_EXAMPLEDIR%%/androidextras/services/common/qtandroidservice.h
%%QT_EXAMPLEDIR%%/androidextras/services/common/qtandroidservice.rep
%%QT_EXAMPLEDIR%%/androidextras/services/common/qtandroidservice_ro.h
%%QT_EXAMPLEDIR%%/androidextras/services/servicebinder/android/AndroidManifest.xml
%%QT_EXAMPLEDIR%%/androidextras/services/servicebinder/android/src/org/qtproject/example/qtandroidservice/QtAndroidService.java
%%QT_EXAMPLEDIR%%/androidextras/services/servicebinder/androidbinder.cpp
%%QT_EXAMPLEDIR%%/androidextras/services/servicebinder/androidbinder.h
%%QT_EXAMPLEDIR%%/androidextras/services/servicebinder/doc/src/qtandroidextras-example-service-binder.qdoc
%%QT_EXAMPLEDIR%%/androidextras/services/servicebinder/main.cpp
%%QT_EXAMPLEDIR%%/androidextras/services/servicebinder/qtandroidservice.cpp
%%QT_EXAMPLEDIR%%/androidextras/services/servicebinder/qtandroidservice.h
%%QT_EXAMPLEDIR%%/androidextras/services/servicebinder/service.pro
%%QT_EXAMPLEDIR%%/androidextras/services/servicebinder/service_main.cpp
%%QT_EXAMPLEDIR%%/androidextras/services/servicebinder/servicebinder.pro
%%QT_EXAMPLEDIR%%/androidextras/services/servicebinder/servicebinderclient.pro
%%QT_EXAMPLEDIR%%/androidextras/services/servicebroadcast/android/AndroidManifest.xml
%%QT_EXAMPLEDIR%%/androidextras/services/servicebroadcast/android/src/org/qtproject/example/qtandroidservice/ActivityUtils.java
%%QT_EXAMPLEDIR%%/androidextras/services/servicebroadcast/android/src/org/qtproject/example/qtandroidservice/QtAndroidService.java
%%QT_EXAMPLEDIR%%/androidextras/services/servicebroadcast/doc/src/qtandroidextras-example-service-broadcastreceiver.qdoc
%%QT_EXAMPLEDIR%%/androidextras/services/servicebroadcast/main.cpp
%%QT_EXAMPLEDIR%%/androidextras/services/servicebroadcast/service.pro
%%QT_EXAMPLEDIR%%/androidextras/services/servicebroadcast/service_main.cpp
%%QT_EXAMPLEDIR%%/androidextras/services/servicebroadcast/servicebroadcast.pro
%%QT_EXAMPLEDIR%%/androidextras/services/servicebroadcast/servicebroadcastclient.pro
%%QT_EXAMPLEDIR%%/androidextras/services/servicebroadcastsamelib/android/AndroidManifest.xml
%%QT_EXAMPLEDIR%%/androidextras/services/servicebroadcastsamelib/android/src/org/qtproject/example/qtandroidservice/ActivityUtils.java
%%QT_EXAMPLEDIR%%/androidextras/services/servicebroadcastsamelib/android/src/org/qtproject/example/qtandroidservice/QtAndroidService.java
%%QT_EXAMPLEDIR%%/androidextras/services/servicebroadcastsamelib/doc/src/qtandroidextras-example-service-broadcastreceiver-samelib.qdoc
%%QT_EXAMPLEDIR%%/androidextras/services/servicebroadcastsamelib/main.cpp
%%QT_EXAMPLEDIR%%/androidextras/services/servicebroadcastsamelib/servicebroadcastsamelib.pro
%%QT_EXAMPLEDIR%%/androidextras/services/serviceremoteobjects/android/AndroidManifest.xml
%%QT_EXAMPLEDIR%%/androidextras/services/serviceremoteobjects/android/src/org/qtproject/example/qtandroidservice/QtAndroidService.java
%%QT_EXAMPLEDIR%%/androidextras/services/serviceremoteobjects/doc/src/qtandroidextras-example-service-remoteobjects.qdoc
%%QT_EXAMPLEDIR%%/androidextras/services/serviceremoteobjects/main.cpp
%%QT_EXAMPLEDIR%%/androidextras/services/serviceremoteobjects/service.pro
%%QT_EXAMPLEDIR%%/androidextras/services/serviceremoteobjects/service_main.cpp
%%QT_EXAMPLEDIR%%/androidextras/services/serviceremoteobjects/serviceremoteobjects.pro
%%QT_EXAMPLEDIR%%/androidextras/services/serviceremoteobjects/serviceremoteobjectsclient.pro
%%QT_EXAMPLEDIR%%/androidextras/services/serviceremoteobjectssamelib/android/AndroidManifest.xml
%%QT_EXAMPLEDIR%%/androidextras/services/serviceremoteobjectssamelib/android/src/org/qtproject/example/qtandroidservice/QtAndroidService.java
%%QT_EXAMPLEDIR%%/androidextras/services/serviceremoteobjectssamelib/doc/src/qtandroidextras-example-service-remoteobjects-samelib.qdoc
%%QT_EXAMPLEDIR%%/androidextras/services/serviceremoteobjectssamelib/main.cpp
%%QT_EXAMPLEDIR%%/androidextras/services/serviceremoteobjectssamelib/serviceremoteobjectssamelib.pro
%%QT_EXAMPLEDIR%%/androidextras/services/services.pro
%%QT_EXAMPLEDIR%%/androidextras/services/servicesameprocess/android/AndroidManifest.xml
%%QT_EXAMPLEDIR%%/androidextras/services/servicesameprocess/android/src/org/qtproject/example/qtandroidservice/QtAndroidService.java
%%QT_EXAMPLEDIR%%/androidextras/services/servicesameprocess/doc/src/qtandroidextras-example-service-same-process.qdoc
%%QT_EXAMPLEDIR%%/androidextras/services/servicesameprocess/main.cpp
%%QT_EXAMPLEDIR%%/androidextras/services/servicesameprocess/qtandroidservice.cpp
%%QT_EXAMPLEDIR%%/androidextras/services/servicesameprocess/qtandroidservice.h
%%QT_EXAMPLEDIR%%/androidextras/services/servicesameprocess/servicesameprocess.pro
%%QT_EXAMPLEDIR%%/assistant/assistant.pro
%%QT_EXAMPLEDIR%%/assistant/doc/images/simpletextviewer-example.png
%%QT_EXAMPLEDIR%%/assistant/doc/images/simpletextviewer-findfiledialog.png
@ -4948,16 +5025,20 @@
%%QT_EXAMPLEDIR%%/quickcontrols2/swipetoremove/swipetoremove.pro
%%QT_EXAMPLEDIR%%/quickcontrols2/swipetoremove/swipetoremove.qml
%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/+touch/texteditor.html
%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/creatorKateHighlighter.png
%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/doc/images/qtquickcontrols2-texteditor-desktop.jpg
%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/doc/images/qtquickcontrols2-texteditor-touch.jpg
%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc
%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/documenthandler.cpp
%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/documenthandler.h
%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/einstein.png
%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/example.md
%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/fonts/fontello.ttf
%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/images/qt-logo.png
%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/qml/+touch/texteditor.qml
%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/qml/texteditor.qml
%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/qtquickcontrols2.conf
%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/red.png
%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/texteditor.cpp
%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/texteditor.html
%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/texteditor.pro

14
misc/qt5-l10n/pkg-plist
View File

@ -13,6 +13,7 @@
%%QT_L10NDIR%%/assistant_ru.qm
%%QT_L10NDIR%%/assistant_sk.qm
%%QT_L10NDIR%%/assistant_sl.qm
%%QT_L10NDIR%%/assistant_tr.qm
%%QT_L10NDIR%%/assistant_uk.qm
%%QT_L10NDIR%%/assistant_zh_CN.qm
%%QT_L10NDIR%%/assistant_zh_TW.qm
@ -31,6 +32,7 @@
%%QT_L10NDIR%%/designer_ru.qm
%%QT_L10NDIR%%/designer_sk.qm
%%QT_L10NDIR%%/designer_sl.qm
%%QT_L10NDIR%%/designer_tr.qm
%%QT_L10NDIR%%/designer_uk.qm
%%QT_L10NDIR%%/designer_zh_CN.qm
%%QT_L10NDIR%%/designer_zh_TW.qm
@ -51,6 +53,7 @@
%%QT_L10NDIR%%/linguist_sk.qm
%%QT_L10NDIR%%/linguist_sl.qm
%%QT_L10NDIR%%/linguist_sv.qm
%%QT_L10NDIR%%/linguist_tr.qm
%%QT_L10NDIR%%/linguist_uk.qm
%%QT_L10NDIR%%/linguist_zh_CN.qm
%%QT_L10NDIR%%/linguist_zh_TW.qm
@ -86,6 +89,7 @@
%%QT_L10NDIR%%/qt_help_ru.qm
%%QT_L10NDIR%%/qt_help_sk.qm
%%QT_L10NDIR%%/qt_help_sl.qm
%%QT_L10NDIR%%/qt_help_tr.qm
%%QT_L10NDIR%%/qt_help_uk.qm
%%QT_L10NDIR%%/qt_help_zh_CN.qm
%%QT_L10NDIR%%/qt_help_zh_TW.qm
@ -101,6 +105,7 @@
%%QT_L10NDIR%%/qt_sk.qm
%%QT_L10NDIR%%/qt_sl.qm
%%QT_L10NDIR%%/qt_sv.qm
%%QT_L10NDIR%%/qt_tr.qm
%%QT_L10NDIR%%/qt_uk.qm
%%QT_L10NDIR%%/qt_zh_CN.qm
%%QT_L10NDIR%%/qt_zh_TW.qm
@ -124,6 +129,7 @@
%%QT_L10NDIR%%/qtbase_pl.qm
%%QT_L10NDIR%%/qtbase_ru.qm
%%QT_L10NDIR%%/qtbase_sk.qm
%%QT_L10NDIR%%/qtbase_tr.qm
%%QT_L10NDIR%%/qtbase_uk.qm
%%QT_L10NDIR%%/qtbase_zh_TW.qm
%%QT_L10NDIR%%/qtconnectivity_bg.qm
@ -136,6 +142,7 @@
%%QT_L10NDIR%%/qtconnectivity_ko.qm
%%QT_L10NDIR%%/qtconnectivity_pl.qm
%%QT_L10NDIR%%/qtconnectivity_ru.qm
%%QT_L10NDIR%%/qtconnectivity_tr.qm
%%QT_L10NDIR%%/qtconnectivity_uk.qm
%%QT_L10NDIR%%/qtdeclarative_bg.qm
%%QT_L10NDIR%%/qtdeclarative_da.qm
@ -151,6 +158,7 @@
%%QT_L10NDIR%%/qtdeclarative_pl.qm
%%QT_L10NDIR%%/qtdeclarative_ru.qm
%%QT_L10NDIR%%/qtdeclarative_sk.qm
%%QT_L10NDIR%%/qtdeclarative_tr.qm
%%QT_L10NDIR%%/qtdeclarative_uk.qm
%%QT_L10NDIR%%/qtlocation_bg.qm
%%QT_L10NDIR%%/qtlocation_ca.qm
@ -164,6 +172,7 @@
%%QT_L10NDIR%%/qtlocation_ko.qm
%%QT_L10NDIR%%/qtlocation_pl.qm
%%QT_L10NDIR%%/qtlocation_ru.qm
%%QT_L10NDIR%%/qtlocation_tr.qm
%%QT_L10NDIR%%/qtlocation_uk.qm
%%QT_L10NDIR%%/qtmultimedia_ar.qm
%%QT_L10NDIR%%/qtmultimedia_bg.qm
@ -182,6 +191,7 @@
%%QT_L10NDIR%%/qtmultimedia_pl.qm
%%QT_L10NDIR%%/qtmultimedia_ru.qm
%%QT_L10NDIR%%/qtmultimedia_sk.qm
%%QT_L10NDIR%%/qtmultimedia_tr.qm
%%QT_L10NDIR%%/qtmultimedia_uk.qm
%%QT_L10NDIR%%/qtmultimedia_zh_TW.qm
%%QT_L10NDIR%%/qtquickcontrols2_ar.qm
@ -191,6 +201,7 @@
%%QT_L10NDIR%%/qtquickcontrols2_en.qm
%%QT_L10NDIR%%/qtquickcontrols2_hu.qm
%%QT_L10NDIR%%/qtquickcontrols2_ko.qm
%%QT_L10NDIR%%/qtquickcontrols2_tr.qm
%%QT_L10NDIR%%/qtquickcontrols2_uk.qm
%%QT_L10NDIR%%/qtquickcontrols2_zh_TW.qm
%%QT_L10NDIR%%/qtquickcontrols_bg.qm
@ -201,7 +212,9 @@
%%QT_L10NDIR%%/qtquickcontrols_fi.qm
%%QT_L10NDIR%%/qtquickcontrols_fr.qm
%%QT_L10NDIR%%/qtquickcontrols_ja.qm
%%QT_L10NDIR%%/qtquickcontrols_ko.qm
%%QT_L10NDIR%%/qtquickcontrols_ru.qm
%%QT_L10NDIR%%/qtquickcontrols_tr.qm
%%QT_L10NDIR%%/qtquickcontrols_uk.qm
%%QT_L10NDIR%%/qtquickcontrols_zh_TW.qm
%%QT_L10NDIR%%/qtscript_ar.qm
@ -223,6 +236,7 @@
%%QT_L10NDIR%%/qtscript_pl.qm
%%QT_L10NDIR%%/qtscript_ru.qm
%%QT_L10NDIR%%/qtscript_sk.qm
%%QT_L10NDIR%%/qtscript_tr.qm
%%QT_L10NDIR%%/qtscript_uk.qm
%%QT_L10NDIR%%/qtserialport_de.qm
%%QT_L10NDIR%%/qtserialport_en.qm

2
multimedia/py-qt5-multimedia/Makefile
View File

@ -12,7 +12,7 @@ RUN_DEPENDS= ${PY_ENUM34}
CONFIGURE_ARGS= --enable QtMultimedia
PYQT_DIST= yes
USES= gl python pyqt:5 qt:5
USES= gl python:3.5+ pyqt:5 qt:5
USE_GL= gl
USE_PYQT= sip_build core_run gui_run network_run
USE_PYTHON= concurrent flavors py3kplist

2
multimedia/py-qt5-multimediawidgets/Makefile
View File

@ -12,7 +12,7 @@ RUN_DEPENDS= ${PY_ENUM34}
CONFIGURE_ARGS= --enable QtMultimediaWidgets
PYQT_DIST= yes
USES= gl python pyqt:5 qt:5
USES= gl python:3.5+ pyqt:5 qt:5
USE_GL= gl
USE_PYQT= sip_build core_run multimedia_run widgets_run
USE_PYTHON= concurrent flavors py3kplist

8
net-im/scudcloud/Makefile
View File

@ -14,10 +14,7 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsmin>0:devel/py-jsmin@${PY_FLAVOR}
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}sip>0:devel/py-sip@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}qt5-webkit>0:www/py-qt5-webkit@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}qt5-webkitwidgets>0:www/py-qt5-webkitwidgets@${PY_FLAVOR}
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR}
GH_ACCOUNT= raelgc
@ -28,7 +25,8 @@ INSTALLS_ICONS= yes
OPTIONS_DEFINE= HUNSPELL
USES= gnome python:3.4+
USES= gnome python:3.5+ pyqt:5
USE_PYQT= sip_run webkit_run webkitwidgets_run
USE_GITHUB= yes
USE_PYTHON= autoplist distutils optsuffix
NO_ARCH= yes

209
net/calendarsupport/files/patch-git-b4193fac.diff Normal file
View File

@ -0,0 +1,209 @@
diff --git src/printing/calprintdefaultplugins.cpp src/printing/calprintdefaultplugins.cpp
index 862b74d..e3d802d 100644
--- src/printing/calprintdefaultplugins.cpp
+++ src/printing/calprintdefaultplugins.cpp
@@ -805,7 +805,7 @@ void CalPrintDay::print(QPainter &p, int width, int height)
QString line1 = local.toString(mFromDate, QLocale::ShortFormat);
QString line2 = local.toString(mToDate, QLocale::ShortFormat);
QString title;
- if (orientation() == QPrinter::Landscape) {
+ if (orientation() == QPageLayout::Landscape) {
title = i18nc("date from-to", "%1 - %2", line1, line2);
} else {
title = i18nc("date from-\nto", "%1 -\n%2", line1, line2);
@@ -1050,14 +1050,14 @@ void CalPrintWeek::saveConfig()
}
}
-QPrinter::Orientation CalPrintWeek::defaultOrientation() const
+QPageLayout::Orientation CalPrintWeek::defaultOrientation() const
{
if (mWeekPrintType == Filofax) {
- return QPrinter::Portrait;
+ return QPageLayout::Portrait;
} else if (mWeekPrintType == SplitWeek) {
- return QPrinter::Portrait;
+ return QPageLayout::Portrait;
} else {
- return QPrinter::Landscape;
+ return QPageLayout::Landscape;
}
}
@@ -1099,7 +1099,7 @@ void CalPrintWeek::print(QPainter &p, int width, int height)
do {
line1 = local.toString(curWeek.addDays(-6), QLocale::ShortFormat);
line2 = local.toString(curWeek, QLocale::ShortFormat);
- if (orientation() == QPrinter::Landscape) {
+ if (orientation() == QPageLayout::Landscape) {
title = i18nc("date from-to", "%1 - %2", line1, line2);
} else {
title = i18nc("date from-\nto", "%1 -\n%2", line1, line2);
@@ -1126,7 +1126,7 @@ void CalPrintWeek::print(QPainter &p, int width, int height)
do {
line1 = local.toString(curWeek.addDays(-6), QLocale::ShortFormat);
line2 = local.toString(curWeek, QLocale::ShortFormat);
- if (orientation() == QPrinter::Landscape) {
+ if (orientation() == QPageLayout::Landscape) {
title = i18nc("date from - to (week number)", "%1 - %2 (Week %3)",
line1, line2, curWeek.weekNumber());
} else {
diff --git src/printing/calprintdefaultplugins.h src/printing/calprintdefaultplugins.h
index 4df72f6..3f62d0b 100644
--- src/printing/calprintdefaultplugins.h
+++ src/printing/calprintdefaultplugins.h
@@ -53,9 +53,9 @@ public:
}
QWidget *createConfigWidget(QWidget *) override;
- Q_REQUIRED_RESULT QPrinter::Orientation defaultOrientation() const override
+ Q_REQUIRED_RESULT QPageLayout::Orientation defaultOrientation() const override
{
- return QPrinter::Portrait;
+ return QPageLayout::Portrait;
}
public:
@@ -166,7 +166,7 @@ public:
/**
Returns the default orientation for the eWeekPrintType.
*/
- QPrinter::Orientation defaultOrientation() const override;
+ QPageLayout::Orientation defaultOrientation() const override;
public:
void print(QPainter &p, int width, int height) override;
@@ -222,9 +222,9 @@ public:
}
QWidget *createConfigWidget(QWidget *) override;
- QPrinter::Orientation defaultOrientation() const override
+ QPageLayout::Orientation defaultOrientation() const override
{
- return QPrinter::Landscape;
+ return QPageLayout::Landscape;
}
public:
diff --git src/printing/calprinter.cpp src/printing/calprinter.cpp
index 182e0e3..10e9db6 100644
--- src/printing/calprinter.cpp
+++ src/printing/calprinter.cpp
@@ -126,13 +126,13 @@ void CalPrinter::doPrint(PrintPlugin *selectedStyle, CalPrinter::ePrintOrientati
QPrinter printer;
switch (dlgorientation) {
case eOrientPlugin:
- printer.setOrientation(selectedStyle->defaultOrientation());
+ printer.setPageOrientation(selectedStyle->defaultOrientation());
break;
case eOrientPortrait:
- printer.setOrientation(QPrinter::Portrait);
+ printer.setPageOrientation(QPageLayout::Portrait);
break;
case eOrientLandscape:
- printer.setOrientation(QPrinter::Landscape);
+ printer.setPageOrientation(QPageLayout::Landscape);
break;
case eOrientPrinter:
break;
diff --git src/printing/calprintpluginbase.cpp src/printing/calprintpluginbase.cpp
index e96f3b2..9db198e 100644
--- src/printing/calprintpluginbase.cpp
+++ src/printing/calprintpluginbase.cpp
@@ -232,9 +232,9 @@ void CalPrintPluginBase::setPrintFooter(bool printFooter)
mPrintFooter = printFooter;
}
-QPrinter::Orientation CalPrintPluginBase::orientation() const
+QPageLayout::Orientation CalPrintPluginBase::orientation() const
{
- return mPrinter ? mPrinter->orientation() : QPrinter::Portrait;
+ return mPrinter ? mPrinter->pageLayout().orientation() : QPageLayout::Portrait;
}
QColor CalPrintPluginBase::getTextColor(const QColor &c) const
@@ -326,7 +326,7 @@ int CalPrintPluginBase::headerHeight() const
{
if (mHeaderHeight >= 0) {
return mHeaderHeight;
- } else if (orientation() == QPrinter::Portrait) {
+ } else if (orientation() == QPageLayout::Portrait) {
return PORTRAIT_HEADER_HEIGHT;
} else {
return LANDSCAPE_HEADER_HEIGHT;
@@ -356,7 +356,7 @@ int CalPrintPluginBase::footerHeight() const
if (mFooterHeight >= 0) {
return mFooterHeight;
- } else if (orientation() == QPrinter::Portrait) {
+ } else if (orientation() == QPageLayout::Portrait) {
return PORTRAIT_FOOTER_HEIGHT;
} else {
return LANDSCAPE_FOOTER_HEIGHT;
diff --git src/printing/calprintpluginbase.h src/printing/calprintpluginbase.h
index ff1113c..b3d41ac 100644
--- src/printing/calprintpluginbase.h
+++ src/printing/calprintpluginbase.h
@@ -108,7 +108,7 @@ public:
*/
static int weekdayColumn(int weekday);
- QPrinter::Orientation orientation() const;
+ QPageLayout::Orientation orientation() const;
/** Returns the height of the page header. If the height was explicitly
set using setHeaderHeight, that value is returned, otherwise a
diff --git src/printing/printplugin.h src/printing/printplugin.h
index 57afdfe..73bf467 100644
--- src/printing/printplugin.h
+++ src/printing/printplugin.h
@@ -140,9 +140,9 @@ public:
config settings), implement this function in your subclass and
return the desired orientation.
*/
- virtual QPrinter::Orientation defaultOrientation() const
+ virtual QPageLayout::Orientation defaultOrientation() const
{
- return QPrinter::Portrait;
+ return QPageLayout::Portrait;
}
/**
diff --git src/printing/yearprint.cpp src/printing/yearprint.cpp
index 3287ca6..e57a1c4 100644
--- src/printing/yearprint.cpp
+++ src/printing/yearprint.cpp
@@ -82,9 +82,9 @@ void CalPrintYear::saveConfig()
}
}
-QPrinter::Orientation CalPrintYear::defaultOrientation() const
+QPageLayout::Orientation CalPrintYear::defaultOrientation() const
{
- return (mPages == 1) ? QPrinter::Landscape : QPrinter::Portrait;
+ return (mPages == 1) ? QPageLayout::Landscape : QPageLayout::Portrait;
}
void CalPrintYear::setDateRange(const QDate &from, const QDate &to)
@@ -131,7 +131,7 @@ void CalPrintYear::print(QPainter &p, int width, int height)
QString stdate = locale.toString(start, QLocale::ShortFormat);
QString endate = locale.toString(end, QLocale::ShortFormat);
QString title;
- if (orientation() == QPrinter::Landscape) {
+ if (orientation() == QPageLayout::Landscape) {
title = i18nc("date from - to", "%1 - %2", stdate, endate);
} else {
title = i18nc("date from -\nto", "%1 -\n%2", stdate, endate);
diff --git src/printing/yearprint.h src/printing/yearprint.h
index e59bf87..cd46a50 100644
--- src/printing/yearprint.h
+++ src/printing/yearprint.h
@@ -48,7 +48,7 @@ public:
}
QWidget *createConfigWidget(QWidget *) override;
- Q_REQUIRED_RESULT QPrinter::Orientation defaultOrientation() const override;
+ Q_REQUIRED_RESULT QPageLayout::Orientation defaultOrientation() const override;
public:
void print(QPainter &p, int width, int height) override;

5
net/libarcus/Makefile
View File

@ -2,6 +2,7 @@
PORTNAME= libArcus
PORTVERSION= 4.7.1
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= net cad
DIST_SUBDIR= Ultimaker
@ -12,10 +13,10 @@ COMMENT= Communication library between internal components for Ultimaker
LICENSE= LGPL3
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= sip:devel/py-sip@${PY_FLAVOR}
LIB_DEPENDS= libprotobuf.so:devel/protobuf
USES= cmake compiler:c++11-lang python:3.4+
USES= cmake compiler:c++11-lang python:3.5+ pyqt:5
USE_PYQT= sip pysip
USE_GITHUB= yes
GH_ACCOUNT= Ultimaker
USE_LDCONFIG= yes

11
net/libarcus/files/patch-CMakeLists.txt Normal file
View File

@ -0,0 +1,11 @@
--- CMakeLists.txt.orig 2020-10-11 05:33:17 UTC
+++ CMakeLists.txt
@@ -94,7 +94,7 @@ endif()
if(BUILD_PYTHON)
set(SIP_EXTRA_FILES_DEPEND python/SocketListener.sip python/Types.sip python/PythonMessage.sip python/Error.sip)
set(SIP_EXTRA_SOURCE_FILES python/PythonMessage.cpp)
- set(SIP_EXTRA_OPTIONS -g) # -g means always release the GIL before calling C++ methods.
+ set(SIP_EXTRA_OPTIONS -g -n PyQt5.sip) # -g means always release the GIL before calling C++ methods.
add_sip_python_module(Arcus python/Socket.sip Arcus)
endif()

32
net/libarcus/files/patch-cmake_FindSIP.cmake Normal file
View File

@ -0,0 +1,32 @@
--- cmake/FindSIP.cmake.orig 2020-10-11 05:01:30 UTC
+++ cmake/FindSIP.cmake
@@ -68,16 +68,26 @@ endif()
get_filename_component(_python_binary_path ${Python3_EXECUTABLE} DIRECTORY)
-find_program(SIP_EXECUTABLE sip
+find_program(SIP_EXECUTABLE sip5
HINTS ${CMAKE_PREFIX_PATH}/bin ${CMAKE_INSTALL_PATH}/bin ${_python_binary_path} ${Python3_SITELIB}/PyQt5
)
+execute_process(
+ COMMAND sip-module --sip-h --target-dir ${CMAKE_BINARY_DIR} PyQt5.sip
+ RESULT_VARIABLE _process_status
+ OUTPUT_VARIABLE _process_output
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ )
+if(NOT ${_process_status} EQUAL 0)
+ message(FATAL_ERROR "Failed to get sip.h. Error: ${_process_output}")
+endif()
+
find_path(SIP_INCLUDE_DIRS sip.h
- HINTS ${CMAKE_PREFIX_PATH}/include ${CMAKE_INSTALL_PATH}/include ${Python3_INCLUDE_DIRS} ${Python3_SITELIB}/PyQt5
+ HINTS ${CMAKE_BINARY_DIR} ${CMAKE_PREFIX_PATH}/include ${CMAKE_INSTALL_PATH}/include ${Python3_INCLUDE_DIRS} ${Python3_SITELIB}/PyQt5
)
execute_process(
- COMMAND ${Python3_EXECUTABLE} -c "import sip; print(sip.SIP_VERSION_STR)"
+ COMMAND ${Python3_EXECUTABLE} -c "import PyQt5.sip; print(PyQt5.sip.SIP_VERSION_STR)"
RESULT_VARIABLE _process_status
OUTPUT_VARIABLE _process_output
OUTPUT_STRIP_TRAILING_WHITESPACE

2
net/py-qt5-network/Makefile
View File

@ -12,7 +12,7 @@ RUN_DEPENDS= ${PY_ENUM34}
CONFIGURE_ARGS= --enable QtNetwork
PYQT_DIST= yes
USES= python pyqt:5 qt:5
USES= python:3.5+ pyqt:5 qt:5
USE_PYQT= sip_build core_run
USE_PYTHON= concurrent flavors py3kplist
USE_QT= core network qmake_build

2
net/py-qt5-networkauth/Makefile
View File

@ -12,7 +12,7 @@ RUN_DEPENDS= ${PY_ENUM34}
CONFIGURE_ARGS= --enable QtNetworkAuth
PYQT_DIST= yes
USES= python pyqt:5 qt:5
USES= python:3.5+ pyqt:5 qt:5
USE_PYQT= sip_build core_run
USE_PYTHON= concurrent flavors py3kplist
USE_QT= core network networkauth qmake_build

12
net/qt5-network/files/patch-src_network_ssl_qsslcertificate__openssl.cpp Normal file
View File

@ -0,0 +1,12 @@
Patch from Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-qt/qtnetwork/files/qtnetwork-5.15.1-libressl.patch
--- src/network/ssl/qsslcertificate_openssl.cpp.orig 2020-09-02 10:15:07 UTC
+++ src/network/ssl/qsslcertificate_openssl.cpp
@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Na
unsigned char *data = nullptr;
int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
info.insert(name, QString::fromUtf8((char*)data, size));
-#if QT_CONFIG(opensslv11)
+#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
q_CRYPTO_free(data, nullptr, 0);
#else
q_CRYPTO_free(data);

49
net/qt5-network/files/patch-src_network_ssl_qsslcontext__openssl.cpp
View File

@ -1,18 +1,51 @@
--- src/network/ssl/qsslcontext_openssl.cpp.orig 2020-05-17 21:00:32 UTC
Patch from Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-qt/qtnetwork/files/qtnetwork-5.15.1-libressl.patch
--- src/network/ssl/qsslcontext_openssl.cpp.orig 2020-09-02 10:15:07 UTC
+++ src/network/ssl/qsslcontext_openssl.cpp
@@ -696,6 +696,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslC
@@ -397,16 +397,28 @@ init_context:
maxVersion = DTLS1_VERSION;
break;
case QSsl::DtlsV1_0OrLater:
+#ifdef DTLS_MAX_VERSION
minVersion = DTLS1_VERSION;
maxVersion = DTLS_MAX_VERSION;
+#else
+ Q_UNREACHABLE();
+#endif // DTLS_MAX_VERSION
break;
case QSsl::DtlsV1_2:
+#ifdef DTLS1_2_VERSION
minVersion = DTLS1_2_VERSION;
maxVersion = DTLS1_2_VERSION;
+#else
+ Q_UNREACHABLE();
+#endif // DTLS1_2_VERSION
break;
case QSsl::DtlsV1_2OrLater:
+#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
minVersion = DTLS1_2_VERSION;
maxVersion = DTLS_MAX_VERSION;
+#else
+ Q_UNREACHABLE();
+#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
break;
case QSsl::TlsV1_3OrLater:
#ifdef TLS1_3_VERSION
@@ -711,6 +723,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslC
}
#endif // ocsp
+#if !defined(LIBRESSL_VERSION_NUMBER)
+#ifndef LIBRESSL_VERSION_NUMBER
QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
if (cctx) {
q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
@@ -746,6 +747,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslC
@@ -757,7 +770,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslC
sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
sslContext->errorCode = QSslError::UnspecifiedError;
}
- } else {
+ } else
+#endif // LIBRESSL_VERSION_NUMBER
+ {
sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
sslContext->errorCode = QSslError::UnspecifiedError;
}
+#endif
}
QT_END_NAMESPACE

17
net/qt5-network/files/patch-src_network_ssl_qsslcontext__openssl__p.h Normal file
View File

@ -0,0 +1,17 @@
Patch from Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-qt/qtnetwork/files/qtnetwork-5.15.1-libressl.patch
--- src/network/ssl/qsslcontext_openssl_p.h.orig 2020-09-02 10:15:07 UTC
+++ src/network/ssl/qsslcontext_openssl_p.h
@@ -61,6 +61,13 @@
QT_BEGIN_NAMESPACE
+#ifndef DTLS_ANY_VERSION
+#define DTLS_ANY_VERSION 0x1FFFF
+#endif
+#ifndef TLS_ANY_VERSION
+#define TLS_ANY_VERSION 0x10000
+#endif
+
#ifndef QT_NO_SSL
class QSslContextPrivate;

12
net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl.cpp Normal file
View File

@ -0,0 +1,12 @@
Patch from Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-qt/qtnetwork/files/qtnetwork-5.15.1-libressl.patch
--- src/network/ssl/qsslsocket_openssl.cpp.orig 2020-09-02 10:15:07 UTC
+++ src/network/ssl/qsslsocket_openssl.cpp
@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext()
else if (mode == QSslSocket::SslServerMode)
q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
-#if OPENSSL_VERSION_NUMBER >= 0x10101006L
+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
// Set the client callback for TLSv1.3 PSK
if (mode == QSslSocket::SslClientMode
&& QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {

92
net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp
View File

@ -1,33 +1,63 @@
--- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig 2020-05-05 11:59:27 UTC
Patch from Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-qt/qtnetwork/files/qtnetwork-5.15.1-libressl.patch
--- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig 2020-09-02 10:15:07 UTC
+++ src/network/ssl/qsslsocket_openssl_symbols.cpp
@@ -147,6 +147,14 @@ DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *
@@ -145,11 +145,14 @@ DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYA
DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
+#ifdef OPENSSL_NO_DEPRECATED_3_0
DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
+#endif // OPENSSL_NO_DEPRECATED_3_0
DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
+#ifdef LIBRESSL_VERSION_NUMBER
+DEFINEFUNC(int, sk_num, OPENSSL_STACK *a, a, return -1, return)
+DEFINEFUNC2(void, sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
+DEFINEFUNC(OPENSSL_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
+DEFINEFUNC2(void, sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
+DEFINEFUNC(void, sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
+DEFINEFUNC2(void *, sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
+#else
+#ifndef LIBRESSL_VERSION_NUMBER
DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
@@ -154,6 +162,7 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMY
@@ -157,6 +160,14 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMY
DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
+#endif
+#else
+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
+DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
+DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
+DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
+DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
+DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
+#endif // LIBRESSL_VERSION_NUMBER
DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
#ifdef TLS1_3_VERSION
@@ -351,12 +360,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a
@@ -182,7 +193,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE
DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
+#ifndef LIBRESSL_VERSION_NUMBER
DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
+#else
+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
+#endif
DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
@@ -222,7 +237,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING
ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
return 0, return)
DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
+#ifndef LIBRESSL_VERSION_NUMBER
DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
+#endif
DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
@@ -354,12 +371,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a
DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
+#if !defined(LIBRESSL_VERSION_NUMBER)
+#ifndef LIBRESSL_VERSION_NUMBER
DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
@ -38,18 +68,18 @@
DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
@@ -834,12 +845,21 @@ bool q_resolveOpenSslSymbols()
@@ -843,17 +862,21 @@ bool q_resolveOpenSslSymbols()
RESOLVEFUNC(ASN1_STRING_get0_data)
RESOLVEFUNC(EVP_CIPHER_CTX_reset)
RESOLVEFUNC(EVP_PKEY_up_ref)
+#ifdef OPENSSL_NO_DEPRECATED_3_0
RESOLVEFUNC(EVP_PKEY_CTX_new)
RESOLVEFUNC(EVP_PKEY_param_check)
RESOLVEFUNC(EVP_PKEY_CTX_free)
+#endif // OPENSSL_NO_DEPRECATED_3_0
RESOLVEFUNC(EVP_PKEY_base_id)
RESOLVEFUNC(RSA_bits)
+#ifdef LIBRESSL_VERSION_NUMBER
+ RESOLVEFUNC(sk_new_null)
+ RESOLVEFUNC(sk_push)
+ RESOLVEFUNC(sk_free)
+ RESOLVEFUNC(sk_num)
+ RESOLVEFUNC(sk_pop_free)
+ RESOLVEFUNC(sk_value)
+#else
+#ifndef LIBRESSL_VERSION_NUMBER
RESOLVEFUNC(OPENSSL_sk_new_null)
RESOLVEFUNC(OPENSSL_sk_push)
RESOLVEFUNC(OPENSSL_sk_free)
@ -60,7 +90,7 @@
RESOLVEFUNC(DH_get0_pqg)
RESOLVEFUNC(SSL_CTX_set_options)
@@ -881,7 +901,9 @@ bool q_resolveOpenSslSymbols()
@@ -895,7 +918,9 @@ bool q_resolveOpenSslSymbols()
RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
RESOLVEFUNC(DH_bits)
@ -70,11 +100,21 @@
#if QT_CONFIG(dtls)
RESOLVEFUNC(DTLSv1_listen)
@@ -1041,12 +1063,14 @@ bool q_resolveOpenSslSymbols()
@@ -925,7 +950,9 @@ bool q_resolveOpenSslSymbols()
RESOLVEFUNC(OCSP_check_validity)
RESOLVEFUNC(OCSP_cert_to_id)
RESOLVEFUNC(OCSP_id_get0_info)
+#ifndef LIBRESSL_VERSION_NUMBER
RESOLVEFUNC(OCSP_resp_get0_certs)
+#endif
RESOLVEFUNC(OCSP_basic_sign)
RESOLVEFUNC(OCSP_response_create)
RESOLVEFUNC(i2d_OCSP_RESPONSE)
@@ -1055,12 +1082,14 @@ bool q_resolveOpenSslSymbols()
RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
RESOLVEFUNC(SSL_CTX_get_cert_store);
+#if !defined(LIBRESSL_VERSION_NUMBER)
+#ifndef LIBRESSL_VERSION_NUMBER
RESOLVEFUNC(SSL_CONF_CTX_new);
RESOLVEFUNC(SSL_CONF_CTX_free);
RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);

125
net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h
View File

@ -1,90 +1,95 @@
--- src/network/ssl/qsslsocket_openssl_symbols_p.h.orig 2020-05-05 11:59:27 UTC
Patch from Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-qt/qtnetwork/files/qtnetwork-5.15.1-libressl.patch
--- src/network/ssl/qsslsocket_openssl_symbols_p.h.orig 2020-09-02 10:15:07 UTC
+++ src/network/ssl/qsslsocket_openssl_symbols_p.h
@@ -72,6 +72,14 @@
#include "qsslsocket_openssl_p.h"
#include <QtCore/qglobal.h>
@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L
+# define TLS1_2_VERSION 0x0303
+# define TLS_MAX_VERSION TLS1_2_VERSION
+# define TLS_ANY_VERSION 0x10000
+# define DTLS1_2_VERSION 0xFEFD
+# define DTLS_MAX_VERSION DTLS1_2_VERSION
#define DUMMYARG
+#ifdef LIBRESSL_VERSION_NUMBER
+typedef _STACK STACK;
+typedef STACK OPENSSL_STACK;
+typedef void OPENSSL_INIT_SETTINGS;
+typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
+#endif
+
#if QT_CONFIG(ocsp)
#include "qocsp_p.h"
#endif
@@ -225,22 +233,50 @@ QT_BEGIN_NAMESPACE
// content of the header here. Later, can be better sorted/split into groups,
// depending on the functionality.
+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L
+// LibreSSL 2.7 has stack_st but not OPENSSL_STACK
+typedef struct stack_st OPENSSL_STACK; /* Use STACK_OF(...) instead */
+// From the signature in LibreSSL
+#define OPENSSL_INIT_SETTINGS void
+// https://github.com/openssl/openssl/blob/master/include/openssl/x509_vfy.h#L63
+typedef int (*X509_STORE_CTX_verify_cb)(int, X509_STORE_CTX *);
+#endif
+
const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
#if !defined QT_LINKED_OPENSSL
// **************** Shared declarations ******************
// ret func(arg)
@@ -230,20 +237,43 @@ const unsigned char * q_ASN1_STRING_get0_data(const AS
Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
+#ifdef LIBRESSL_VERSION_NUMBER
+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
+#else
+#ifndef LIBRESSL_VERSION_NUMBER
int q_DSA_bits(DSA *a);
+#else
+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
+#endif
int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
+#ifdef OPENSSL_NO_DEPRECATED_3_0
EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
+#endif // OPENSSL_NO_DEPRECATED_3_0
int q_EVP_PKEY_base_id(EVP_PKEY *a);
int q_RSA_bits(RSA *a);
+#ifdef LIBRESSL_VERSION_NUMBER
+int q_sk_num(OPENSSL_STACK *a);
+void q_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
+OPENSSL_STACK *q_sk_new_null();
+void q_sk_push(OPENSSL_STACK *st, void *data);
+void q_sk_free(OPENSSL_STACK *a);
+void * q_sk_value(OPENSSL_STACK *a, int b);
+#define q_OPENSSL_sk_num(a) q_sk_num(a)
+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
+#define q_OPENSSL_sk_new_null() q_sk_new_null()
+#define q_OPENSSL_sk_push(a, b) q_sk_push(a, b)
+#define q_OPENSSL_sk_free q_sk_free
+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
+#else
+
+#ifndef LIBRESSL_VERSION_NUMBER
Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
+#endif
+#else // LIBRESSL_VERSION_NUMBER
+int q_sk_num(STACK *a);
+#define q_OPENSSL_sk_num(a) q_sk_num(a)
+void q_sk_pop_free(STACK *a, void (*b)(void *));
+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
+STACK *q_sk_new_null();
+#define q_OPENSSL_sk_new_null() q_sk_new_null()
+void q_sk_push(STACK *st, void *data);
+#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
+void q_sk_free(STACK *a);
+#define q_OPENSSL_sk_free q_sk_free
+void *q_sk_value(STACK *a, int b);
+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
+#endif // LIBRESSL_VERSION_NUMBER
+
int q_SSL_session_reused(SSL *a);
unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
@@ -266,8 +302,13 @@ int q_DH_bits(DH *dh);
@@ -269,8 +299,13 @@ int q_DH_bits(DH *dh);
# define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
| OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
+#ifdef LIBRESSL_VERSION_NUMBER
+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
+#else
+#ifndef LIBRESSL_VERSION_NUMBER
#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
+#endif
+#else
+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
+#endif // LIBRESSL_VERSION_NUMBER
#define q_OPENSSL_add_all_algorithms_conf() q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
| OPENSSL_INIT_ADD_ALL_DIGESTS \
@@ -494,12 +535,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
@@ -279,7 +314,11 @@ int q_DH_bits(DH *dh);
| OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
+#ifndef LIBRESSL_VERSION_NUMBER
void q_CRYPTO_free(void *str, const char *file, int line);
+#else
+void q_CRYPTO_free(void *a);
+#endif
long q_OpenSSL_version_num();
const char *q_OpenSSL_version(int type);
@@ -497,12 +536,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
+#if !defined(LIBRESSL_VERSION_NUMBER)
+#ifndef LIBRESSL_VERSION_NUMBER
SSL_CONF_CTX *q_SSL_CONF_CTX_new();
void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
@ -95,3 +100,15 @@
void q_SSL_free(SSL *a);
STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
@@ -728,7 +769,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisup
int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
ASN1_INTEGER **pserial, OCSP_CERTID *cid);
+#ifndef LIBRESSL_VERSION_NUMBER
const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
+#else
+#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
+#endif
Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);

4
print/py-frescobaldi/Makefile
View File

@ -15,9 +15,9 @@ LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-ly>=0:print/py-python-ly@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}python-poppler-qt5>=0:graphics/py-python-poppler-qt5@${PY_FLAVOR}
${PYTHON_PKGNAMEPREFIX}python-poppler-qt5>=0:graphics/py-python-poppler-qt5 #@${PY_FLAVOR}
USES= desktop-file-utils gettext gmake pyqt:5 python:3.4+ qmake qt:5
USES= desktop-file-utils gettext gmake pyqt:5 python:3.5+ qmake qt:5
USE_GITHUB= yes
GH_ACCOUNT= frescobaldi
USE_PYQT= network printsupport sip svg webengine widgets

2
print/py-qt5-printsupport/Makefile
View File

@ -12,7 +12,7 @@ RUN_DEPENDS= ${PY_ENUM34}
CONFIGURE_ARGS= --enable QtPrintSupport
PYQT_DIST= yes
USES= gl python pyqt:5 qt:5
USES= gl python:3.5+ pyqt:5 qt:5
USE_GL= gl
USE_PYQT= sip_build core_run widgets_run
USE_PYTHON= concurrent flavors py3kplist

2
science/py-veusz/Makefile
View File

@ -4,7 +4,7 @@
PORTNAME= veusz
DISTVERSIONPREFIX= ${PORTNAME}-
DISTVERSION= 3.2.1
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= science
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

82
science/py-veusz/files/patch-pyqtdistutils.py
View File

@ -1,11 +1,83 @@
--- pyqtdistutils.py.orig 2019-03-17 19:30:42 UTC
Patch from https://github.com/veusz/veusz/pull/433
--- pyqtdistutils.py.orig 2020-10-11 07:18:07 UTC
+++ pyqtdistutils.py
@@ -272,7 +272,7 @@ class build_ext(distutils.command.build_
@@ -10,9 +10,8 @@ import sys
import sysconfig
import subprocess
-from distutils.sysconfig import customize_compiler
+from distutils.sysconfig import customize_compiler, get_python_lib
import distutils.command.build_ext
-from distutils.dep_util import newer, newer_group
import PyQt5.QtCore
@@ -97,20 +96,6 @@ class build_ext(distutils.command.build_ext.build_ext)
self.qt_library_dir = None
self.qt_libinfix = None
- def _get_sip_output_list(self, sbf):
- '''
- Parse the sbf file specified to extract the name of the generated source
- files. Make them absolute assuming they reside in the temp directory.
- '''
- for line in open(sbf):
- key, value = line.split('=', 1)
- if key.strip() == 'sources':
- out = []
- for o in value.split():
- out.append(os.path.join(self.build_temp, o))
- return out
- raise RuntimeError('cannot parse SIP-generated "%s"' % sbf)
-
def _get_sip_exe(self, build_cmd):
"""Get exe for sip. Sources are:
--sip-exe option, environment, DEF_SIP_BIN, search on path."""
@@ -289,26 +274,35 @@ class build_ext(distutils.command.build_ext.build_ext)
generated_sources = []
for sip in sip_sources:
- # Use the sbf file as dependency check
- sipbasename = os.path.basename(sip)
- sbf = os.path.join(self.build_temp,
- replace_suffix(sipbasename, '.sbf'))
- if newer_group([sip]+depends, sbf) or self.force:
- self._sip_compile(sip_exe, sip_dir, sip, sbf)
- out = self._get_sip_output_list(sbf)
+ sip_basename = os.path.basename(sip)[:-4]
+ sip_builddir = os.path.join(self.build_temp, 'sip-' + sip_basename)
+ if not os.path.exists(sip_builddir) or self.force:
+ os.makedirs(sip_builddir, exist_ok=True)
+ self._sip_compile(sip_exe, sip_dir, sip, sip_builddir)
+ out = [
+ os.path.join(sip_builddir, fn)
+ for fn in os.listdir(sip_builddir)
+ if fn.endswith(".cpp")
+ ]
generated_sources.extend(out)
return generated_sources + other_sources
- def _sip_compile(self, sip_exe, sip_dir, source, sbf):
+ def _sip_compile(self, sip_exe, sip_dir, source, sip_builddir):
"""Compile sip file to sources."""
+ if 'sip5' in sip_exe:
+ pyqt5_include_dir = os.path.join(get_python_lib(plat_specific=1),
+ 'PyQt5', 'bindings')
+ self.spawn(['sip-module', '--target-dir', sip_builddir,
+ '--sip-h', 'PyQt5.sip'])
+ else:
+ pyqt5_include_dir = os.path.join(sip_dir, 'PyQt5')
self.spawn(
[
sip_exe,
'-c', self.build_temp
- '-c', self.build_temp
+ '-c', sip_builddir
] + SIP_FLAGS.split() + [
- '-I', os.path.join(sip_dir, 'PyQt5'),
+ '-I', sip_dir, # for FreeBSD's SIP file locations
'-b', sbf,
- '-b', sbf,
+ '-I', pyqt5_include_dir,
source
]
)

Some files were not shown because too many files have changed in this diff Show More