Attachment #220212 for bug #250853





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_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=		5.4.0
QSCI2_VERSION=		2.11.5
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

			${_USE_PYQT_WWW} \
			${_USE_PYQT_X11} \
			${_USE_PYQT_X11-TOOLKITS}
_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}


# PATH
py-sip_PATH=			${PYTHON_PKGNAMEPREFIX}sip>=${SIP_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}


# PORT
py-sip_PORT=			devel/py-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

py-xmlpatterns_DESC=		Python bindings for QtXmlPatterns module

# The versionned executable of sip
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=		PyQt${_PYQT_VERSION}/bindings
_DESIGNERDIR_REL=	${QT_PLUGINDIR_REL}/designer/${_VERSION_SUBDIR_REL}
_QMLDIR_REL=		${QT_QMLDIR_REL}/${_VERSION_SUBDIR_REL}

# Absolute directories
PYQT_APIDIR=		${PREFIX}/${_APIDIR_REL}
PYQT_DOCDIR=		${PREFIX}/${_DOCDIR_REL}
PYQT_EXAMPLEDIR=	${PREFIX}/${_EXAMPLEDIR_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=${PYQT_SIPDIR} \
		PYQT_DESIGNERDIR=${_DESIGNERDIR_REL} \
		PYQT_QMLDIR=${_QMLDIR_REL} \
		PYQT_SIPVERSION=${SIP_VERSION} \

# 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_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}

Lines 24-30 _QT_MK_INCLUDED= qt.mk Link Here

(-)b/Mk/Uses/qt.mk (-1 / +1 lines)
24		24
25	# Qt versions currently supported by the framework.	25	# Qt versions currently supported by the framework.
26	_QT_SUPPORTED?= 5	26	_QT_SUPPORTED?= 5
27	QT5_VERSION?= 5.15.0	27	QT5_VERSION?= 5.15.2
28		28
29	# We accept the Qt version to be passed by either or all of the three mk files.	29	# We accept the Qt version to be passed by either or all of the three mk files.
30	. if empty(qt_ARGS) && empty(qmake_ARGS) && empty(qt-dist_ARGS)	30	. if empty(qt_ARGS) && empty(qmake_ARGS) && empty(qt-dist_ARGS)

Lines 19-25 PY_DEPENDS= ${PYNUMPY} \ Link Here

(-)b/biology/py-ete3/Makefile (-1 / +1 lines)
19	BUILD_DEPENDS= ${PY_DEPENDS}	19	BUILD_DEPENDS= ${PY_DEPENDS}
20	RUN_DEPENDS= ${PY_DEPENDS}	20	RUN_DEPENDS= ${PY_DEPENDS}
21		21
22	USES= python pyqt:5 shebangfix	22	USES= python:3.5+ pyqt:5 shebangfix
23	SHEBANG_GLOB= *.py	23	SHEBANG_GLOB= *.py
24	USE_PYTHON= distutils concurrent autoplist	24	USE_PYTHON= distutils concurrent autoplist
25	USE_PYQT= core gui opengl printsupport svg widgets	25	USE_PYQT= core gui opengl printsupport svg widgets

Lines 13-22 LICENSE= AGPLv3 Link Here

(-)b/cad/cura/Makefile (-5 / +4 lines)
13	LICENSE_FILE= ${WRKSRC}/LICENSE	13	LICENSE_FILE= ${WRKSRC}/LICENSE
14		14
15	BUILD_DEPENDS= Uranium>0,1:cad/uranium	15	BUILD_DEPENDS= Uranium>0,1:cad/uranium
16	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}qt5-gui>0:x11-toolkits/py-qt5-gui@${PY_FLAVOR} \	16	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zeroconf>0:net/py-zeroconf@${PY_FLAVOR} \
17	${PYTHON_PKGNAMEPREFIX}qt5-widgets>0:x11-toolkits/py-qt5-widgets@${PY_FLAVOR} \
18	${PYTHON_PKGNAMEPREFIX}qt5-qml>0:lang/py-qt5-qml@${PY_FLAVOR} \
19	${PYTHON_PKGNAMEPREFIX}zeroconf>0:net/py-zeroconf@${PY_FLAVOR} \
20	${PYTHON_PKGNAMEPREFIX}pyserial>0:comms/py-pyserial@${PY_FLAVOR} \	17	${PYTHON_PKGNAMEPREFIX}pyserial>0:comms/py-pyserial@${PY_FLAVOR} \
21	${PYTHON_PKGNAMEPREFIX}Shapely>0:devel/py-shapely@${PY_FLAVOR} \	18	${PYTHON_PKGNAMEPREFIX}Shapely>0:devel/py-shapely@${PY_FLAVOR} \
22	${PYTHON_PKGNAMEPREFIX}numpy-stl>0:math/py-numpy-stl@${PY_FLAVOR} \	19	${PYTHON_PKGNAMEPREFIX}numpy-stl>0:math/py-numpy-stl@${PY_FLAVOR} \
Lines 31-37 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}qt5-gui>0:x11-toolkits/py-qt5-gui@${PY_FLAVO Link Here
31	LIB_DEPENDS= libArcus.so:net/libarcus \	28	LIB_DEPENDS= libArcus.so:net/libarcus \
32	libSavitar.so:devel/libsavitar	29	libSavitar.so:devel/libsavitar
33		30
34	USES= cmake gettext shebangfix python:3.4+ desktop-file-utils shared-mime-info	31	USES= cmake gettext shebangfix python:3.5+ pyqt:5 \
		32	desktop-file-utils shared-mime-info
		33	USE_PYQT= gui widgets qml
35	CMAKE_ARGS+= -DURANIUM_SCRIPTS_DIR:STRING="${LOCALBASE}/share/uranium/scripts"	34	CMAKE_ARGS+= -DURANIUM_SCRIPTS_DIR:STRING="${LOCALBASE}/share/uranium/scripts"
36	USE_GITHUB= yes	35	USE_GITHUB= yes
37	GH_ACCOUNT= Ultimaker	36	GH_ACCOUNT= Ultimaker





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 gettext python:3.5+ pyqt:5
USE_PYQT=	quick
USE_GITHUB=	yes
GH_ACCOUNT=	Ultimaker
GH_TAGNAME=	3ed9c4de

Lines 12-18 RUN_DEPENDS= ${PY_ENUM34} Link Here

(-)b/comms/py-qt5-sensors/Makefile (-1 / +1 lines)
12	CONFIGURE_ARGS= --enable QtSensors	12	CONFIGURE_ARGS= --enable QtSensors
13	PYQT_DIST= yes	13	PYQT_DIST= yes
14		14
15	USES= gl python pyqt:5 qt:5	15	USES= gl python:3.5+ pyqt:5 qt:5
16	USE_GL= gl	16	USE_GL= gl
17	USE_PYQT= sip_build core_run	17	USE_PYQT= sip_build core_run
18	USE_PYTHON= concurrent flavors py3kplist	18	USE_PYTHON= concurrent flavors py3kplist

Lines 12-18 RUN_DEPENDS= ${PY_ENUM34} Link Here

(-)b/comms/py-qt5-serialport/Makefile (-1 / +1 lines)
12	CONFIGURE_ARGS= --enable QtSerialPort	12	CONFIGURE_ARGS= --enable QtSerialPort
13	PYQT_DIST= yes	13	PYQT_DIST= yes
14		14
15	USES= gl python pyqt:5 qt:5	15	USES= gl python:3.5+ pyqt:5 qt:5
16	USE_GL= gl	16	USE_GL= gl
17	USE_PYQT= sip_build core_run	17	USE_PYQT= sip_build core_run
18	USE_PYTHON= concurrent flavors py3kplist	18	USE_PYTHON= concurrent flavors py3kplist

Lines 12-18 RUN_DEPENDS= ${PY_ENUM34} Link Here

(-)b/databases/py-qt5-sql/Makefile (-1 / +1 lines)
12	CONFIGURE_ARGS= --enable QtSql	12	CONFIGURE_ARGS= --enable QtSql
13	PYQT_DIST= yes	13	PYQT_DIST= yes
14		14
15	USES= gl python pyqt:5 qt:5	15	USES= gl python:3.5+ pyqt:5 qt:5
16	USE_GL= gl	16	USE_GL= gl
17	USE_PYQT= sip_build core_run widgets_run	17	USE_PYQT= sip_build core_run widgets_run
18	USE_PYTHON= concurrent flavors py3kplist	18	USE_PYTHON= concurrent flavors py3kplist




# $FreeBSD$

PORTNAME=	calibre
PORTVERSION=	5.6.0
PORTREVISION=	5
CATEGORIES=	deskutils python
MASTER_SITES=	http://download.calibre-ebook.com/${PORTVERSION}/


		${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} \
		${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} \

		${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 \
		${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 pysip qtbuilder sip svg webengine widgets xmlpatterns
USE_QT=		buildtools_build core dbus gui qmake_build widgets
USE_GL=		egl gl
USE_GNOME=	glib20

	@${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/*

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/deskutils/calibre/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1597997606	1	TIMESTAMP = 1606469769
2	SHA256 (calibre-4.23.0.tar.xz) = 16de51473cf0e336f946a57251a1e4f4fbba1f857f17d8fc14aa132e7eb59518	2	SHA256 (calibre-5.6.0.tar.xz) = 484a2e120fdbcff6c544d4c216afef0ff784c7665d3fd44d98acb0420d8f5e55
3	SIZE (calibre-4.23.0.tar.xz) = 36908740	3	SIZE (calibre-5.6.0.tar.xz) = 36653328

Added Link Here

(-)b/deskutils/calibre/files/patch-setup_build.py (+10 lines)
1	--- setup/build.py.orig 2020-10-10 16:20:32 UTC
2	+++ setup/build.py
3	@@ -496,6 +496,7 @@ exceptions = {needs_exceptions}
4	include-dirs = {ext.inc_dirs}
5	qmake-QT = ["widgets"]
6	sip-file = "{os.path.basename(sipf)}"
7	+tags = ["WS_X11"]
8	''')
9	shutil.copy2(sipf, src_dir)
10

Added Link Here

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




--- src/calibre/linux.py.orig	2020-11-13 01:58:49 UTC
+++ src/calibre/linux.py
@@ -1103,7 +1103,7 @@ Name=E-book viewer
                 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
 GenericName=Viewer for E-books
 Comment=Viewer for E-books in all the major formats
 TryExec=ebook-viewer

 Icon=calibre-viewer
 Categories=Graphics;Viewer;
 '''
@@ -1116,7 +1116,7 @@ Name=E-book editor
 GenericName=Editor for E-books
 Comment=Edit E-books in various formats
 TryExec=ebook-edit

 Icon=calibre-ebook-edit
 Categories=Office;
 '''
@@ -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 %U
+Exec=calibre %U
 Icon=calibre-gui
 Categories=Office;
 X-GNOME-UsesNotifications=true

Added Link Here

(-)b/deskutils/calibre/files/patch-src_calibre_utils_formatter.py (+11 lines)
1	--- src/calibre/utils/formatter.py.orig 2020-11-13 01:58:49 UTC
2	+++ src/calibre/utils/formatter.py
3	@@ -536,7 +536,7 @@ class _Interpreter(object):
4
5	def do_node_first_non_empty(self, prog):
6	for expr in prog.expression_list:
7	- if v := self.expr(expr):
8	+ if v == self.expr(expr):
9	return v
10
11	NODE_OPS = {




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

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

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

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

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

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

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

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

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

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

lib/calibre/calibre/library/sqlite.py
lib/calibre/calibre/libunzip.py
lib/calibre/calibre/linux.py
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/plugins/3/unicode_names.so
lib/calibre/calibre/ptempfile.py
lib/calibre/calibre/rpdb.py
lib/calibre/calibre/spell/__init__.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

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

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

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

%%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

%%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

%%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

%%DATADIR%%/viewer.html
%%DATADIR%%/viewer.js
%%PYTHON_SITELIBDIR%%/init_calibre.py
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




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"));
 




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=	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





PORTNAME=	libSavitar
DISTVERSION=	4.5.0
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.5+ pyqt:5
USE_PYQT=	sip pysip
USE_GITHUB=	yes
GH_ACCOUNT=	Ultimaker
GH_TAGNAME=	96eba0e

Lines 1-3 Link Here

(-)b/devel/libsavitar/distinfo (-1 / +3 lines)
1	TIMESTAMP = 1583953836	1	TIMESTAMP = 1602393384
2	SHA256 (Ultimaker/Ultimaker-libSavitar-4.5.0-96eba0e_GH0.tar.gz) = f64e9b20d6783247a88ddc751a80d20eec2073465c0b46fbba45c1ab9c01eb75	2	SHA256 (Ultimaker/Ultimaker-libSavitar-4.5.0-96eba0e_GH0.tar.gz) = f64e9b20d6783247a88ddc751a80d20eec2073465c0b46fbba45c1ab9c01eb75
3	SIZE (Ultimaker/Ultimaker-libSavitar-4.5.0-96eba0e_GH0.tar.gz) = 98038	3	SIZE (Ultimaker/Ultimaker-libSavitar-4.5.0-96eba0e_GH0.tar.gz) = 98038
		4	SHA256 (Ultimaker/195633cf0c5f.patch) = 5c4fce2fbf144ae92882234dc5b703a7e1f9594a80cfefbaaa083b4c7d81b0f4
		5	SIZE (Ultimaker/195633cf0c5f.patch) = 5331

Lines 15-23 CONFIGURE_ARGS= ${PYQT5_MODULES_ALL:N${PYQT_MODULE}:C/.*/--disable=&/} \ Link Here

(-)b/devel/py-qt5-core/Makefile (-2 / +2 lines)
15		15
16	PYQT_DIST= yes	16	PYQT_DIST= yes
17		17
18	USES= python pyqt:5 qt:5	18	USES= python:3.5+ pyqt:5 qt:5
19	USE_PYTHON= concurrent flavors py3kplist	19	USE_PYTHON= concurrent flavors py3kplist
20	USE_PYQT= sip	20	USE_PYQT= sip pysip
21	USE_QT= core buildtools_build qmake_build	21	USE_QT= core buildtools_build qmake_build
22		22
23	OPTIONS_DEFINE= API DEBUG	23	OPTIONS_DEFINE= API DEBUG

Lines 12-18 RUN_DEPENDS= ${PY_ENUM34} Link Here

(-)b/devel/py-qt5-dbus/Makefile (-1 / +1 lines)
12	CONFIGURE_ARGS= --enable QtDBus	12	CONFIGURE_ARGS= --enable QtDBus
13	PYQT_DIST= yes	13	PYQT_DIST= yes
14		14
15	USES= python pyqt:5 qt:5	15	USES= python:3.5+ pyqt:5 qt:5
16	USE_PYQT= sip_build core_run	16	USE_PYQT= sip_build core_run
17	USE_PYTHON= concurrent flavors py3kplist	17	USE_PYTHON= concurrent flavors py3kplist
18	USE_QT= core dbus qmake_build	18	USE_QT= core dbus qmake_build

Lines 15-21 LIB_DEPENDS= libdbus-1.so:devel/dbus Link Here

(-)b/devel/py-qt5-dbussupport/Makefile (-1 / +1 lines)
15	CONFIGURE_ARGS= --enable QtCore	15	CONFIGURE_ARGS= --enable QtCore
16	PYQT_DIST= yes	16	PYQT_DIST= yes
17		17
18	USES= pkgconfig python pyqt:5 qt:5	18	USES= pkgconfig python:3.5+ pyqt:5 qt:5
19	USE_PYQT= sip_build	19	USE_PYQT= sip_build
20	USE_PYTHON= concurrent flavors py3kplist	20	USE_PYTHON= concurrent flavors py3kplist
21	USE_QT= core buildtools_build qmake_build	21	USE_QT= core buildtools_build qmake_build

Lines 12-18 RUN_DEPENDS= ${PY_ENUM34} Link Here

(-)b/devel/py-qt5-designer/Makefile (-1 / +1 lines)
12	CONFIGURE_ARGS= --enable QtDesigner --no-designer-plugin	12	CONFIGURE_ARGS= --enable QtDesigner --no-designer-plugin
13	PYQT_DIST= yes	13	PYQT_DIST= yes
14		14
15	USES= gl python pyqt:5 qt:5	15	USES= gl python:3.5+ pyqt:5 qt:5
16	USE_GL= gl	16	USE_GL= gl
17	USE_PYQT= sip_build core_run widgets_run	17	USE_PYQT= sip_build core_run widgets_run
18	USE_PYTHON= concurrent flavors py3kplist	18	USE_PYTHON= concurrent flavors py3kplist

Lines 17-23 CONFIGURE_ARGS= --enable QtDesigner Link Here

(-)b/devel/py-qt5-designerplugin/Makefile (-1 / +1 lines)
17		17
18	PYQT_DIST= yes	18	PYQT_DIST= yes
19		19
20	USES= gl python pyqt:5 qt:5	20	USES= gl python:3.5+ pyqt:5 qt:5
21	USE_GL= gl	21	USE_GL= gl
22	USE_PYQT= sip_build	22	USE_PYQT= sip_build
23	USE_PYTHON= concurrent flavors py3kplist	23	USE_PYTHON= concurrent flavors py3kplist

Lines 12-18 RUN_DEPENDS= ${PY_ENUM34} Link Here

(-)b/devel/py-qt5-help/Makefile (-1 / +1 lines)
12	CONFIGURE_ARGS= --enable QtHelp	12	CONFIGURE_ARGS= --enable QtHelp
13	PYQT_DIST= yes	13	PYQT_DIST= yes
14		14
15	USES= gl python pyqt:5 qt:5	15	USES= gl python:3.5+ pyqt:5 qt:5
16	USE_GL= gl	16	USE_GL= gl
17	USE_PYQT= sip_build core_run widgets_run	17	USE_PYQT= sip_build core_run widgets_run
18	USE_PYTHON= concurrent flavors py3kplist	18	USE_PYTHON= concurrent flavors py3kplist

Lines 12-18 RUN_DEPENDS= ${PY_ENUM34} Link Here

(-)b/devel/py-qt5-location/Makefile (-1 / +1 lines)
12	CONFIGURE_ARGS= --enable QtLocation	12	CONFIGURE_ARGS= --enable QtLocation
13	PYQT_DIST= yes	13	PYQT_DIST= yes
14		14
15	USES= gl python pyqt:5 qt:5	15	USES= gl python:3.5+ pyqt:5 qt:5
16	USE_GL= gl	16	USE_GL= gl
17	USE_PYQT= sip_build core_run widgets_run	17	USE_PYQT= sip_build core_run widgets_run
18	USE_PYTHON= concurrent flavors py3kplist	18	USE_PYTHON= concurrent flavors py3kplist

Lines 17-23 DESTDIRNAME= INSTALL_ROOT Link Here

(-)b/devel/py-qt5-qscintilla2/Makefile (-1 / +1 lines)
17		17
18	HAS_CONFIGURE= yes	18	HAS_CONFIGURE= yes
19		19
20	USES= python pyqt:5 gl qmake:no_env qt:5	20	USES= python:3.5+ pyqt:5 gl qmake:no_env qt:5
21	USE_GL= gl	21	USE_GL= gl
22	USE_PYQT= core gui printsupport widgets	22	USE_PYQT= core gui printsupport widgets
23	USE_PYTHON= concurrent flavors py3kplist	23	USE_PYTHON= concurrent flavors py3kplist

Lines 12-18 RUN_DEPENDS= ${PY_ENUM34} Link Here

(-)b/devel/py-qt5-remoteobjects/Makefile (-1 / +1 lines)
12	CONFIGURE_ARGS= --enable QtRemoteObjects	12	CONFIGURE_ARGS= --enable QtRemoteObjects
13	PYQT_DIST= yes	13	PYQT_DIST= yes
14		14
15	USES= gl python pyqt:5 qt:5	15	USES= gl python:3.5+ pyqt:5 qt:5
16	USE_GL= gl	16	USE_GL= gl
17	USE_PYQT= sip_build core_run widgets_run	17	USE_PYQT= sip_build core_run widgets_run
18	USE_PYTHON= concurrent flavors py3kplist	18	USE_PYTHON= concurrent flavors py3kplist

Lines 12-18 RUN_DEPENDS= ${PY_ENUM34} Link Here

(-)b/devel/py-qt5-test/Makefile (-1 / +1 lines)
12	CONFIGURE_ARGS= --enable QtTest	12	CONFIGURE_ARGS= --enable QtTest
13	PYQT_DIST= yes	13	PYQT_DIST= yes
14		14
15	USES= gl python pyqt:5 qt:5	15	USES= gl python:3.5+ pyqt:5 qt:5
16	USE_GL= gl	16	USE_GL= gl
17	USE_PYQT= sip_build core_run widgets_run	17	USE_PYQT= sip_build core_run widgets_run
18	USE_PYTHON= concurrent flavors py3kplist	18	USE_PYTHON= concurrent flavors py3kplist

Lines 8-14 PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Link Here

(-)b/devel/py-qt5/Makefile (-1 / +1 lines)
8	MAINTAINER= kde@FreeBSD.org	8	MAINTAINER= kde@FreeBSD.org
9	COMMENT= Python bindings for the Qt 5 toolkit (meta port)	9	COMMENT= Python bindings for the Qt 5 toolkit (meta port)
10		10
11	USES= metaport python pyqt:5	11	USES= metaport python:3.5+ pyqt:5
12	USE_PYTHON= concurrent flavors py3kplist	12	USE_PYTHON= concurrent flavors py3kplist
13		13
14	# Keep these synchronized with _USE_PYQT_ALL in Mk/Use/pyqt.mk	14	# Keep these synchronized with _USE_PYQT_ALL in Mk/Use/pyqt.mk

Lines 1-3 Link Here

(-)b/devel/py-qt5/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1595064383	1	TIMESTAMP = 1602000543
2	SHA256 (PyQt5-5.15.0.tar.gz) = c6f75488ffd5365a65893bc64ea82a6957db126fbfe33654bcd43ae1c30c52f9	2	SHA256 (PyQt5-5.15.1.tar.gz) = d9a76b850246d08da9863189ecb98f6c2aa9b4d97a3e85e29330a264aed0f9a1
3	SIZE (PyQt5-5.15.0.tar.gz) = 3262004	3	SIZE (PyQt5-5.15.1.tar.gz) = 3264559




# $FreeBSD$

PORTNAME=	qtbuilder
PORTVERSION=	${PYQTBUILDER_VERSION}
CATEGORIES=	devel python
MASTER_SITES=	${MASTER_SITES_PYQTBUILDER}
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
DISTNAME=	${PYQTBUILDER_DISTNAME}

MAINTAINER=	kde@FreeBSD.org
COMMENT=	The PEP 517 compliant PyQt build system

USES=		python:3.5+ pyqt:5
USE_PYTHON=	autoplist concurrent distutils flavors py3kplist
USE_PYQT=	#





MAINTAINER=	kde@FreeBSD.org
COMMENT=	Python to C and C++ bindings generator

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>

Lines 1-3 Link Here

(-)b/devel/py-sip/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1600752207	1	TIMESTAMP = 1603131908
2	SHA256 (sip-4.19.24.tar.gz) = edcd3790bb01938191eef0f6117de0bf56d1136626c0ddb678f3a558d62e41e5	2	SHA256 (sip-5.4.0.tar.gz) = 4282ab45948674f5ef74278a8e70d1302f65c95b519a0af19409002f5715d641
3	SIZE (sip-4.19.24.tar.gz) = 1055461	3	SIZE (sip-5.4.0.tar.gz) = 1106676




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")
 




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

Lines 1-7 Link Here

(-)b/devel/pyside2-tools/Makefile (-1 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= pyside2-tools	3	PORTNAME= pyside2-tools
4	DISTVERSION= 5.15.1	4	DISTVERSION= 5.15.2
5	CATEGORIES= devel	5	CATEGORIES= devel
6	MASTER_SITES= QT/official_releases/QtForPython/shiboken2/PySide2-${DISTVERSION}-src	6	MASTER_SITES= QT/official_releases/QtForPython/shiboken2/PySide2-${DISTVERSION}-src
7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

Lines 1-3 Link Here

(-)b/devel/pyside2-tools/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1601627385	1	TIMESTAMP = 1606840487
2	SHA256 (pyside-setup-opensource-src-5.15.1.tar.xz) = f175c1d8813257904cf0efeb58e44f68d53b9916f73adaf9ce19514c0271c3fa	2	SHA256 (pyside-setup-opensource-src-5.15.2.tar.xz) = b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418
3	SIZE (pyside-setup-opensource-src-5.15.1.tar.xz) = 3454052	3	SIZE (pyside-setup-opensource-src-5.15.2.tar.xz) = 3472624




# $FreeBSD$

PORTNAME=	pyside2
DISTVERSION=	5.15.2
CATEGORIES=	devel
MASTER_SITES=	QT/official_releases/QtForPython/shiboken2/PySide2-${DISTVERSION}-src
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

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>

Lines 1-3 Link Here

(-)b/devel/pyside2/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1601626288	1	TIMESTAMP = 1606754632
2	SHA256 (pyside-setup-opensource-src-5.15.1.tar.xz) = f175c1d8813257904cf0efeb58e44f68d53b9916f73adaf9ce19514c0271c3fa	2	SHA256 (pyside-setup-opensource-src-5.15.2.tar.xz) = b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418
3	SIZE (pyside-setup-opensource-src-5.15.1.tar.xz) = 3454052	3	SIZE (pyside-setup-opensource-src-5.15.2.tar.xz) = 3472624




Only enter the directories we want to build, otherwise we might fail due to
missing dependencies.

--- src/src.pro.orig	2020-11-20 20:09:00 UTC
+++ src/src.pro
@@ -1,55 +1,3 @@
 TEMPLATE = subdirs
 
-qtHaveModule(widgets) {

-    } else {
-        QT_FOR_CONFIG += widgets
-        qtConfig(pushbutton):qtConfig(toolbutton) {
-            SUBDIRS = designer \
-                      designer \
-                      pixeltool
-
-            !static|contains(QT_PLUGINS, qsqlite): SUBDIRS += assistant
-
-            linguist.depends = designer
-        }
-        qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator

Lines 6-10 Link Here

(-)b/devel/qt5-buildtools/pkg-plist (-2 lines)
6	%%QT_LIBDIR%%/libQt5Bootstrap.a	6	%%QT_LIBDIR%%/libQt5Bootstrap.a
7	%%QT_LIBDIR%%/libQt5Bootstrap.prl	7	%%QT_LIBDIR%%/libQt5Bootstrap.prl
8	%%QT_MKSPECDIR%%/modules/qt_lib_bootstrap_private.pri	8	%%QT_MKSPECDIR%%/modules/qt_lib_bootstrap_private.pri
9	%%QT_CMAKEDIR%%/Qt5Bootstrap/Qt5BootstrapConfig.cmake
10	%%QT_CMAKEDIR%%/Qt5Bootstrap/Qt5BootstrapConfigVersion.cmake

Lines 2-8 Link Here

(-)b/devel/qt5-core/Makefile (-1 lines)
2		2
3	PORTNAME= core	3	PORTNAME= core
4	DISTVERSION= ${QT5_VERSION}	4	DISTVERSION= ${QT5_VERSION}
5	PORTREVISION= 4
6	CATEGORIES= devel	5	CATEGORIES= devel
7	PKGNAMEPREFIX= qt5-	6	PKGNAMEPREFIX= qt5-
8		7




--- src/corelib/time/qtimezoneprivate_tz.cpp.orig	2020-09-12 18:44:11 UTC
+++ src/corelib/time/qtimezoneprivate_tz.cpp
@@ -1155,6 +1155,8 @@ class ZoneNameReader : public QObject (public)
             return m_name;
 
         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
+                    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
+            }
+        }
         return QByteArray();
     }
 
     if (ianaId.isEmpty()) {
         QFile zone(QStringLiteral("/etc/TZ"));




Only enter the directories we want to build, otherwise we might fail due to
missing dependencies.

--- src/src.pro.orig	2020-11-20 20:19:40 UTC
+++ src/src.pro
@@ -1,55 +1,3 @@
 TEMPLATE = subdirs
 
-qtHaveModule(widgets) {

-    } else {
-        QT_FOR_CONFIG += widgets
-        qtConfig(pushbutton):qtConfig(toolbutton) {
-            SUBDIRS = designer \
-                      designer \
-                      pixeltool
-
-            !static|contains(QT_PLUGINS, qsqlite): SUBDIRS += assistant
-
-            linguist.depends = designer
-        }
-        qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator





assistant/ is built in devel/qt5-assistant.

--- src/assistant/assistant.pro.orig	2020-08-24 09:20:54 UTC
+++ src/assistant/assistant.pro
@@ -8,7 +8,6 @@ TEMPLATE = subdirs
 
 SUBDIRS += \
            help \

            qhelpgenerator \
            qcollectiongenerator
 
@@ -16,7 +15,6 @@ assistant.depends = help
 qhelpgenerator.depends = help
 
 qtNomakeTools( \




Only enter the directories we want to build, otherwise we might fail due to
missing dependencies.

--- src/src.pro.orig	2020-11-20 20:01:31 UTC
+++ src/src.pro
@@ -1,55 +1,3 @@
 TEMPLATE = subdirs
 
-qtHaveModule(widgets) {

-    } else {
-        QT_FOR_CONFIG += widgets
-        qtConfig(pushbutton):qtConfig(toolbutton) {
-            SUBDIRS = designer \
-                      designer \
-                      pixeltool
-
-            !static|contains(QT_PLUGINS, qsqlite): SUBDIRS += assistant
-
-            linguist.depends = designer
-        }
-        qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator




Only enter the directories we want to build, otherwise we might fail due to
missing dependencies.

--- src/src.pro.orig	2020-11-21 06:11:19 UTC
+++ src/src.pro
@@ -1,55 +1,3 @@
 TEMPLATE = subdirs
 
-qtHaveModule(widgets) {

-    } else {
-        QT_FOR_CONFIG += widgets
-        qtConfig(pushbutton):qtConfig(toolbutton) {
-            SUBDIRS = designer \
-                      designer \
-                      pixeltool
-
-            !static|contains(QT_PLUGINS, qsqlite): SUBDIRS += assistant
-
-            linguist.depends = designer
-        }
-        qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator




Only enter the directories we want to build, otherwise we might fail due to
missing dependencies.

--- src/src.pro.orig	2020-11-20 20:18:27 UTC
+++ src/src.pro
@@ -1,55 +1,3 @@
 TEMPLATE = subdirs
 
-qtHaveModule(widgets) {

-    } else {
-        QT_FOR_CONFIG += widgets
-        qtConfig(pushbutton):qtConfig(toolbutton) {
-            SUBDIRS = designer \
-                      designer \
-                      pixeltool
-
-            !static|contains(QT_PLUGINS, qsqlite): SUBDIRS += assistant
-
-            linguist.depends = designer
-        }
-        qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator




Only enter the directories we want to build, otherwise we might fail due to
missing dependencies

--- src/src.pro.orig	2020-11-20 20:10:45 UTC
+++ src/src.pro
@@ -1,55 +1,3 @@
 TEMPLATE = subdirs
 
-qtHaveModule(widgets) {

-    } else {
-        QT_FOR_CONFIG += widgets
-        qtConfig(pushbutton):qtConfig(toolbutton) {
-            SUBDIRS = designer \
-                      designer \
-                      pixeltool
-
-            !static|contains(QT_PLUGINS, qsqlite): SUBDIRS += assistant
-
-            linguist.depends = designer
-        }
-        qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator

-    SUBDIRS += macdeployqt
-}
-
-qtHaveModule(dbus): SUBDIRS += qdbus
-
-win32|winrt:SUBDIRS += windeployqt
-winrt:SUBDIRS += winrtrunner

-    winrtrunner.depends += qtattributionsscanner
-    linguist.depends += qtattributionsscanner
-}
+SUBDIRS += qdbus




Only enter the directories we want to build, otherwise we might fail due to
missing dependencies.

--- src/src.pro.orig	2020-11-20 20:04:42 UTC
+++ src/src.pro
@@ -1,55 +1,3 @@
 TEMPLATE = subdirs
 
-qtHaveModule(widgets) {

-    } else {
-        QT_FOR_CONFIG += widgets
-        qtConfig(pushbutton):qtConfig(toolbutton) {
-            SUBDIRS = designer \
-                      designer \
-                      pixeltool
-
-            !static|contains(QT_PLUGINS, qsqlite): SUBDIRS += assistant
-
-            linguist.depends = designer
-        }
-        qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator

-    SUBDIRS += macdeployqt
-}
-
-qtHaveModule(dbus): SUBDIRS += qdbus
-
-win32|winrt:SUBDIRS += windeployqt
-winrt:SUBDIRS += winrtrunner

-    winrtrunner.depends += qtattributionsscanner
-    linguist.depends += qtattributionsscanner
-}
+SUBDIRS = qdbus

Lines 1-6 Link Here

(-)b/devel/qt5-qdoc/files/patch-src_qdoc_qdoc.pro (-2 / +2 lines)
1	--- src/qdoc/qdoc.pro.orig 2019-12-31 21:11:48 UTC	1	--- src/qdoc/qdoc.pro.orig 2020-08-24 09:20:54 UTC
2	+++ src/qdoc/qdoc.pro	2	+++ src/qdoc/qdoc.pro
3	@@ -152,6 +152,6 @@ cmake_qdoc_config_version_file.output = $$MODULE_BASE_	3	@@ -158,6 +158,6 @@ cmake_qdoc_config_version_file.output = $$MODULE_BASE_
4	QMAKE_SUBSTITUTES += cmake_qdoc_config_file cmake_qdoc_config_version_file	4	QMAKE_SUBSTITUTES += cmake_qdoc_config_file cmake_qdoc_config_version_file
5		5
6	cmake_qdoc_tools_files.files += $$cmake_qdoc_config_file.output $$cmake_qdoc_config_version_file.output	6	cmake_qdoc_tools_files.files += $$cmake_qdoc_config_file.output $$cmake_qdoc_config_version_file.output




Only enter the directories we want to build, otherwise we might fail due to
missing dependencies.

--- src/src.pro.orig	2020-11-20 20:20:35 UTC
+++ src/src.pro
@@ -1,55 +1,5 @@
 TEMPLATE = subdirs
 
-qtHaveModule(widgets) {

-    } else {
-        QT_FOR_CONFIG += widgets
-        qtConfig(pushbutton):qtConfig(toolbutton) {
-            SUBDIRS = designer \
-                      designer \
-                      pixeltool
-
-            !static|contains(QT_PLUGINS, qsqlite): SUBDIRS += assistant
-
-            linguist.depends = designer
-        }
-        qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator




Only enter the directories we want to build, otherwise we might fail due to
missing dependencies.

--- src/src.pro.orig	2020-11-20 20:09:40 UTC
+++ src/src.pro
@@ -1,55 +1,3 @@
 TEMPLATE = subdirs
 
-qtHaveModule(widgets) {

-    } else {
-        QT_FOR_CONFIG += widgets
-        qtConfig(pushbutton):qtConfig(toolbutton) {
-            SUBDIRS = designer \
-                      designer \
-                      pixeltool
-
-            !static|contains(QT_PLUGINS, qsqlite): SUBDIRS += assistant
-
-            linguist.depends = designer
-        }
-        qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator




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

Lines 1-7 Link Here

(-)b/devel/shiboken2/Makefile (-1 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= shiboken2	3	PORTNAME= shiboken2
4	DISTVERSION= 5.15.1	4	DISTVERSION= 5.15.2
5	CATEGORIES= devel	5	CATEGORIES= devel
6	MASTER_SITES= QT/official_releases/QtForPython/shiboken2/PySide2-${DISTVERSION}-src	6	MASTER_SITES= QT/official_releases/QtForPython/shiboken2/PySide2-${DISTVERSION}-src
7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

Lines 1-3 Link Here

(-)b/devel/shiboken2/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1601626006	1	TIMESTAMP = 1606807809
2	SHA256 (pyside-setup-opensource-src-5.15.1.tar.xz) = f175c1d8813257904cf0efeb58e44f68d53b9916f73adaf9ce19514c0271c3fa	2	SHA256 (pyside-setup-opensource-src-5.15.2.tar.xz) = b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418
3	SIZE (pyside-setup-opensource-src-5.15.1.tar.xz) = 3454052	3	SIZE (pyside-setup-opensource-src-5.15.2.tar.xz) = 3472624

Lines 22-27 include/shiboken2/shiboken.h Link Here

(-)b/devel/shiboken2/pkg-plist (+1 lines)
22	include/shiboken2/shibokenbuffer.h	22	include/shiboken2/shibokenbuffer.h
23	include/shiboken2/shibokenmacros.h	23	include/shiboken2/shibokenmacros.h
24	include/shiboken2/signature.h	24	include/shiboken2/signature.h
		25	include/shiboken2/signature_p.h
25	include/shiboken2/threadstatesaver.h	26	include/shiboken2/threadstatesaver.h
26	include/shiboken2/typespec.h	27	include/shiboken2/typespec.h
27	include/shiboken2/voidptr.h	28	include/shiboken2/voidptr.h

Lines 15-21 RUN_DEPENDS= ${PY_MERCURIAL} \ Link Here

(-)b/devel/tortoisehg/Makefile (-1 / +1 lines)
15	${PYTHON_PKGNAMEPREFIX}iniparse>=0.4:devel/py-iniparse@${PY_FLAVOR} \	15	${PYTHON_PKGNAMEPREFIX}iniparse>=0.4:devel/py-iniparse@${PY_FLAVOR} \
16	${PY_PYGMENTS}	16	${PY_PYGMENTS}
17		17
18	USES= pyqt:5 python	18	USES= pyqt:5 python:3.5+
19	USE_PYQT= core gui network qscintilla2 xml	19	USE_PYQT= core gui network qscintilla2 xml
20	USE_PYTHON= distutils autoplist	20	USE_PYTHON= distutils autoplist
21		21




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);




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.5+ qt:5
USE_GITHUB=	yes
GH_ACCOUNT=	frescobaldi
USE_PYQT=	gui xml sip_build qtbuilder
USE_PYTHON=	autoplist distutils

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:
	${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>




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




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)




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/*/*/*/*/*/*/*"
+]




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;




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




%%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

Lines 12-18 RUN_DEPENDS= ${PY_ENUM34} Link Here

(-)b/graphics/py-qt5-svg/Makefile (-1 / +1 lines)
12	CONFIGURE_ARGS= --enable QtSvg	12	CONFIGURE_ARGS= --enable QtSvg
13	PYQT_DIST= yes	13	PYQT_DIST= yes
14		14
15	USES= gl python pyqt:5 qt:5	15	USES= gl python:3.5+ pyqt:5 qt:5
16	USE_GL= gl	16	USE_GL= gl
17	USE_PYQT= sip_build core_run gui_run widgets_run	17	USE_PYQT= sip_build core_run gui_run widgets_run
18	USE_PYTHON= concurrent flavors py3kplist	18	USE_PYTHON= concurrent flavors py3kplist

Lines 7-12 DISTVERSION= 3_10_12 Link Here

(-)b/graphics/qgis-ltr/Makefile (-2 / +6 lines)
7	CATEGORIES= graphics geography	7	CATEGORIES= graphics geography
8	PKGNAMESUFFIX= -ltr	8	PKGNAMESUFFIX= -ltr
9		9
		10	PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
		11	PATCHFILES= 33192f38bc7d.patch:-p1 \
		12	12203f0ce527.patch:-p1 \
		13	6e9d42d70099.patch:-p1
		14
10	MAINTAINER= rhurlin@FreeBSD.org	15	MAINTAINER= rhurlin@FreeBSD.org
11	COMMENT= Free and Open Source Geographic Information System	16	COMMENT= Free and Open Source Geographic Information System
12		17
Lines 85-91 RUN_DEPENDS= astyle:devel/astyle \ Link Here
85	${PYTHON_PKGNAMEPREFIX}pyproj>=2.1.3:graphics/py-pyproj@${PY_FLAVOR} \	90	${PYTHON_PKGNAMEPREFIX}pyproj>=2.1.3:graphics/py-pyproj@${PY_FLAVOR} \
86	${PYTHON_PKGNAMEPREFIX}pyrsgis>=0.2.6:graphics/py-pyrsgis@${PY_FLAVOR} \	91	${PYTHON_PKGNAMEPREFIX}pyrsgis>=0.2.6:graphics/py-pyrsgis@${PY_FLAVOR} \
87	${PYTHON_PKGNAMEPREFIX}pytz>=2020.1:devel/py-pytz@${PY_FLAVOR} \	92	${PYTHON_PKGNAMEPREFIX}pytz>=2020.1:devel/py-pytz@${PY_FLAVOR} \
88	${PYTHON_PKGNAMEPREFIX}qt5-quick>=5.13.1:x11-toolkits/py-qt5-quick@${PY_FLAVOR} \
89	${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR} \	93	${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR} \
90	${PYTHON_PKGNAMEPREFIX}scikit-image>=0.14.3:graphics/py-scikit-image@${PY_FLAVOR} \	94	${PYTHON_PKGNAMEPREFIX}scikit-image>=0.14.3:graphics/py-scikit-image@${PY_FLAVOR} \
91	${PYTHON_PKGNAMEPREFIX}Shapely>=1.6.4:devel/py-shapely@${PY_FLAVOR} \	95	${PYTHON_PKGNAMEPREFIX}Shapely>=1.6.4:devel/py-shapely@${PY_FLAVOR} \
Lines 108-114 USE_QT= 3d buildtools_build core concurrent dbus declarative \ Link Here
108	network printsupport qmake_build script serialport \	112	network printsupport qmake_build script serialport \
109	sql sql-pgsql sql-sqlite3 svg testlib uitools \	113	sql sql-pgsql sql-sqlite3 svg testlib uitools \
110	webengine widgets webkit xml	114	webengine widgets webkit xml
111	USE_PYQT= core gui network qml quickwidgets qscintilla2 \	115	USE_PYQT= core gui network qml quick quickwidgets qscintilla2 \
112	sip sql svg webkit_run webkitwidgets_run xml	116	sip sql svg webkit_run webkitwidgets_run xml
113		117
114	CONFLICTS_INSTALL= qgis	118	CONFLICTS_INSTALL= qgis

Lines 1-3 Link Here

(-)b/graphics/qgis-ltr/distinfo (+6 lines)
1	TIMESTAMP = 1606668510	1	TIMESTAMP = 1606668510
2	SHA256 (qgis-QGIS-final-3_10_12_GH0.tar.gz) = 2ccd292588246c2ce00739d378028f7d859b9b8bd44ef0216d9846c9854ef130	2	SHA256 (qgis-QGIS-final-3_10_12_GH0.tar.gz) = 2ccd292588246c2ce00739d378028f7d859b9b8bd44ef0216d9846c9854ef130
3	SIZE (qgis-QGIS-final-3_10_12_GH0.tar.gz) = 122038716	3	SIZE (qgis-QGIS-final-3_10_12_GH0.tar.gz) = 122038716
		4	SHA256 (33192f38bc7d.patch) = 97d3f882bea11c5342ddf53f6c055f9f38c5af18edb2d52c116f1dab4a49189b
		5	SIZE (33192f38bc7d.patch) = 12604
		6	SHA256 (12203f0ce527.patch) = bb30342fbf19f1a9150abd97fb1b5d6bbe3f3062bb217a7179332d0b02168235
		7	SIZE (12203f0ce527.patch) = 2452
		8	SHA256 (6e9d42d70099.patch) = 44c3ecc27c839492d9eae2d352e0ea9f37c11a419fb3f8862350b1e52cb359a6
		9	SIZE (6e9d42d70099.patch) = 1513

Lines 6-11 DISTVERSIONPREFIX= final- Link Here

(-)b/graphics/qgis/Makefile (-6 / +5 lines)
6	DISTVERSION= 3_16_1	6	DISTVERSION= 3_16_1
7	CATEGORIES= graphics geography	7	CATEGORIES= graphics geography
8		8
		9	PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
		10
9	MAINTAINER= rhurlin@FreeBSD.org	11	MAINTAINER= rhurlin@FreeBSD.org
10	COMMENT= Free and Open Source Geographic Information System	12	COMMENT= Free and Open Source Geographic Information System
11		13
Lines 84-90 RUN_DEPENDS= astyle:devel/astyle \ Link Here
84	${PYTHON_PKGNAMEPREFIX}pyproj>=2.1.3:graphics/py-pyproj@${PY_FLAVOR} \	86	${PYTHON_PKGNAMEPREFIX}pyproj>=2.1.3:graphics/py-pyproj@${PY_FLAVOR} \
85	${PYTHON_PKGNAMEPREFIX}pyrsgis>=0.2.6:graphics/py-pyrsgis@${PY_FLAVOR} \	87	${PYTHON_PKGNAMEPREFIX}pyrsgis>=0.2.6:graphics/py-pyrsgis@${PY_FLAVOR} \
86	${PYTHON_PKGNAMEPREFIX}pytz>=2020.1:devel/py-pytz@${PY_FLAVOR} \	88	${PYTHON_PKGNAMEPREFIX}pytz>=2020.1:devel/py-pytz@${PY_FLAVOR} \
87	${PYTHON_PKGNAMEPREFIX}qt5-quick>=5.13.1:x11-toolkits/py-qt5-quick@${PY_FLAVOR} \
88	${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR} \	89	${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR} \
89	${PYTHON_PKGNAMEPREFIX}scikit-image>=0.14.3:graphics/py-scikit-image@${PY_FLAVOR} \	90	${PYTHON_PKGNAMEPREFIX}scikit-image>=0.14.3:graphics/py-scikit-image@${PY_FLAVOR} \
90	${PYTHON_PKGNAMEPREFIX}Shapely>=1.6.4:devel/py-shapely@${PY_FLAVOR} \	91	${PYTHON_PKGNAMEPREFIX}Shapely>=1.6.4:devel/py-shapely@${PY_FLAVOR} \
Lines 107-114 USE_QT= 3d buildtools_build core concurrent dbus declarative \ Link Here
107	network printsupport qmake_build script serialport \	108	network printsupport qmake_build script serialport \
108	sql sql-pgsql sql-sqlite3 svg testlib uitools \	109	sql sql-pgsql sql-sqlite3 svg testlib uitools \
109	webengine widgets webkit xml	110	webengine widgets webkit xml
110	USE_PYQT= core gui network qml quickwidgets qscintilla2 \	111	USE_PYQT= core gui network qml quick quickwidgets qscintilla2 \
111	sip sql svg webkit_run webkitwidgets_run xml	112	pysip sip sql svg webkit_run webkitwidgets_run xml
		113
112		114
113	CONFLICTS_INSTALL= qgis-ltr	115	CONFLICTS_INSTALL= qgis-ltr
114		116
Lines 159-167 post-patch: Link Here
159	@${REINPLACE_CMD} -e 's\|"-mllvm -inline-threshold=128"\|"-O1"\|g' \	161	@${REINPLACE_CMD} -e 's\|"-mllvm -inline-threshold=128"\|"-O1"\|g' \
160	${WRKSRC}/src/core/CMakeLists.txt	162	${WRKSRC}/src/core/CMakeLists.txt
161	.endif	163	.endif
162	@${REINPLACE_CMD} -e 's\|%%PYQT_SIPDIR%%\|${PYQT_SIPDIR}\|' \
163	${WRKSRC}/cmake/FindPyQt5.py \
164	${WRKSRC}/cmake/FindSIP.py
165		164
166	pre-configure:	165	pre-configure:
167	${MKDIR} ${CONFIGURE_WRKSRC}/bin && ${LN} -s ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/bin/python3	166	${MKDIR} ${CONFIGURE_WRKSRC}/bin && ${LN} -s ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/bin/python3

Removed Link Here

(-)a/graphics/qgis/files/patch-cmake_FindPyQt5.py (-11 lines)
1	--- cmake/FindPyQt5.py.orig 2020-08-20 07:52:34 UTC
2	+++ cmake/FindPyQt5.py
3	@@ -61,7 +61,7 @@ else: # Code for SIP v5
4	import shutil
5	cfg = {
6	'pyqt_mod_dir': os.path.dirname(PyQt5.__file__),
7	- 'pyqt_sip_dir': os.path.join(get_python_lib(plat_specific=1), "PyQt5", "bindings"),
8	+ 'pyqt_sip_dir': "%%PYQT_SIPDIR%%",
9	'pyqt_bin_dir': os.path.dirname(shutil.which("pyuic5")),
10	}
11

Removed Link Here

(-)a/graphics/qgis/files/patch-cmake_FindSIP.py (-9 lines)
1	--- cmake/FindSIP.py.orig 2020-08-20 07:34:51 UTC
2	+++ cmake/FindSIP.py
3	@@ -56,5 +56,5 @@ else: # Code for SIP v5
4	print("sip_bin:%s" % shutil.which("sip5"))
5
6	from distutils.sysconfig import get_python_lib
7	- python_modules_dir = get_python_lib(plat_specific=1)
8	+ python_modules_dir = "%%PYQT_SIPDIR%%"
9	print("default_sip_dir:%s" % python_modules_dir)




Only enter the directories we want to build, otherwise we might fail due to
missing dependencies.

--- src/src.pro.orig	2020-11-20 20:03:15 UTC
+++ src/src.pro
@@ -1,55 +1,3 @@
 TEMPLATE = subdirs
 
-qtHaveModule(widgets) {

-    } else {
-        QT_FOR_CONFIG += widgets
-        qtConfig(pushbutton):qtConfig(toolbutton) {
-            SUBDIRS = designer \
-                      designer \
-                      pixeltool
-
-            !static|contains(QT_PLUGINS, qsqlite): SUBDIRS += assistant
-
-            linguist.depends = designer
-        }
-        qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator

Lines 12-18 RUN_DEPENDS= ${PY_ENUM34} Link Here

(-)b/lang/py-qt5-qml/Makefile (-1 / +1 lines)
12	CONFIGURE_ARGS= --enable QtQml	12	CONFIGURE_ARGS= --enable QtQml
13	PYQT_DIST= yes	13	PYQT_DIST= yes
14		14
15	USES= gl python pyqt:5 qt:5	15	USES= gl python:3.5+ pyqt:5 qt:5
16	USE_GL= gl	16	USE_GL= gl
17	USE_PYQT= sip_build core_run network_run	17	USE_PYQT= sip_build core_run network_run
18	USE_PYTHON= concurrent flavors py3kplist	18	USE_PYTHON= concurrent flavors py3kplist




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+ \
		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

Lines 15-21 NO_BUILD= yes Link Here

(-)b/misc/py-qt5-demo/Makefile (-1 / +1 lines)
15		15
16	PORTSCOUT= limit:^${PYQT5_VERSION}	16	PORTSCOUT= limit:^${PYQT5_VERSION}
17		17
18	USES= python pyqt:5	18	USES= python:3.5+ pyqt:5
19	USE_PYQT= core_run dbus_run designer_run \	19	USE_PYQT= core_run dbus_run designer_run \
20	designerplugin_run gui_run multimedia_run \	20	designerplugin_run gui_run multimedia_run \
21	multimediawidgets_run network_run opengl_run \	21	multimediawidgets_run network_run opengl_run \

Lines 1-3 Link Here

(-)b/misc/qt5-examples/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1590590417	1	TIMESTAMP = 1605899661
2	SHA256 (KDE/Qt/5.15.0/qt-everywhere-src-5.15.0.tar.xz) = 22b63d7a7a45183865cc4141124f12b673e7a17b1fe2b91e433f6547c5d548c3	2	SHA256 (KDE/Qt/5.15.2/qt-everywhere-src-5.15.2.tar.xz) = 3a530d1b243b5dec00bc54937455471aaa3e56849d2593edb8ded07228202240
3	SIZE (KDE/Qt/5.15.0/qt-everywhere-src-5.15.0.tar.xz) = 592401236	3	SIZE (KDE/Qt/5.15.2/qt-everywhere-src-5.15.2.tar.xz) = 586690220

Lines 101-106 Link Here

(-)b/misc/qt5-examples/pkg-plist (+81 lines)
101	%%QT_EXAMPLEDIR%%/activeqt/wrapper/wrapperax.rc	101	%%QT_EXAMPLEDIR%%/activeqt/wrapper/wrapperax.rc
102	%%QT_EXAMPLEDIR%%/aggregate/examples.pro	102	%%QT_EXAMPLEDIR%%/aggregate/examples.pro
103	%%QT_EXAMPLEDIR%%/androidextras/androidextras.pro	103	%%QT_EXAMPLEDIR%%/androidextras/androidextras.pro
		104	%%QT_EXAMPLEDIR%%/androidextras/customactivity/activityhandler.cpp
		105	%%QT_EXAMPLEDIR%%/androidextras/customactivity/activityhandler.h
		106	%%QT_EXAMPLEDIR%%/androidextras/customactivity/android/AndroidManifest.xml
		107	%%QT_EXAMPLEDIR%%/androidextras/customactivity/android/res/layout/second_activity.xml
		108	%%QT_EXAMPLEDIR%%/androidextras/customactivity/android/res/values/strings.xml
		109	%%QT_EXAMPLEDIR%%/androidextras/customactivity/android/src/org/qtproject/example/activityhandler/CustomActivity.java
		110	%%QT_EXAMPLEDIR%%/androidextras/customactivity/customactivity.pro
		111	%%QT_EXAMPLEDIR%%/androidextras/customactivity/doc/src/qtandroidextras-example-customactivity.qdoc
		112	%%QT_EXAMPLEDIR%%/androidextras/customactivity/main.cpp
		113	%%QT_EXAMPLEDIR%%/androidextras/customactivity/main.qml
		114	%%QT_EXAMPLEDIR%%/androidextras/customactivity/qml.qrc
104	%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/android/AndroidManifest.xml	115	%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/android/AndroidManifest.xml
105	%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/android/res/drawable-hdpi/icon.png	116	%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/android/res/drawable-hdpi/icon.png
106	%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/android/res/drawable-ldpi/icon.png	117	%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/android/res/drawable-ldpi/icon.png
Lines 116-121 Link Here
116	%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/main.cpp	127	%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/main.cpp
117	%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/main.qml	128	%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/main.qml
118	%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/qml.qrc	129	%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/qml.qrc
		130	%%QT_EXAMPLEDIR%%/androidextras/musiclist/android/AndroidManifest.xml
		131	%%QT_EXAMPLEDIR%%/androidextras/musiclist/android/src/org/qtproject/example/musiclist/MusicList.java
		132	%%QT_EXAMPLEDIR%%/androidextras/musiclist/doc/src/qtandroidextras-example-musiclist.qdoc
		133	%%QT_EXAMPLEDIR%%/androidextras/musiclist/main.cpp
		134	%%QT_EXAMPLEDIR%%/androidextras/musiclist/main.qml
		135	%%QT_EXAMPLEDIR%%/androidextras/musiclist/musiclist.cpp
		136	%%QT_EXAMPLEDIR%%/androidextras/musiclist/musiclist.h
		137	%%QT_EXAMPLEDIR%%/androidextras/musiclist/musiclist.pro
		138	%%QT_EXAMPLEDIR%%/androidextras/musiclist/qml.qrc
119	%%QT_EXAMPLEDIR%%/androidextras/notification/android/AndroidManifest.xml	139	%%QT_EXAMPLEDIR%%/androidextras/notification/android/AndroidManifest.xml
120	%%QT_EXAMPLEDIR%%/androidextras/notification/android/res/drawable-hdpi/icon.png	140	%%QT_EXAMPLEDIR%%/androidextras/notification/android/res/drawable-hdpi/icon.png
121	%%QT_EXAMPLEDIR%%/androidextras/notification/android/res/drawable-ldpi/icon.png	141	%%QT_EXAMPLEDIR%%/androidextras/notification/android/res/drawable-ldpi/icon.png
Lines 133-138 Link Here
133	%%QT_EXAMPLEDIR%%/androidextras/notification/notificationclient.cpp	153	%%QT_EXAMPLEDIR%%/androidextras/notification/notificationclient.cpp
134	%%QT_EXAMPLEDIR%%/androidextras/notification/notificationclient.h	154	%%QT_EXAMPLEDIR%%/androidextras/notification/notificationclient.h
135	%%QT_EXAMPLEDIR%%/androidextras/notification/qml/main.qml	155	%%QT_EXAMPLEDIR%%/androidextras/notification/qml/main.qml
		156	%%QT_EXAMPLEDIR%%/androidextras/services/common/common.pri
		157	%%QT_EXAMPLEDIR%%/androidextras/services/common/common_broadcast.pri
		158	%%QT_EXAMPLEDIR%%/androidextras/services/common/common_ro.pri
		159	%%QT_EXAMPLEDIR%%/androidextras/services/common/main.qml
		160	%%QT_EXAMPLEDIR%%/androidextras/services/common/qml.qrc
		161	%%QT_EXAMPLEDIR%%/androidextras/services/common/qtandroidservice.cpp
		162	%%QT_EXAMPLEDIR%%/androidextras/services/common/qtandroidservice.h
		163	%%QT_EXAMPLEDIR%%/androidextras/services/common/qtandroidservice.rep
		164	%%QT_EXAMPLEDIR%%/androidextras/services/common/qtandroidservice_ro.h
		165	%%QT_EXAMPLEDIR%%/androidextras/services/servicebinder/android/AndroidManifest.xml
		166	%%QT_EXAMPLEDIR%%/androidextras/services/servicebinder/android/src/org/qtproject/example/qtandroidservice/QtAndroidService.java
		167	%%QT_EXAMPLEDIR%%/androidextras/services/servicebinder/androidbinder.cpp
		168	%%QT_EXAMPLEDIR%%/androidextras/services/servicebinder/androidbinder.h
		169	%%QT_EXAMPLEDIR%%/androidextras/services/servicebinder/doc/src/qtandroidextras-example-service-binder.qdoc
		170	%%QT_EXAMPLEDIR%%/androidextras/services/servicebinder/main.cpp
		171	%%QT_EXAMPLEDIR%%/androidextras/services/servicebinder/qtandroidservice.cpp
		172	%%QT_EXAMPLEDIR%%/androidextras/services/servicebinder/qtandroidservice.h
		173	%%QT_EXAMPLEDIR%%/androidextras/services/servicebinder/service.pro
		174	%%QT_EXAMPLEDIR%%/androidextras/services/servicebinder/service_main.cpp
		175	%%QT_EXAMPLEDIR%%/androidextras/services/servicebinder/servicebinder.pro
		176	%%QT_EXAMPLEDIR%%/androidextras/services/servicebinder/servicebinderclient.pro
		177	%%QT_EXAMPLEDIR%%/androidextras/services/servicebroadcast/android/AndroidManifest.xml
		178	%%QT_EXAMPLEDIR%%/androidextras/services/servicebroadcast/android/src/org/qtproject/example/qtandroidservice/ActivityUtils.java
		179	%%QT_EXAMPLEDIR%%/androidextras/services/servicebroadcast/android/src/org/qtproject/example/qtandroidservice/QtAndroidService.java
		180	%%QT_EXAMPLEDIR%%/androidextras/services/servicebroadcast/doc/src/qtandroidextras-example-service-broadcastreceiver.qdoc
		181	%%QT_EXAMPLEDIR%%/androidextras/services/servicebroadcast/main.cpp
		182	%%QT_EXAMPLEDIR%%/androidextras/services/servicebroadcast/service.pro
		183	%%QT_EXAMPLEDIR%%/androidextras/services/servicebroadcast/service_main.cpp
		184	%%QT_EXAMPLEDIR%%/androidextras/services/servicebroadcast/servicebroadcast.pro
		185	%%QT_EXAMPLEDIR%%/androidextras/services/servicebroadcast/servicebroadcastclient.pro
		186	%%QT_EXAMPLEDIR%%/androidextras/services/servicebroadcastsamelib/android/AndroidManifest.xml
		187	%%QT_EXAMPLEDIR%%/androidextras/services/servicebroadcastsamelib/android/src/org/qtproject/example/qtandroidservice/ActivityUtils.java
		188	%%QT_EXAMPLEDIR%%/androidextras/services/servicebroadcastsamelib/android/src/org/qtproject/example/qtandroidservice/QtAndroidService.java
		189	%%QT_EXAMPLEDIR%%/androidextras/services/servicebroadcastsamelib/doc/src/qtandroidextras-example-service-broadcastreceiver-samelib.qdoc
		190	%%QT_EXAMPLEDIR%%/androidextras/services/servicebroadcastsamelib/main.cpp
		191	%%QT_EXAMPLEDIR%%/androidextras/services/servicebroadcastsamelib/servicebroadcastsamelib.pro
		192	%%QT_EXAMPLEDIR%%/androidextras/services/serviceremoteobjects/android/AndroidManifest.xml
		193	%%QT_EXAMPLEDIR%%/androidextras/services/serviceremoteobjects/android/src/org/qtproject/example/qtandroidservice/QtAndroidService.java
		194	%%QT_EXAMPLEDIR%%/androidextras/services/serviceremoteobjects/doc/src/qtandroidextras-example-service-remoteobjects.qdoc
		195	%%QT_EXAMPLEDIR%%/androidextras/services/serviceremoteobjects/main.cpp
		196	%%QT_EXAMPLEDIR%%/androidextras/services/serviceremoteobjects/service.pro
		197	%%QT_EXAMPLEDIR%%/androidextras/services/serviceremoteobjects/service_main.cpp
		198	%%QT_EXAMPLEDIR%%/androidextras/services/serviceremoteobjects/serviceremoteobjects.pro
		199	%%QT_EXAMPLEDIR%%/androidextras/services/serviceremoteobjects/serviceremoteobjectsclient.pro
		200	%%QT_EXAMPLEDIR%%/androidextras/services/serviceremoteobjectssamelib/android/AndroidManifest.xml
		201	%%QT_EXAMPLEDIR%%/androidextras/services/serviceremoteobjectssamelib/android/src/org/qtproject/example/qtandroidservice/QtAndroidService.java
		202	%%QT_EXAMPLEDIR%%/androidextras/services/serviceremoteobjectssamelib/doc/src/qtandroidextras-example-service-remoteobjects-samelib.qdoc
		203	%%QT_EXAMPLEDIR%%/androidextras/services/serviceremoteobjectssamelib/main.cpp
		204	%%QT_EXAMPLEDIR%%/androidextras/services/serviceremoteobjectssamelib/serviceremoteobjectssamelib.pro
		205	%%QT_EXAMPLEDIR%%/androidextras/services/services.pro
		206	%%QT_EXAMPLEDIR%%/androidextras/services/servicesameprocess/android/AndroidManifest.xml
		207	%%QT_EXAMPLEDIR%%/androidextras/services/servicesameprocess/android/src/org/qtproject/example/qtandroidservice/QtAndroidService.java
		208	%%QT_EXAMPLEDIR%%/androidextras/services/servicesameprocess/doc/src/qtandroidextras-example-service-same-process.qdoc
		209	%%QT_EXAMPLEDIR%%/androidextras/services/servicesameprocess/main.cpp
		210	%%QT_EXAMPLEDIR%%/androidextras/services/servicesameprocess/qtandroidservice.cpp
		211	%%QT_EXAMPLEDIR%%/androidextras/services/servicesameprocess/qtandroidservice.h
		212	%%QT_EXAMPLEDIR%%/androidextras/services/servicesameprocess/servicesameprocess.pro
136	%%QT_EXAMPLEDIR%%/assistant/assistant.pro	213	%%QT_EXAMPLEDIR%%/assistant/assistant.pro
137	%%QT_EXAMPLEDIR%%/assistant/doc/images/simpletextviewer-example.png	214	%%QT_EXAMPLEDIR%%/assistant/doc/images/simpletextviewer-example.png
138	%%QT_EXAMPLEDIR%%/assistant/doc/images/simpletextviewer-findfiledialog.png	215	%%QT_EXAMPLEDIR%%/assistant/doc/images/simpletextviewer-findfiledialog.png
Lines 4948-4963 Link Here
4948	%%QT_EXAMPLEDIR%%/quickcontrols2/swipetoremove/swipetoremove.pro	5025	%%QT_EXAMPLEDIR%%/quickcontrols2/swipetoremove/swipetoremove.pro
4949	%%QT_EXAMPLEDIR%%/quickcontrols2/swipetoremove/swipetoremove.qml	5026	%%QT_EXAMPLEDIR%%/quickcontrols2/swipetoremove/swipetoremove.qml
4950	%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/+touch/texteditor.html	5027	%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/+touch/texteditor.html
		5028	%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/creatorKateHighlighter.png
4951	%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/doc/images/qtquickcontrols2-texteditor-desktop.jpg	5029	%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/doc/images/qtquickcontrols2-texteditor-desktop.jpg
4952	%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/doc/images/qtquickcontrols2-texteditor-touch.jpg	5030	%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/doc/images/qtquickcontrols2-texteditor-touch.jpg
4953	%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc	5031	%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc
4954	%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/documenthandler.cpp	5032	%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/documenthandler.cpp
4955	%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/documenthandler.h	5033	%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/documenthandler.h
		5034	%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/einstein.png
		5035	%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/example.md
4956	%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/fonts/fontello.ttf	5036	%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/fonts/fontello.ttf
4957	%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/images/qt-logo.png	5037	%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/images/qt-logo.png
4958	%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/qml/+touch/texteditor.qml	5038	%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/qml/+touch/texteditor.qml
4959	%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/qml/texteditor.qml	5039	%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/qml/texteditor.qml
4960	%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/qtquickcontrols2.conf	5040	%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/qtquickcontrols2.conf
		5041	%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/red.png
4961	%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/texteditor.cpp	5042	%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/texteditor.cpp
4962	%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/texteditor.html	5043	%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/texteditor.html
4963	%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/texteditor.pro	5044	%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/texteditor.pro




%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

Lines 12-18 RUN_DEPENDS= ${PY_ENUM34} Link Here

(-)b/multimedia/py-qt5-multimedia/Makefile (-1 / +1 lines)
12	CONFIGURE_ARGS= --enable QtMultimedia	12	CONFIGURE_ARGS= --enable QtMultimedia
13	PYQT_DIST= yes	13	PYQT_DIST= yes
14		14
15	USES= gl python pyqt:5 qt:5	15	USES= gl python:3.5+ pyqt:5 qt:5
16	USE_GL= gl	16	USE_GL= gl
17	USE_PYQT= sip_build core_run gui_run network_run	17	USE_PYQT= sip_build core_run gui_run network_run
18	USE_PYTHON= concurrent flavors py3kplist	18	USE_PYTHON= concurrent flavors py3kplist

Lines 12-18 RUN_DEPENDS= ${PY_ENUM34} Link Here

(-)b/multimedia/py-qt5-multimediawidgets/Makefile (-1 / +1 lines)
12	CONFIGURE_ARGS= --enable QtMultimediaWidgets	12	CONFIGURE_ARGS= --enable QtMultimediaWidgets
13	PYQT_DIST= yes	13	PYQT_DIST= yes
14		14
15	USES= gl python pyqt:5 qt:5	15	USES= gl python:3.5+ pyqt:5 qt:5
16	USE_GL= gl	16	USE_GL= gl
17	USE_PYQT= sip_build core_run multimedia_run widgets_run	17	USE_PYQT= sip_build core_run multimedia_run widgets_run
18	USE_PYTHON= concurrent flavors py3kplist	18	USE_PYTHON= concurrent flavors py3kplist




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}

GH_ACCOUNT=	raelgc



OPTIONS_DEFINE=	HUNSPELL

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




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;





PORTNAME=	libArcus
PORTVERSION=	4.7.1
PORTREVISION=	1
PORTEPOCH=	1
CATEGORIES=	net cad
DIST_SUBDIR=	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.5+ pyqt:5
USE_PYQT=	sip pysip
USE_GITHUB=	yes
GH_ACCOUNT=	Ultimaker
USE_LDCONFIG=	yes

Added Link Here

(-)b/net/libarcus/files/patch-CMakeLists.txt (+11 lines)
1	--- CMakeLists.txt.orig 2020-10-11 05:33:17 UTC
2	+++ CMakeLists.txt
3	@@ -94,7 +94,7 @@ endif()
4	if(BUILD_PYTHON)
5	set(SIP_EXTRA_FILES_DEPEND python/SocketListener.sip python/Types.sip python/PythonMessage.sip python/Error.sip)
6	set(SIP_EXTRA_SOURCE_FILES python/PythonMessage.cpp)
7	- set(SIP_EXTRA_OPTIONS -g) # -g means always release the GIL before calling C++ methods.
8	+ set(SIP_EXTRA_OPTIONS -g -n PyQt5.sip) # -g means always release the GIL before calling C++ methods.
9	add_sip_python_module(Arcus python/Socket.sip Arcus)
10	endif()
11




--- 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

Lines 12-18 RUN_DEPENDS= ${PY_ENUM34} Link Here

(-)b/net/py-qt5-network/Makefile (-1 / +1 lines)
12	CONFIGURE_ARGS= --enable QtNetwork	12	CONFIGURE_ARGS= --enable QtNetwork
13	PYQT_DIST= yes	13	PYQT_DIST= yes
14		14
15	USES= python pyqt:5 qt:5	15	USES= python:3.5+ pyqt:5 qt:5
16	USE_PYQT= sip_build core_run	16	USE_PYQT= sip_build core_run
17	USE_PYTHON= concurrent flavors py3kplist	17	USE_PYTHON= concurrent flavors py3kplist
18	USE_QT= core network qmake_build	18	USE_QT= core network qmake_build

Lines 12-18 RUN_DEPENDS= ${PY_ENUM34} Link Here

(-)b/net/py-qt5-networkauth/Makefile (-1 / +1 lines)
12	CONFIGURE_ARGS= --enable QtNetworkAuth	12	CONFIGURE_ARGS= --enable QtNetworkAuth
13	PYQT_DIST= yes	13	PYQT_DIST= yes
14		14
15	USES= python pyqt:5 qt:5	15	USES= python:3.5+ pyqt:5 qt:5
16	USE_PYQT= sip_build core_run	16	USE_PYQT= sip_build core_run
17	USE_PYTHON= concurrent flavors py3kplist	17	USE_PYTHON= concurrent flavors py3kplist
18	USE_QT= core network networkauth qmake_build	18	USE_QT= core network networkauth qmake_build




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);




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
@@ -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
 
+#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);
@@ -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




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;




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) {

Lines 1-33 Link Here

(-)b/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp (-26 / +66 lines)
1	--- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig 2020-05-05 11:59:27 UTC	1	Patch from Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-qt/qtnetwork/files/qtnetwork-5.15.1-libressl.patch
		2	--- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig 2020-09-02 10:15:07 UTC
2	+++ src/network/ssl/qsslsocket_openssl_symbols.cpp	3	+++ src/network/ssl/qsslsocket_openssl_symbols.cpp
3	@@ -147,6 +147,14 @@ DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *	4	@@ -145,11 +145,14 @@ DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYA
		5	DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
		6	DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
4	DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)	7	DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
		8	+#ifdef OPENSSL_NO_DEPRECATED_3_0
		9	DEFINEFUNC2(EVP_PKEY_CTX , EVP_PKEY_CTX_new, EVP_PKEY pkey, pkey, ENGINE *e, e, return nullptr, return)
		10	DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
		11	DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
		12	+#endif // OPENSSL_NO_DEPRECATED_3_0
5	DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)	13	DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
6	DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)	14	DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
7	+#ifdef LIBRESSL_VERSION_NUMBER	15	+#ifndef LIBRESSL_VERSION_NUMBER
8	+DEFINEFUNC(int, sk_num, OPENSSL_STACK *a, a, return -1, return)
9	+DEFINEFUNC2(void, sk_pop_free, OPENSSL_STACK a, a, void (b)(void*), b, return, DUMMYARG)
10	+DEFINEFUNC(OPENSSL_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
11	+DEFINEFUNC2(void, sk_push, OPENSSL_STACK a, a, void b, b, return, DUMMYARG)
12	+DEFINEFUNC(void, sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
13	+DEFINEFUNC2(void , sk_value, OPENSSL_STACK a, a, int b, b, return nullptr, return)
14	+#else
15	DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)	16	DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
16	DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)	17	DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
17	DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK a, a, void (b)(void*), b, return, DUMMYARG)	18	DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK a, a, void (b)(void*), b, return, DUMMYARG)
18	@@ -154,6 +162,7 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMY	19	@@ -157,6 +160,14 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMY
19	DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK a, a, void b, b, return, DUMMYARG)	20	DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK a, a, void b, b, return, DUMMYARG)
20	DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)	21	DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
21	DEFINEFUNC2(void , OPENSSL_sk_value, OPENSSL_STACK a, a, int b, b, return nullptr, return)	22	DEFINEFUNC2(void , OPENSSL_sk_value, OPENSSL_STACK a, a, int b, b, return nullptr, return)
22	+#endif	23	+#else
		24	+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
		25	+DEFINEFUNC2(void, sk_pop_free, STACK a, a, void (b)(void*), b, return, DUMMYARG)
		26	+DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
		27	+DEFINEFUNC2(void, sk_push, _STACK a, a, void b, b, return, DUMMYARG)
		28	+DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
		29	+DEFINEFUNC2(void , sk_value, STACK a, a, int b, b, return nullptr, return)
		30	+#endif // LIBRESSL_VERSION_NUMBER
23	DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)	31	DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
24	DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)	32	DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
25	#ifdef TLS1_3_VERSION	33	#ifdef TLS1_3_VERSION
26	@@ -351,12 +360,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a	34	@@ -182,7 +193,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE
		35	DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE a, a, int idx, idx, void data, data, return 0, return)
		36	DEFINEFUNC2(void , X509_STORE_get_ex_data, X509_STORE r, r, int idx, idx, return nullptr, return)
		37	DEFINEFUNC(STACK_OF(X509) , X509_STORE_CTX_get0_chain, X509_STORE_CTX a, a, return nullptr, return)
		38	+#ifndef LIBRESSL_VERSION_NUMBER
		39	DEFINEFUNC3(void, CRYPTO_free, void str, str, const char file, file, int line, line, return, DUMMYARG)
		40	+#else
		41	+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
		42	+#endif
		43	DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
		44	DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
		45	DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
		46	@@ -222,7 +237,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING
		47	ASN1_OCTET_STRING piKeyHash, piKeyHash, ASN1_INTEGER pserial, pserial, OCSP_CERTID *cid, cid,
		48	return 0, return)
		49	DEFINEFUNC2(OCSP_RESPONSE , OCSP_response_create, int status, status, OCSP_BASICRESP bs, bs, return nullptr, return)
		50	+#ifndef LIBRESSL_VERSION_NUMBER
		51	DEFINEFUNC(const STACK_OF(X509) , OCSP_resp_get0_certs, const OCSP_BASICRESP bs, bs, return nullptr, return)
		52	+#endif
		53	DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID a, a, OCSP_CERTID b, b, return -1, return)
		54	DEFINEFUNC7(OCSP_SINGLERESP , OCSP_basic_add1_status, OCSP_BASICRESP r, r, OCSP_CERTID *c, c, int s, s,
		55	int re, re, ASN1_TIME rt, rt, ASN1_TIME t, t, ASN1_TIME *n, n, return nullptr, return)
		56	@@ -354,12 +371,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a
27	DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX a, a, RSA b, b, return -1, return)	57	DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX a, a, RSA b, b, return -1, return)
28	DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX a, a, const char b, b, int c, c, return -1, return)	58	DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX a, a, const char b, b, int c, c, return -1, return)
29	DEFINEFUNC(X509_STORE , SSL_CTX_get_cert_store, const SSL_CTX a, a, return nullptr, return)	59	DEFINEFUNC(X509_STORE , SSL_CTX_get_cert_store, const SSL_CTX a, a, return nullptr, return)
30	+#if !defined(LIBRESSL_VERSION_NUMBER)	60	+#ifndef LIBRESSL_VERSION_NUMBER
31	DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);	61	DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
32	DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);	62	DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
33	DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX a, a, SSL_CTX b, b, return, return);	63	DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX a, a, SSL_CTX b, b, return, return);
Lines 38-55 Link Here
38	DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)	68	DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
39	DEFINEFUNC(STACK_OF(SSL_CIPHER) , SSL_get_ciphers, const SSL a, a, return nullptr, return)	69	DEFINEFUNC(STACK_OF(SSL_CIPHER) , SSL_get_ciphers, const SSL a, a, return nullptr, return)
40	DEFINEFUNC(const SSL_CIPHER , SSL_get_current_cipher, SSL a, a, return nullptr, return)	70	DEFINEFUNC(const SSL_CIPHER , SSL_get_current_cipher, SSL a, a, return nullptr, return)
41	@@ -834,12 +845,21 @@ bool q_resolveOpenSslSymbols()	71	@@ -843,17 +862,21 @@ bool q_resolveOpenSslSymbols()
		72	RESOLVEFUNC(ASN1_STRING_get0_data)
		73	RESOLVEFUNC(EVP_CIPHER_CTX_reset)
42	RESOLVEFUNC(EVP_PKEY_up_ref)	74	RESOLVEFUNC(EVP_PKEY_up_ref)
		75	+#ifdef OPENSSL_NO_DEPRECATED_3_0
		76	RESOLVEFUNC(EVP_PKEY_CTX_new)
		77	RESOLVEFUNC(EVP_PKEY_param_check)
		78	RESOLVEFUNC(EVP_PKEY_CTX_free)
		79	+#endif // OPENSSL_NO_DEPRECATED_3_0
43	RESOLVEFUNC(EVP_PKEY_base_id)	80	RESOLVEFUNC(EVP_PKEY_base_id)
44	RESOLVEFUNC(RSA_bits)	81	RESOLVEFUNC(RSA_bits)
45	+#ifdef LIBRESSL_VERSION_NUMBER	82	+#ifndef LIBRESSL_VERSION_NUMBER
46	+ RESOLVEFUNC(sk_new_null)
47	+ RESOLVEFUNC(sk_push)
48	+ RESOLVEFUNC(sk_free)
49	+ RESOLVEFUNC(sk_num)
50	+ RESOLVEFUNC(sk_pop_free)
51	+ RESOLVEFUNC(sk_value)
52	+#else
53	RESOLVEFUNC(OPENSSL_sk_new_null)	83	RESOLVEFUNC(OPENSSL_sk_new_null)
54	RESOLVEFUNC(OPENSSL_sk_push)	84	RESOLVEFUNC(OPENSSL_sk_push)
55	RESOLVEFUNC(OPENSSL_sk_free)	85	RESOLVEFUNC(OPENSSL_sk_free)
Lines 60-66 Link Here
60	RESOLVEFUNC(DH_get0_pqg)	90	RESOLVEFUNC(DH_get0_pqg)
61	RESOLVEFUNC(SSL_CTX_set_options)	91	RESOLVEFUNC(SSL_CTX_set_options)
62		92
63	@@ -881,7 +901,9 @@ bool q_resolveOpenSslSymbols()	93	@@ -895,7 +918,9 @@ bool q_resolveOpenSslSymbols()
64		94
65	RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)	95	RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
66	RESOLVEFUNC(DH_bits)	96	RESOLVEFUNC(DH_bits)
Lines 70-80 Link Here
70		100
71	#if QT_CONFIG(dtls)	101	#if QT_CONFIG(dtls)
72	RESOLVEFUNC(DTLSv1_listen)	102	RESOLVEFUNC(DTLSv1_listen)
73	@@ -1041,12 +1063,14 @@ bool q_resolveOpenSslSymbols()	103	@@ -925,7 +950,9 @@ bool q_resolveOpenSslSymbols()
		104	RESOLVEFUNC(OCSP_check_validity)
		105	RESOLVEFUNC(OCSP_cert_to_id)
		106	RESOLVEFUNC(OCSP_id_get0_info)
		107	+#ifndef LIBRESSL_VERSION_NUMBER
		108	RESOLVEFUNC(OCSP_resp_get0_certs)
		109	+#endif
		110	RESOLVEFUNC(OCSP_basic_sign)
		111	RESOLVEFUNC(OCSP_response_create)
		112	RESOLVEFUNC(i2d_OCSP_RESPONSE)
		113	@@ -1055,12 +1082,14 @@ bool q_resolveOpenSslSymbols()
74	RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)	114	RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
75	RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)	115	RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
76	RESOLVEFUNC(SSL_CTX_get_cert_store);	116	RESOLVEFUNC(SSL_CTX_get_cert_store);
77	+#if !defined(LIBRESSL_VERSION_NUMBER)	117	+#ifndef LIBRESSL_VERSION_NUMBER
78	RESOLVEFUNC(SSL_CONF_CTX_new);	118	RESOLVEFUNC(SSL_CONF_CTX_new);
79	RESOLVEFUNC(SSL_CONF_CTX_free);	119	RESOLVEFUNC(SSL_CONF_CTX_free);
80	RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);	120	RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);




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
@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
 #include "qsslsocket_openssl_p.h"
 #include <QtCore/qglobal.h>
 
 #define DUMMYARG
+# 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
+#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.
 
+#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);
+// 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
+
 #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();
 
+#ifndef LIBRESSL_VERSION_NUMBER
+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
+#else
 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);
+
+#ifndef LIBRESSL_VERSION_NUMBER
+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
 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);
+#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);
@@ -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)
 
+#ifndef 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
 #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)
+#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 \
@@ -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);
+#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);

 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);

Lines 15-23 LICENSE= GPLv2+ Link Here

(-)b/print/py-frescobaldi/Makefile (-2 / +2 lines)
15	LICENSE_FILE= ${WRKSRC}/COPYING	15	LICENSE_FILE= ${WRKSRC}/COPYING
16		16
17	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-ly>=0:print/py-python-ly@${PY_FLAVOR} \	17	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-ly>=0:print/py-python-ly@${PY_FLAVOR} \
18	${PYTHON_PKGNAMEPREFIX}python-poppler-qt5>=0:graphics/py-python-poppler-qt5@${PY_FLAVOR}	18	${PYTHON_PKGNAMEPREFIX}python-poppler-qt5>=0:graphics/py-python-poppler-qt5 #@${PY_FLAVOR}
19		19
20	USES= desktop-file-utils gettext gmake pyqt:5 python:3.4+ qmake qt:5	20	USES= desktop-file-utils gettext gmake pyqt:5 python:3.5+ qmake qt:5
21	USE_GITHUB= yes	21	USE_GITHUB= yes
22	GH_ACCOUNT= frescobaldi	22	GH_ACCOUNT= frescobaldi
23	USE_PYQT= network printsupport sip svg webengine widgets	23	USE_PYQT= network printsupport sip svg webengine widgets

Lines 12-18 RUN_DEPENDS= ${PY_ENUM34} Link Here

(-)b/print/py-qt5-printsupport/Makefile (-1 / +1 lines)
12	CONFIGURE_ARGS= --enable QtPrintSupport	12	CONFIGURE_ARGS= --enable QtPrintSupport
13	PYQT_DIST= yes	13	PYQT_DIST= yes
14		14
15	USES= gl python pyqt:5 qt:5	15	USES= gl python:3.5+ pyqt:5 qt:5
16	USE_GL= gl	16	USE_GL= gl
17	USE_PYQT= sip_build core_run widgets_run	17	USE_PYQT= sip_build core_run widgets_run
18	USE_PYTHON= concurrent flavors py3kplist	18	USE_PYTHON= concurrent flavors py3kplist

Lines 4-10 Link Here

(-)b/science/py-veusz/Makefile (-1 / +1 lines)
4	PORTNAME= veusz	4	PORTNAME= veusz
5	DISTVERSIONPREFIX= ${PORTNAME}-	5	DISTVERSIONPREFIX= ${PORTNAME}-
6	DISTVERSION= 3.2.1	6	DISTVERSION= 3.2.1
7	PORTREVISION= 3	7	PORTREVISION= 4
8	CATEGORIES= science	8	CATEGORIES= science
9	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	9	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
10		10




Patch from https://github.com/veusz/veusz/pull/433

--- pyqtdistutils.py.orig	2020-10-11 07:18:07 UTC
+++ pyqtdistutils.py
@@ -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', sip_builddir
             ] + SIP_FLAGS.split() + [
-                '-I', os.path.join(sip_dir, 'PyQt5'),
-                '-b', sbf,
+                '-I', pyqt5_include_dir,
                 source
             ]
         )

Lines 2-7 Link Here

(-)b/science/scidavis/Makefile (-1 / +1 lines)
2		2
3	PORTNAME= scidavis	3	PORTNAME= scidavis
4	PORTVERSION= 2.2.0	4	PORTVERSION= 2.2.0
		5	PORTREVISION= 1
5	CATEGORIES= science	6	CATEGORIES= science
6		7
7	MAINTAINER= makc@FreeBSD.org	8	MAINTAINER= makc@FreeBSD.org
Lines 34-40 QMAKE_ARGS= INSTALLBASE=${PREFIX} \ Link Here
34	INCLUDEPATH+=${LOCALBASE}/${QT_INCDIR_REL}/qwtplot3d-qt5	35	INCLUDEPATH+=${LOCALBASE}/${QT_INCDIR_REL}/qwtplot3d-qt5
35		36
36	OPTIONS_DEFINE= DOCS NLS PYTHON	37	OPTIONS_DEFINE= DOCS NLS PYTHON
37	OPTIONS_DEFAULT= PYTHON
38	OPTIONS_SUB= yes	38	OPTIONS_SUB= yes
39		39
40	PYTHON_DESC= Python scripting support	40	PYTHON_DESC= Python scripting support




--- src/src.pro.orig	2020-11-20 20:00:38 UTC
+++ src/src.pro
@@ -1,55 +1,3 @@
 TEMPLATE = subdirs
 
-qtHaveModule(widgets) {

-    } else {
-        QT_FOR_CONFIG += widgets
-        qtConfig(pushbutton):qtConfig(toolbutton) {
-            SUBDIRS = designer \
-                      designer \
-                      pixeltool
-
-            !static|contains(QT_PLUGINS, qsqlite): SUBDIRS += assistant
-
-            linguist.depends = designer
-        }
-        qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator




--- src/src.pro.orig	2020-11-20 20:05:15 UTC
+++ src/src.pro
@@ -1,55 +1,3 @@
 TEMPLATE = subdirs
 
-qtHaveModule(widgets) {

-    } else {
-        QT_FOR_CONFIG += widgets
-        qtConfig(pushbutton):qtConfig(toolbutton) {
-            SUBDIRS = designer \
-                      designer \
-                      pixeltool
-
-            !static|contains(QT_PLUGINS, qsqlite): SUBDIRS += assistant
-
-            linguist.depends = designer
-        }
-        qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator




--- src/src.pro.orig	2020-11-20 20:05:53 UTC
+++ src/src.pro
@@ -1,55 +1,3 @@
 TEMPLATE = subdirs
 
-qtHaveModule(widgets) {

-    } else {
-        QT_FOR_CONFIG += widgets
-        qtConfig(pushbutton):qtConfig(toolbutton) {
-            SUBDIRS = designer \
-                      designer \
-                      pixeltool
-
-            !static|contains(QT_PLUGINS, qsqlite): SUBDIRS += assistant
-
-            linguist.depends = designer
-        }
-        qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator




--- sptr.hh.orig	2020-11-23 20:39:45 UTC
+++ sptr.hh
@@ -67,9 +67,6 @@ class sptr_base (public)
     }
   }
 
-  unsigned use_count() const
-  { return count; }
-
   sptr_base & operator = ( sptr_base const & other )
   { if ( &other != this ) { reset(); p = other.p; count = other.count; increment(); }
     return * this; }




diff --git komparepart/kompare_part.cpp komparepart/kompare_part.cpp
index 42d3120..88346d6 100644
--- komparepart/kompare_part.cpp
+++ komparepart/kompare_part.cpp
@@ -26,6 +26,7 @@
 #include <QMenu>
 #include <QPainter>
 #include <QPrinter>
+#include <QPageLayout>
 #include <QPrintDialog>
 #include <QPrintPreviewDialog>
 #include <QTemporaryDir>
@@ -610,7 +611,7 @@ void KomparePart::saveDiff()
 void KomparePart::slotFilePrint()
 {
     QPrinter printer;
-    printer.setOrientation(QPrinter::Landscape);
+    printer.setPageOrientation(QPageLayout::Landscape);
     QPrintDialog* dlg = new QPrintDialog(&printer, nullptr);
 
     if (dlg->exec() == QDialog::Accepted)
@@ -625,7 +626,7 @@ void KomparePart::slotFilePrint()
 void KomparePart::slotFilePrintPreview()
 {
     QPrinter printer;
-    printer.setOrientation(QPrinter::Landscape);
+    printer.setPageOrientation(QPageLayout::Landscape);
     QPrintPreviewDialog dlg(&printer);
 
     connect(&dlg, &QPrintPreviewDialog::paintRequested, this, &KomparePart::slotPaintRequested);

Lines 12-18 RUN_DEPENDS= ${PY_ENUM34} Link Here

(-)b/textproc/py-qt5-xml/Makefile (-1 / +1 lines)
12	CONFIGURE_ARGS= --enable QtXml	12	CONFIGURE_ARGS= --enable QtXml
13	PYQT_DIST= yes	13	PYQT_DIST= yes
14		14
15	USES= python pyqt:5 qt:5	15	USES= python:3.5+ pyqt:5 qt:5
16	USE_PYQT= sip_build core_run	16	USE_PYQT= sip_build core_run
17	USE_PYTHON= concurrent flavors py3kplist	17	USE_PYTHON= concurrent flavors py3kplist
18	USE_QT= core xml buildtools_build qmake_build	18	USE_QT= core xml buildtools_build qmake_build

Lines 12-18 RUN_DEPENDS= ${PY_ENUM34} Link Here

(-)b/textproc/py-qt5-xmlpatterns/Makefile (-1 / +1 lines)
12	CONFIGURE_ARGS= --enable QtXmlPatterns	12	CONFIGURE_ARGS= --enable QtXmlPatterns
13	PYQT_DIST= yes	13	PYQT_DIST= yes
14		14
15	USES= python pyqt:5 qt:5	15	USES= python:3.5+ pyqt:5 qt:5
16	USE_PYQT= sip_build core_run network_run	16	USE_PYQT= sip_build core_run network_run
17	USE_PYTHON= concurrent flavors py3kplist	17	USE_PYTHON= concurrent flavors py3kplist
18	USE_QT= core network xmlpatterns qmake_build	18	USE_QT= core network xmlpatterns qmake_build

Lines 2-8 Link Here

(-)b/textproc/qt5-xmlpatterns/Makefile (-1 lines)
2		2
3	PORTNAME= xmlpatterns	3	PORTNAME= xmlpatterns
4	DISTVERSION= ${QT5_VERSION}	4	DISTVERSION= ${QT5_VERSION}
5	PORTREVISION= 2
6	CATEGORIES= textproc	5	CATEGORIES= textproc
7	PKGNAMEPREFIX= qt5-	6	PKGNAMEPREFIX= qt5-
8		7

Lines 418-423 Link Here

(-)b/textproc/qt5-xmlpatterns/pkg-plist (+1 lines)
418	%%QT_MKSPECDIR%%/modules/qt_lib_xmlpatterns.pri	418	%%QT_MKSPECDIR%%/modules/qt_lib_xmlpatterns.pri
419	%%QT_MKSPECDIR%%/modules/qt_lib_xmlpatterns_private.pri	419	%%QT_MKSPECDIR%%/modules/qt_lib_xmlpatterns_private.pri
420	%%QT_QMLDIR%%/QtQuick/XmlListModel/libqmlxmllistmodelplugin.so	420	%%QT_QMLDIR%%/QtQuick/XmlListModel/libqmlxmllistmodelplugin.so
		421	%%DEBUG%%%%QT_QMLDIR%%/QtQuick/XmlListModel/libqmlxmllistmodelplugin.so.debug
421	%%QT_QMLDIR%%/QtQuick/XmlListModel/plugins.qmltypes	422	%%QT_QMLDIR%%/QtQuick/XmlListModel/plugins.qmltypes
422	%%QT_QMLDIR%%/QtQuick/XmlListModel/qmldir	423	%%QT_QMLDIR%%/QtQuick/XmlListModel/qmldir
423	libdata/pkgconfig/Qt5XmlPatterns.pc	424	libdata/pkgconfig/Qt5XmlPatterns.pc

Lines 11-17 COMMENT= Python bindings for the Qt5 toolkit, QtWebChannel module Link Here

(-)b/www/py-qt5-webchannel/Makefile (-1 / +1 lines)
11	BUILD_DEPENDS= ${PY_ENUM34}	11	BUILD_DEPENDS= ${PY_ENUM34}
12	RUN_DEPENDS= ${PY_ENUM34}	12	RUN_DEPENDS= ${PY_ENUM34}
13		13
14	USES= python pyqt:5 qt:5	14	USES= python:3.5+ pyqt:5 qt:5
15	USE_PYQT= sip_build core_run gui_run qml_run network_run widgets_run	15	USE_PYQT= sip_build core_run gui_run qml_run network_run widgets_run
16	USE_PYTHON= concurrent flavors py3kplist	16	USE_PYTHON= concurrent flavors py3kplist
17	USE_QT= core declarative qmake_build gui network webchannel widgets	17	USE_QT= core declarative qmake_build gui network webchannel widgets

Lines 15-21 LICENSE= GPLv3 Link Here

(-)b/www/py-qt5-webengine/Makefile (-1 / +1 lines)
15	BUILD_DEPENDS= ${PY_ENUM34}	15	BUILD_DEPENDS= ${PY_ENUM34}
16	RUN_DEPENDS= ${PY_ENUM34}	16	RUN_DEPENDS= ${PY_ENUM34}
17		17
18	USES= gl python pyqt:5 qt:5	18	USES= gl python:3.5+ pyqt:5 qt:5
19	USE_GL= gl	19	USE_GL= gl
20	USE_PYQT= sip_build core gui network printsupport webchannel	20	USE_PYQT= sip_build core gui network printsupport webchannel
21	USE_PYTHON= concurrent flavors py3kplist	21	USE_PYTHON= concurrent flavors py3kplist

Lines 1-3 Link Here

(-)b/www/py-qt5-webengine/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1595258707	1	TIMESTAMP = 1602396518
2	SHA256 (PyQtWebEngine-5.15.0.tar.gz) = 670812688e40bf75f70ddf01eadd897d231300318d3856b275bf8e7e0085bf75	2	SHA256 (PyQtWebEngine-5.15.1.tar.gz) = f0ca7915ee206ba5d703168c6ca40b0aad62c67360328fae4af5359cdbcee439
3	SIZE (PyQtWebEngine-5.15.0.tar.gz) = 48308	3	SIZE (PyQtWebEngine-5.15.1.tar.gz) = 48520

Lines 12-18 RUN_DEPENDS= ${PY_ENUM34} Link Here

(-)b/www/py-qt5-webkit/Makefile (-1 / +1 lines)
12	CONFIGURE_ARGS= --enable QtWebKit	12	CONFIGURE_ARGS= --enable QtWebKit
13	PYQT_DIST= yes	13	PYQT_DIST= yes
14		14
15	USES= gl python pyqt:5 qt:5	15	USES= gl python:3.5+ pyqt:5 qt:5
16	USE_GL= gl	16	USE_GL= gl
17	USE_PYQT= sip_build core_run gui_run network_run	17	USE_PYQT= sip_build core_run gui_run network_run
18	USE_PYTHON= concurrent flavors py3kplist	18	USE_PYTHON= concurrent flavors py3kplist

Lines 12-18 RUN_DEPENDS= ${PY_ENUM34} Link Here

(-)b/www/py-qt5-webkitwidgets/Makefile (-1 / +1 lines)
12	CONFIGURE_ARGS= --enable QtWebKitWidgets	12	CONFIGURE_ARGS= --enable QtWebKitWidgets
13	PYQT_DIST= yes	13	PYQT_DIST= yes
14		14
15	USES= gl python pyqt:5 qt:5	15	USES= gl python:3.5+ pyqt:5 qt:5
16	USE_GL= gl	16	USE_GL= gl
17	USE_PYQT= sip_build core_run printsupport_run webkit_run widgets_run	17	USE_PYQT= sip_build core_run printsupport_run webkit_run widgets_run
18	USE_PYTHON= concurrent flavors py3kplist	18	USE_PYTHON= concurrent flavors py3kplist

Lines 12-18 RUN_DEPENDS= ${PY_ENUM34} Link Here

(-)b/www/py-qt5-websockets/Makefile (-1 / +1 lines)
12	CONFIGURE_ARGS= --enable QtWebSockets	12	CONFIGURE_ARGS= --enable QtWebSockets
13	PYQT_DIST= yes	13	PYQT_DIST= yes
14		14
15	USES= python pyqt:5 qt:5	15	USES= python:3.5+ pyqt:5 qt:5
16	USE_PYQT= sip_build core_run	16	USE_PYQT= sip_build core_run
17	USE_PYTHON= concurrent flavors py3kplist	17	USE_PYTHON= concurrent flavors py3kplist
18	USE_QT= core qmake_build network websockets	18	USE_QT= core qmake_build network websockets

Lines 15-21 LICENSE= ${PYQT5_LICENSE} Link Here

(-)b/x11-toolkits/py-qt5-chart/Makefile (-1 / +1 lines)
15	BUILD_DEPENDS= ${PY_ENUM34}	15	BUILD_DEPENDS= ${PY_ENUM34}
16	RUN_DEPENDS= ${PY_ENUM34}	16	RUN_DEPENDS= ${PY_ENUM34}
17		17
18	USES= gl python pyqt:5 qt:5	18	USES= gl python:3.5+ pyqt:5 qt:5
19	USE_GL= gl	19	USE_GL= gl
20	USE_PYQT= sip_build core gui widgets	20	USE_PYQT= sip_build core gui widgets
21	USE_PYTHON= concurrent flavors py3kplist	21	USE_PYTHON= concurrent flavors py3kplist

Lines 1-3 Link Here

(-)b/x11-toolkits/py-qt5-chart/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1595281551	1	TIMESTAMP = 1602004326
2	SHA256 (PyQtChart-5.15.0.tar.gz) = 796b1a966759c78859d019bbac6b88b8e1c72ffebf65acf2be3cd9f45c756661	2	SHA256 (PyQtChart-5.15.1.tar.gz) = 8d976b3dbfb233fb0123129323c68adb9d3693c945bba1e227e004208f0747bc
3	SIZE (PyQtChart-5.15.0.tar.gz) = 68423	3	SIZE (PyQtChart-5.15.1.tar.gz) = 68651

Lines 12-18 RUN_DEPENDS= ${PY_ENUM34} Link Here

(-)b/x11-toolkits/py-qt5-gui/Makefile (-1 / +1 lines)
12	CONFIGURE_ARGS= --enable QtGui	12	CONFIGURE_ARGS= --enable QtGui
13	PYQT_DIST= yes	13	PYQT_DIST= yes
14		14
15	USES= gl python pyqt:5 qt:5	15	USES= gl python:3.5+ pyqt:5 qt:5
16	USE_GL= gl	16	USE_GL= gl
17	USE_PYQT= sip_build core_run	17	USE_PYQT= sip_build core_run
18	USE_PYTHON= concurrent flavors py3kplist	18	USE_PYTHON= concurrent flavors py3kplist

Lines 12-18 RUN_DEPENDS= ${PY_ENUM34} Link Here

(-)b/x11-toolkits/py-qt5-quick/Makefile (-1 / +1 lines)
12	CONFIGURE_ARGS= --enable QtQuick	12	CONFIGURE_ARGS= --enable QtQuick
13	PYQT_DIST= yes	13	PYQT_DIST= yes
14		14
15	USES= gl python pyqt:5 qt:5	15	USES= gl python:3.5+ pyqt:5 qt:5
16	USE_GL= gl	16	USE_GL= gl
17	USE_PYQT= sip_build core_run gui_run	17	USE_PYQT= sip_build core_run gui_run
18	USE_PYTHON= concurrent flavors py3kplist	18	USE_PYTHON= concurrent flavors py3kplist

Lines 12-18 RUN_DEPENDS= ${PY_ENUM34} Link Here

(-)b/x11-toolkits/py-qt5-quick3d/Makefile (-1 / +1 lines)
12	CONFIGURE_ARGS= --enable QtQuick3D	12	CONFIGURE_ARGS= --enable QtQuick3D
13	PYQT_DIST= yes	13	PYQT_DIST= yes
14		14
15	USES= gl python pyqt:5 qt:5	15	USES= gl python:3.5+ pyqt:5 qt:5
16	USE_GL= gl	16	USE_GL= gl
17	USE_PYQT= sip_build core_run gui_run	17	USE_PYQT= sip_build core_run gui_run
18	USE_PYTHON= concurrent flavors py3kplist	18	USE_PYTHON= concurrent flavors py3kplist

Lines 9-15 COMMENT= Python bindings for the Qt5 toolkit, QtQuickWidgets module Link Here

(-)b/x11-toolkits/py-qt5-quickwidgets/Makefile (-1 / +1 lines)
9	BUILD_DEPENDS= ${PY_ENUM34}	9	BUILD_DEPENDS= ${PY_ENUM34}
10	RUN_DEPENDS= ${PY_ENUM34}	10	RUN_DEPENDS= ${PY_ENUM34}
11		11
12	USES= gl python pyqt:5 qt:5	12	USES= gl python:3.5+ pyqt:5 qt:5
13	USE_GL= gl	13	USE_GL= gl
14	USE_PYQT= core_run gui_run sip_build	14	USE_PYQT= core_run gui_run sip_build
15	PYQT_DIST= yes	15	PYQT_DIST= yes

Lines 12-18 RUN_DEPENDS= ${PY_ENUM34} Link Here

(-)b/x11-toolkits/py-qt5-widgets/Makefile (-1 / +1 lines)
12	CONFIGURE_ARGS= --enable QtWidgets	12	CONFIGURE_ARGS= --enable QtWidgets
13	PYQT_DIST= yes	13	PYQT_DIST= yes
14		14
15	USES= gl python pyqt:5 qt:5	15	USES= gl python:3.5+ pyqt:5 qt:5
16	USE_GL= gl	16	USE_GL= gl
17	USE_PYQT= sip_build core_run gui_run	17	USE_PYQT= sip_build core_run gui_run
18	USE_PYTHON= concurrent flavors py3kplist	18	USE_PYTHON= concurrent flavors py3kplist

Lines 2-8 Link Here

(-)b/x11-toolkits/qt5-declarative/Makefile (-1 / +2 lines)
2		2
3	PORTNAME= declarative	3	PORTNAME= declarative
4	DISTVERSION= ${QT5_VERSION}	4	DISTVERSION= ${QT5_VERSION}
5	PORTREVISION= 2
6	CATEGORIES= x11-toolkits	5	CATEGORIES= x11-toolkits
7	PKGNAMEPREFIX= qt5-	6	PKGNAMEPREFIX= qt5-
8		7
Lines 17-22 USE_QT= core gui network sql testlib \ Link Here
17		16
18	CONFLICTS= qt5-declarative-render2d-* qt5-qml qt5-quick	17	CONFLICTS= qt5-declarative-render2d-* qt5-qml qt5-quick
19		18
		19	BINARY_ALIAS= python=${PYTHON_CMD}
		20
20	QT_BINARIES= yes	21	QT_BINARIES= yes
21	QT_DEFINES= ACCESSIBILITY	22	QT_DEFINES= ACCESSIBILITY
22	QT_CONFIG= accessibility accessibility-atspi-bridge	23	QT_CONFIG= accessibility accessibility-atspi-bridge

Lines 699-704 Link Here

(-)b/x11-toolkits/qt5-declarative/pkg-plist (+1 lines)
699	%%QT_INCDIR%%/QtQuickParticles/%%FULLVER%%/QtQuickParticles/private/qquickparticleaffector_p.h	699	%%QT_INCDIR%%/QtQuickParticles/%%FULLVER%%/QtQuickParticles/private/qquickparticleaffector_p.h
700	%%QT_INCDIR%%/QtQuickParticles/%%FULLVER%%/QtQuickParticles/private/qquickparticleemitter_p.h	700	%%QT_INCDIR%%/QtQuickParticles/%%FULLVER%%/QtQuickParticles/private/qquickparticleemitter_p.h
701	%%QT_INCDIR%%/QtQuickParticles/%%FULLVER%%/QtQuickParticles/private/qquickparticleextruder_p.h	701	%%QT_INCDIR%%/QtQuickParticles/%%FULLVER%%/QtQuickParticles/private/qquickparticleextruder_p.h
		702	%%QT_INCDIR%%/QtQuickParticles/%%FULLVER%%/QtQuickParticles/private/qquickparticleflatset_p.h
702	%%QT_INCDIR%%/QtQuickParticles/%%FULLVER%%/QtQuickParticles/private/qquickparticlegroup_p.h	703	%%QT_INCDIR%%/QtQuickParticles/%%FULLVER%%/QtQuickParticles/private/qquickparticlegroup_p.h
703	%%QT_INCDIR%%/QtQuickParticles/%%FULLVER%%/QtQuickParticles/private/qquickparticlepainter_p.h	704	%%QT_INCDIR%%/QtQuickParticles/%%FULLVER%%/QtQuickParticles/private/qquickparticlepainter_p.h
704	%%QT_INCDIR%%/QtQuickParticles/%%FULLVER%%/QtQuickParticles/private/qquickparticlesmodule_p.h	705	%%QT_INCDIR%%/QtQuickParticles/%%FULLVER%%/QtQuickParticles/private/qquickparticlesmodule_p.h




%%QT_QMLDIR%%/QtQuick3D/Effects/Scatter.qml
%%QT_QMLDIR%%/QtQuick3D/Effects/TiltShift.qml
%%QT_QMLDIR%%/QtQuick3D/Effects/Vignette.qml
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/AdditiveColorGradientSection.qml
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/AdditiveColorGradientSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/BlurSection.qml
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/BlurSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/BrushStrokesSection.qml
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/BrushStrokesSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/ChromaticAberrationSection.qml
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/ChromaticAberrationSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/ColorMasterSection.qml
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/ColorMasterSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/DepthOfFieldHQBlurSection.qml
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/DepthOfFieldHQBlurSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/DesaturateSection.qml
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/DesaturateSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/DistortionRippleSection.qml
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/DistortionRippleSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/DistortionSphereSection.qml
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/DistortionSphereSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/DistortionSpiralSection.qml
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/DistortionSpiralSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/EdgeDetectSection.qml
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/EdgeDetectSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/EffectSection.qml
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/EffectSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/EmbossSection.qml
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/EmbossSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/FlipSection.qml
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/FlipSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/FxaaSection.qml
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/FxaaSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/GaussianBlurSection.qml
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/GaussianBlurSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/HDRBloomTonemapSection.qml
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/HDRBloomTonemapSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/IdComboBox.qml
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/MotionBlurSection.qml
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/MotionBlurSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/SCurveTonemapSection.qml
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/SCurveTonemapSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/ScatterSection.qml
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/ScatterSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/TiltShiftSection.qml
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/TiltShiftSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/VignetteSection.qml
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/VignetteSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/effectlib.metainfo
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/images/effect.png
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/images/effect16.png
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/images/effect@2x.png
%%QT_QMLDIR%%/QtQuick3D/Effects/designer/source/effect_template.qml
%%QT_QMLDIR%%/QtQuick3D/Effects/libqtquick3deffectplugin.so
%%DEBUG%%%%QT_QMLDIR%%/QtQuick3D/Effects/libqtquick3deffectplugin.so.debug
%%QT_QMLDIR%%/QtQuick3D/Effects/maps/brushnoise.png

%%QT_QMLDIR%%/QtQuick3D/Materials/PlasticStructuredRedEmissiveMaterial.qml
%%QT_QMLDIR%%/QtQuick3D/Materials/PlasticStructuredRedMaterial.qml
%%QT_QMLDIR%%/QtQuick3D/Materials/SteelMilledConcentricMaterial.qml
%%QT_QMLDIR%%/QtQuick3D/Materials/designer/AluminumAnodizedEmissiveMaterialSection.qml
%%QT_QMLDIR%%/QtQuick3D/Materials/designer/AluminumAnodizedEmissiveMaterialSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/Materials/designer/AluminumAnodizedMaterialSection.qml
%%QT_QMLDIR%%/QtQuick3D/Materials/designer/AluminumAnodizedMaterialSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/Materials/designer/AluminumBrushedMaterialSection.qml
%%QT_QMLDIR%%/QtQuick3D/Materials/designer/AluminumBrushedMaterialSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/Materials/designer/AluminumEmissiveMaterialSection.qml
%%QT_QMLDIR%%/QtQuick3D/Materials/designer/AluminumEmissiveMaterialSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/Materials/designer/AluminumMaterialSection.qml
%%QT_QMLDIR%%/QtQuick3D/Materials/designer/AluminumMaterialSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/Materials/designer/CopperMaterialSection.qml
%%QT_QMLDIR%%/QtQuick3D/Materials/designer/CopperMaterialSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/Materials/designer/CustomMaterialSection.qml
%%QT_QMLDIR%%/QtQuick3D/Materials/designer/CustomMaterialSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/Materials/designer/FrostedGlassMaterialSection.qml
%%QT_QMLDIR%%/QtQuick3D/Materials/designer/FrostedGlassMaterialSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/Materials/designer/FrostedGlassSinglePassMaterialSection.qml
%%QT_QMLDIR%%/QtQuick3D/Materials/designer/FrostedGlassSinglePassMaterialSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/Materials/designer/GlassMaterialSection.qml
%%QT_QMLDIR%%/QtQuick3D/Materials/designer/GlassMaterialSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/Materials/designer/GlassRefractiveMaterialSection.qml
%%QT_QMLDIR%%/QtQuick3D/Materials/designer/GlassRefractiveMaterialSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/Materials/designer/IdComboBox.qml
%%QT_QMLDIR%%/QtQuick3D/Materials/designer/PaperArtisticMaterialSection.qml
%%QT_QMLDIR%%/QtQuick3D/Materials/designer/PaperArtisticMaterialSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/Materials/designer/PaperOfficeMaterialSection.qml
%%QT_QMLDIR%%/QtQuick3D/Materials/designer/PaperOfficeMaterialSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/Materials/designer/PlasticStructuredRedEmissiveMaterialSection.qml
%%QT_QMLDIR%%/QtQuick3D/Materials/designer/PlasticStructuredRedEmissiveMaterialSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/Materials/designer/PlasticStructuredRedMaterialSection.qml
%%QT_QMLDIR%%/QtQuick3D/Materials/designer/PlasticStructuredRedMaterialSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/Materials/designer/SteelMilledConcentricMaterialSection.qml
%%QT_QMLDIR%%/QtQuick3D/Materials/designer/SteelMilledConcentricMaterialSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/Materials/designer/images/custommaterial.png
%%QT_QMLDIR%%/QtQuick3D/Materials/designer/images/custommaterial16.png
%%QT_QMLDIR%%/QtQuick3D/Materials/designer/images/custommaterial@2x.png
%%QT_QMLDIR%%/QtQuick3D/Materials/designer/materiallib.metainfo
%%QT_QMLDIR%%/QtQuick3D/Materials/designer/source/custommaterial_template.qml
%%QT_QMLDIR%%/QtQuick3D/Materials/libqtquick3dmaterialplugin.so
%%DEBUG%%%%QT_QMLDIR%%/QtQuick3D/Materials/libqtquick3dmaterialplugin.so.debug
%%QT_QMLDIR%%/QtQuick3D/Materials/maps/art_paper_normal.png
%%QT_QMLDIR%%/QtQuick3D/Materials/maps/art_paper_trans.png
%%QT_QMLDIR%%/QtQuick3D/Materials/maps/asphalt.png
%%QT_QMLDIR%%/QtQuick3D/Materials/maps/asphalt_bump.png
%%QT_QMLDIR%%/QtQuick3D/Materials/maps/bamboo_natural.png
%%QT_QMLDIR%%/QtQuick3D/Materials/maps/bamboo_natural_bump.png
%%QT_QMLDIR%%/QtQuick3D/Materials/maps/bamboo_natural_spec.png
%%QT_QMLDIR%%/QtQuick3D/Materials/maps/brushed_a.png
%%QT_QMLDIR%%/QtQuick3D/Materials/maps/brushed_full_contrast.png
%%QT_QMLDIR%%/QtQuick3D/Materials/maps/carbon_fiber.png
%%QT_QMLDIR%%/QtQuick3D/Materials/maps/carbon_fiber_aniso.png
%%QT_QMLDIR%%/QtQuick3D/Materials/maps/carbon_fiber_bump.png
%%QT_QMLDIR%%/QtQuick3D/Materials/maps/carbon_fiber_spec.png
%%QT_QMLDIR%%/QtQuick3D/Materials/maps/concentric_milled_steel.png
%%QT_QMLDIR%%/QtQuick3D/Materials/maps/concentric_milled_steel_aniso.png
%%QT_QMLDIR%%/QtQuick3D/Materials/maps/concrete_plain.png
%%QT_QMLDIR%%/QtQuick3D/Materials/maps/concrete_plain_bump.png
%%QT_QMLDIR%%/QtQuick3D/Materials/maps/cyclone_mesh_fencing.png
%%QT_QMLDIR%%/QtQuick3D/Materials/maps/cyclone_mesh_fencing_normal.png
%%QT_QMLDIR%%/QtQuick3D/Materials/maps/emissive.png
%%QT_QMLDIR%%/QtQuick3D/Materials/maps/emissive_mask.png
%%QT_QMLDIR%%/QtQuick3D/Materials/maps/grunge_b.png
%%QT_QMLDIR%%/QtQuick3D/Materials/maps/grunge_d.png
%%QT_QMLDIR%%/QtQuick3D/Materials/maps/metal_mesh.png
%%QT_QMLDIR%%/QtQuick3D/Materials/maps/metal_mesh_bump.png
%%QT_QMLDIR%%/QtQuick3D/Materials/maps/metal_mesh_spec.png
%%QT_QMLDIR%%/QtQuick3D/Materials/maps/paper_diffuse.png
%%QT_QMLDIR%%/QtQuick3D/Materials/maps/paper_trans.png
%%QT_QMLDIR%%/QtQuick3D/Materials/maps/powdercoat_bump_01.png
%%QT_QMLDIR%%/QtQuick3D/Materials/maps/randomGradient1D.png
%%QT_QMLDIR%%/QtQuick3D/Materials/maps/randomGradient2D.png
%%QT_QMLDIR%%/QtQuick3D/Materials/maps/randomGradient3D.png
%%QT_QMLDIR%%/QtQuick3D/Materials/maps/randomGradient4D.png
%%QT_QMLDIR%%/QtQuick3D/Materials/maps/shadow.png
%%QT_QMLDIR%%/QtQuick3D/Materials/maps/smooth_black_leather.png
%%QT_QMLDIR%%/QtQuick3D/Materials/maps/smooth_black_leather_bump.png
%%QT_QMLDIR%%/QtQuick3D/Materials/maps/smooth_black_leather_spec.png
%%QT_QMLDIR%%/QtQuick3D/Materials/maps/spherical_checker.png
%%QT_QMLDIR%%/QtQuick3D/Materials/maps/studded_rubber_bump.png
%%QT_QMLDIR%%/QtQuick3D/Materials/maps/walnut.png
%%QT_QMLDIR%%/QtQuick3D/Materials/maps/walnut_bump.png
%%QT_QMLDIR%%/QtQuick3D/Materials/maps/walnut_spec.png
%%QT_QMLDIR%%/QtQuick3D/Materials/plugins.qmltypes
%%QT_QMLDIR%%/QtQuick3D/Materials/qmldir
%%QT_QMLDIR%%/QtQuick3D/designer/AreaLightSection.qml
%%QT_QMLDIR%%/QtQuick3D/designer/AreaLightSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/designer/BlendingSection.qml
%%QT_QMLDIR%%/QtQuick3D/designer/BlendingSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/designer/BufferBlitSection.qml
%%QT_QMLDIR%%/QtQuick3D/designer/BufferBlitSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/designer/BufferInputSection.qml
%%QT_QMLDIR%%/QtQuick3D/designer/BufferInputSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/designer/BufferSection.qml
%%QT_QMLDIR%%/QtQuick3D/designer/BufferSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/designer/CullModeSection.qml
%%QT_QMLDIR%%/QtQuick3D/designer/CullModeSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/designer/CustomCameraSection.qml
%%QT_QMLDIR%%/QtQuick3D/designer/CustomCameraSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/designer/CustomMaterialSection.qml
%%QT_QMLDIR%%/QtQuick3D/designer/CustomMaterialSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/designer/DefaultMaterialSection.qml
%%QT_QMLDIR%%/QtQuick3D/designer/DefaultMaterialSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/designer/DepthInputSection.qml
%%QT_QMLDIR%%/QtQuick3D/designer/DepthInputSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/designer/DirectionalLightSection.qml
%%QT_QMLDIR%%/QtQuick3D/designer/DirectionalLightSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/designer/FrustumCameraSection.qml

%%QT_QMLDIR%%/QtQuick3D/designer/Object3DSection.qml
%%QT_QMLDIR%%/QtQuick3D/designer/OrthographicCameraSection.qml
%%QT_QMLDIR%%/QtQuick3D/designer/OrthographicCameraSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/designer/PassSection.qml
%%QT_QMLDIR%%/QtQuick3D/designer/PassSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/designer/PerspectiveCameraSection.qml
%%QT_QMLDIR%%/QtQuick3D/designer/PerspectiveCameraSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/designer/PointLightSection.qml
%%QT_QMLDIR%%/QtQuick3D/designer/PointLightSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/designer/PrincipledMaterialSection.qml
%%QT_QMLDIR%%/QtQuick3D/designer/PrincipledMaterialSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/designer/RenderStateSection.qml
%%QT_QMLDIR%%/QtQuick3D/designer/RenderStateSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/designer/SceneEnvironmentSection.qml
%%QT_QMLDIR%%/QtQuick3D/designer/SceneEnvironmentSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/designer/SetUniformValueSection.qml
%%QT_QMLDIR%%/QtQuick3D/designer/SetUniformValueSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/designer/ShaderInfoSection.qml
%%QT_QMLDIR%%/QtQuick3D/designer/ShaderInfoSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/designer/ShaderSection.qml
%%QT_QMLDIR%%/QtQuick3D/designer/ShaderSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/designer/ShadowSection.qml
%%QT_QMLDIR%%/QtQuick3D/designer/SpotLightSection.qml
%%QT_QMLDIR%%/QtQuick3D/designer/SpotLightSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/designer/TextureInputSection.qml
%%QT_QMLDIR%%/QtQuick3D/designer/TextureInputSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/designer/TextureSection.qml
%%QT_QMLDIR%%/QtQuick3D/designer/TextureSpecifics.qml
%%QT_QMLDIR%%/QtQuick3D/designer/View3DSection.qml

%%QT_QMLDIR%%/QtQuick3D/designer/images/material.png
%%QT_QMLDIR%%/QtQuick3D/designer/images/material16.png
%%QT_QMLDIR%%/QtQuick3D/designer/images/material@2x.png
%%QT_QMLDIR%%/QtQuick3D/designer/images/model16.png
%%QT_QMLDIR%%/QtQuick3D/designer/images/plane.png
%%QT_QMLDIR%%/QtQuick3D/designer/images/plane16.png
%%QT_QMLDIR%%/QtQuick3D/designer/images/plane@2x.png
%%QT_QMLDIR%%/QtQuick3D/designer/images/scene.png
%%QT_QMLDIR%%/QtQuick3D/designer/images/scene16.png
%%QT_QMLDIR%%/QtQuick3D/designer/images/scene@2x.png
%%QT_QMLDIR%%/QtQuick3D/designer/images/shadercommand.png
%%QT_QMLDIR%%/QtQuick3D/designer/images/shadercommand16.png
%%QT_QMLDIR%%/QtQuick3D/designer/images/shadercommand@2x.png
%%QT_QMLDIR%%/QtQuick3D/designer/images/shaderutil.png
%%QT_QMLDIR%%/QtQuick3D/designer/images/shaderutil16.png
%%QT_QMLDIR%%/QtQuick3D/designer/images/shaderutil@2x.png
%%QT_QMLDIR%%/QtQuick3D/designer/images/sphere.png
%%QT_QMLDIR%%/QtQuick3D/designer/images/sphere16.png
%%QT_QMLDIR%%/QtQuick3D/designer/images/sphere@2x.png

Lines 458-463 Link Here

(-)b/x11-toolkits/qt5-quickcontrols2/pkg-plist (+1 lines)
458	%%QT_QMLDIR%%/QtQuick/Controls.2/designer/DialSpecifics.qml	458	%%QT_QMLDIR%%/QtQuick/Controls.2/designer/DialSpecifics.qml
459	%%QT_QMLDIR%%/QtQuick/Controls.2/designer/FrameSpecifics.qml	459	%%QT_QMLDIR%%/QtQuick/Controls.2/designer/FrameSpecifics.qml
460	%%QT_QMLDIR%%/QtQuick/Controls.2/designer/GroupBoxSpecifics.qml	460	%%QT_QMLDIR%%/QtQuick/Controls.2/designer/GroupBoxSpecifics.qml
		461	%%QT_QMLDIR%%/QtQuick/Controls.2/designer/InsetSection.qml
461	%%QT_QMLDIR%%/QtQuick/Controls.2/designer/ItemDelegateSection.qml	462	%%QT_QMLDIR%%/QtQuick/Controls.2/designer/ItemDelegateSection.qml
462	%%QT_QMLDIR%%/QtQuick/Controls.2/designer/ItemDelegateSpecifics.qml	463	%%QT_QMLDIR%%/QtQuick/Controls.2/designer/ItemDelegateSpecifics.qml
463	%%QT_QMLDIR%%/QtQuick/Controls.2/designer/LabelSpecifics.qml	464	%%QT_QMLDIR%%/QtQuick/Controls.2/designer/LabelSpecifics.qml




Only enter the directories we want to build, otherwise we might fail due to
missing dependencies.
--- src/src.pro.orig	2020-11-20 20:02:29 UTC
+++ src/src.pro
@@ -1,55 +1,3 @@
 TEMPLATE = subdirs
 
-qtHaveModule(widgets) {

-    } else {
-        QT_FOR_CONFIG += widgets
-        qtConfig(pushbutton):qtConfig(toolbutton) {
-            SUBDIRS = designer \
-                      designer \
-                      pixeltool
-
-            !static|contains(QT_PLUGINS, qsqlite): SUBDIRS += assistant
-
-            linguist.depends = designer
-        }
-        qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator

Lines 12-18 RUN_DEPENDS= ${PY_ENUM34} Link Here

(-)b/x11/py-qt5-opengl/Makefile (-1 / +1 lines)
12	CONFIGURE_ARGS= --enable QtOpenGL	12	CONFIGURE_ARGS= --enable QtOpenGL
13	PYQT_DIST= yes	13	PYQT_DIST= yes
14		14
15	USES= gl python pyqt:5 qt:5	15	USES= gl python:3.5+ pyqt:5 qt:5
16	USE_GL= gl	16	USE_GL= gl
17	USE_PYQT= sip_build core_run gui_run widgets_run	17	USE_PYQT= sip_build core_run gui_run widgets_run
18	USE_PYTHON= concurrent flavors py3kplist	18	USE_PYTHON= concurrent flavors py3kplist




--- src/src.pro.orig	2020-11-20 20:04:07 UTC
+++ src/src.pro
@@ -1,55 +1,3 @@
 TEMPLATE = subdirs
 
-qtHaveModule(widgets) {

-    } else {
-        QT_FOR_CONFIG += widgets
-        qtConfig(pushbutton):qtConfig(toolbutton) {
-            SUBDIRS = designer \
-                      designer \
-                      pixeltool
-
-            !static|contains(QT_PLUGINS, qsqlite): SUBDIRS += assistant
-
-            linguist.depends = designer
-        }
-        qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator

Return to bug 250853

Lines 53-80 PYQT_MAINTAINER= kde@FreeBSD.org Link Here

(-)b/Mk/Uses/pyqt.mk (-16 / +19 lines)
53		53
54	MASTER_SITE_RIVERBANK= https://www.riverbankcomputing.com/static/Downloads/%SUBDIR%/	54	MASTER_SITE_RIVERBANK= https://www.riverbankcomputing.com/static/Downloads/%SUBDIR%/
55		55
56	#MASTER_SITES_SIP= https://pypi.python.org/packages/source/s/sip/	56	MASTER_SITES_SIP= https://pypi.python.org/packages/source/s/sip/
57	# https://www.riverbankcomputing.com/static/Downloads/sip/4.19.15/sip-4.19.15.tar.gz
58	MASTER_SITES_SIP= RIVERBANK/sip/${PORTVERSION} \
59	SF/pyqt/sip/sip-${PORTVERSION} \
60	GENTOO
61	MASTER_SITES_PYQT5= https://pypi.python.org/packages/source/P/PyQt5/	57	MASTER_SITES_PYQT5= https://pypi.python.org/packages/source/P/PyQt5/
62	MASTER_SITES_PYQTSIP= https://pypi.python.org/packages/source/P/PyQt5-sip/	58	MASTER_SITES_PYQTSIP= https://pypi.python.org/packages/source/P/PyQt5-sip/
63	MASTER_SITES_PYQTCHART= https://pypi.python.org/packages/source/P/PyQtChart/	59	MASTER_SITES_PYQTCHART= https://pypi.python.org/packages/source/P/PyQtChart/
		60	MASTER_SITES_PYQTBUILDER= https://pypi.io/packages/source/P/PyQt-builder/
64	#https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.11.4/QScintilla-2.11.4.tar.gz	61	#https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.11.4/QScintilla-2.11.4.tar.gz
65	MASTER_SITES_QSCI2= RIVERBANK/QScintilla/${PORTVERSION} \	62	MASTER_SITES_QSCI2= RIVERBANK/QScintilla/${PORTVERSION} \
66	SF/pyqt/QScintilla2/QScintilla-${PORTVERSION} \	63	SF/pyqt/QScintilla2/QScintilla-${PORTVERSION} \
67	GENTOO	64	GENTOO
68		65
69	SIP_VERSION= 4.19.24	66	SIP_VERSION= 5.4.0
70	QSCI2_VERSION= 2.11.5	67	QSCI2_VERSION= 2.11.5
71	PYQT5_VERSION= 5.15.0	68	PYQT5_VERSION= 5.15.1
72	PYQTSIP_VERSION= 12.8.0	69	PYQTSIP_VERSION= 12.8.0
		70	PYQTBUILDER_VERSION= 1.4.0
73		71
74	SIP_DISTNAME= sip-${SIP_VERSION}	72	SIP_DISTNAME= sip-${SIP_VERSION}
75	PYQT5_DISTNAME= PyQt5-${PYQT5_VERSION}	73	PYQT5_DISTNAME= PyQt5-${PYQT5_VERSION}
76	PYQTSIP_DISTNAME= PyQt5_sip-${PYQTSIP_VERSION}	74	PYQTSIP_DISTNAME= PyQt5_sip-${PYQTSIP_VERSION}
77	PYQTCHART_DISTNAME= PyQtChart-${PYQT_VERSION}	75	PYQTCHART_DISTNAME= PyQtChart-${PYQT_VERSION}
		76	PYQTBUILDER_DISTNAME= PyQt-builder-${PYQTBUILDER_VERSION}
78	PYQT5_DISTINFO_FILE= ${.CURDIR:H:H}/devel/${PYQT_RELNAME}/distinfo	77	PYQT5_DISTINFO_FILE= ${.CURDIR:H:H}/devel/${PYQT_RELNAME}/distinfo
79	QSCI2_DISTNAME= QScintilla-${QSCI2_VERSION}	78	QSCI2_DISTNAME= QScintilla-${QSCI2_VERSION}
80	PYQT5_LICENSE= GPLv3	79	PYQT5_LICENSE= GPLv3
Lines 109-116 _USE_PYQT_ALL= ${_USE_PYQT_COMMS} \ Link Here
109	${_USE_PYQT_WWW} \	108	${_USE_PYQT_WWW} \
110	${_USE_PYQT_X11} \	109	${_USE_PYQT_X11} \
111	${_USE_PYQT_X11-TOOLKITS}	110	${_USE_PYQT_X11-TOOLKITS}
112	_USE_SIP_ALL= sip # pysip	111	_USE_SIP_ALL= sip pysip
113	_USE_QSCINTILLA= qscintilla2	112	_USE_QSCINTILLA= qscintilla2
		113	_USE_PYQTBUILDER= qtbuilder
114		114
115	# Unversioned variables for the rest of the file	115	# Unversioned variables for the rest of the file
116	PYQT_VERSION= ${PYQT${_PYQT_VERSION}_VERSION}	116	PYQT_VERSION= ${PYQT${_PYQT_VERSION}_VERSION}
Lines 123-130 PYQT_LICENSE= ${PYQT${_PYQT_VERSION}_LICENSE} Link Here
123		123
124	# PATH	124	# PATH
125	py-sip_PATH= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}	125	py-sip_PATH= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}
126	# py-pysip_PATH= ${PYQT_PY_RELNAME}-sip>=${PYQTSIP_VERSION}	126	py-pysip_PATH= ${PYQT_PY_RELNAME}-sip>=${PYQTSIP_VERSION}
127	py-qscintilla2_PATH= ${PYQT_PY_RELNAME}-qscintilla2>=${QSCI2_VERSION}	127	py-qscintilla2_PATH= ${PYQT_PY_RELNAME}-qscintilla2>=${QSCI2_VERSION}
		128	py-qtbuilder_PATH= ${PYTHON_PKGNAMEPREFIX}qtbuilder>=${PYQTBUILDER_VERSION}
128		129
129	. for _component in ${_USE_PYQT_ALL}	130	. for _component in ${_USE_PYQT_ALL}
130	py-${_component}_PATH?=${PYQT_PY_RELNAME}-${_component}>=${PYQT_VERSION}	131	py-${_component}_PATH?=${PYQT_PY_RELNAME}-${_component}>=${PYQT_VERSION}
Lines 132-138 py-${_component}_PATH?=${PYQT_PY_RELNAME}-${_component}>=${PYQT_VERSION} Link Here
132		133
133	# PORT	134	# PORT
134	py-sip_PORT= devel/py-sip	135	py-sip_PORT= devel/py-sip
135	# py-pysip_PORT= devel/${PYQT_RELNAME}-sip	136	py-qtbuilder_PORT= devel/py-qtbuilder
		137	py-pysip_PORT= devel/${PYQT_RELNAME}-sip
136	py-qscintilla2_PORT= devel/${PYQT_RELNAME}-qscintilla2	138	py-qscintilla2_PORT= devel/${PYQT_RELNAME}-qscintilla2
137		139
138	. for _categorie in comms databases devel graphics lang misc multimedia net print textproc www x11 x11-toolkits	140	. for _categorie in comms databases devel graphics lang misc multimedia net print textproc www x11 x11-toolkits
Lines 179-207 py-xml_DESC= Python bindings for QtXml module Link Here
179	py-xmlpatterns_DESC= Python bindings for QtXmlPatterns module	181	py-xmlpatterns_DESC= Python bindings for QtXmlPatterns module
180		182
181	# The versionned executable of sip	183	# The versionned executable of sip
182	SIP= ${LOCALBASE}/bin/sip-${PYTHON_VER}	184	SIP= ${LOCALBASE}/bin/sip5-${PYTHON_VER}
183		185
184	# Relative directories	186	# Relative directories
185	_VERSION_SUBDIR_REL= PyQt${_PYQT_VERSION}/${PYTHON_VER}	187	_VERSION_SUBDIR_REL= PyQt${_PYQT_VERSION}/${PYTHON_VER}
186	_APIDIR_REL= share/${_VERSION_SUBDIR_REL}/qsci	188	_APIDIR_REL= share/${_VERSION_SUBDIR_REL}/qsci
187	_DOCDIR_REL= share/doc/${_VERSION_SUBDIR_REL}	189	_DOCDIR_REL= share/doc/${_VERSION_SUBDIR_REL}
188	_EXAMPLEDIR_REL= share/examples/${_VERSION_SUBDIR_REL}	190	_EXAMPLEDIR_REL= share/examples/${_VERSION_SUBDIR_REL}
189	_SIPDIR_REL= share/${_VERSION_SUBDIR_REL}/sip	191	_SIPDIR_REL= PyQt${_PYQT_VERSION}/bindings
190	_DESIGNERDIR_REL= ${QT_PLUGINDIR_REL}/designer/${_VERSION_SUBDIR_REL}	192	_DESIGNERDIR_REL= ${QT_PLUGINDIR_REL}/designer/${_VERSION_SUBDIR_REL}
191	_QMLDIR_REL= ${QT_QMLDIR_REL}/${_VERSION_SUBDIR_REL}	193	_QMLDIR_REL= ${QT_QMLDIR_REL}/${_VERSION_SUBDIR_REL}
192		194
193	# Absolute direcotries	195	# Absolute directories
194	PYQT_APIDIR= ${PREFIX}/${_APIDIR_REL}	196	PYQT_APIDIR= ${PREFIX}/${_APIDIR_REL}
195	PYQT_DOCDIR= ${PREFIX}/${_DOCDIR_REL}	197	PYQT_DOCDIR= ${PREFIX}/${_DOCDIR_REL}
196	PYQT_EXAMPLEDIR= ${PREFIX}/${_EXAMPLEDIR_REL}	198	PYQT_EXAMPLEDIR= ${PREFIX}/${_EXAMPLEDIR_REL}
197	PYQT_SIPDIR?= ${PREFIX}/${_SIPDIR_REL}	199	PYQT_SIPDIR?= ${PYTHON_SITELIBDIR}/${_SIPDIR_REL}
198	PYQT_DESIGNERDIR= ${PREFIX}/${_DESIGNERDIR_REL}	200	PYQT_DESIGNERDIR= ${PREFIX}/${_DESIGNERDIR_REL}
199	PYQT_QMLDIR= ${PREFIX}/${_QMLDIR_REL}	201	PYQT_QMLDIR= ${PREFIX}/${_QMLDIR_REL}
200		202
201	PLIST_SUB+= PYQT_APIDIR=${_APIDIR_REL} \	203	PLIST_SUB+= PYQT_APIDIR=${_APIDIR_REL} \
202	PYQT_DOCDIR=${_DOCDIR_REL} \	204	PYQT_DOCDIR=${_DOCDIR_REL} \
203	PYQT_EXAMPLEDIR=${_EXAMPLEDIR_REL} \	205	PYQT_EXAMPLEDIR=${_EXAMPLEDIR_REL} \
204	PYQT_SIPDIR=${_SIPDIR_REL} \	206	PYQT_SIPDIR=${PYQT_SIPDIR} \
205	PYQT_DESIGNERDIR=${_DESIGNERDIR_REL} \	207	PYQT_DESIGNERDIR=${_DESIGNERDIR_REL} \
206	PYQT_QMLDIR=${_QMLDIR_REL} \	208	PYQT_QMLDIR=${_QMLDIR_REL} \
207	PYQT_SIPVERSION=${SIP_VERSION} \	209	PYQT_SIPVERSION=${SIP_VERSION} \
Lines 256-262 do-configure: Link Here
256	# Set build, run and test depends -- we need to prefix them internally with "py-"	258	# Set build, run and test depends -- we need to prefix them internally with "py-"
257	# else we conflict with the ones defined in bsd.qt.mk with the same name	259	# else we conflict with the ones defined in bsd.qt.mk with the same name
258	_USE_PYQT_ALL+= ${_USE_SIP_ALL} \	260	_USE_PYQT_ALL+= ${_USE_SIP_ALL} \
259	${_USE_QSCINTILLA}	261	${_USE_QSCINTILLA} \
		262	${_USE_PYQTBUILDER}
260	. for comp in ${_USE_PYQT_ALL:O:u}	263	. for comp in ${_USE_PYQT_ALL:O:u}
261	_USE_PYQT_ALL_SUFFIXED+= py-${comp} py-${comp}_build py-${comp}_run py-${comp}_test	264	_USE_PYQT_ALL_SUFFIXED+= py-${comp} py-${comp}_build py-${comp}_run py-${comp}_test
262	py-${comp}_BUILD_DEPENDS?= ${py-${comp}_PATH}:${py-${comp}_PORT}@${PY_FLAVOR}	265	py-${comp}_BUILD_DEPENDS?= ${py-${comp}_PATH}:${py-${comp}_PORT}@${PY_FLAVOR}

Lines 14-24 LICENSE_FILE= ${WRKSRC}/LICENSE Link Here

(-)b/cad/uranium/Makefile (-2 / +2 lines)
14		14
15	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \	15	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
16	${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \	16	${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \
17	${PYTHON_PKGNAMEPREFIX}qt5-quick>0:x11-toolkits/py-qt5-quick@${PY_FLAVOR} \
18	${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \	17	${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
19	${PYTHON_PKGNAMEPREFIX}PyOpenGL>0:graphics/py-PyOpenGL@${PY_FLAVOR}	18	${PYTHON_PKGNAMEPREFIX}PyOpenGL>0:graphics/py-PyOpenGL@${PY_FLAVOR}
20		19
21	USES= cmake python:3.4+ gettext	20	USES= cmake gettext python:3.5+ pyqt:5
		21	USE_PYQT= quick
22	USE_GITHUB= yes	22	USE_GITHUB= yes
23	GH_ACCOUNT= Ultimaker	23	GH_ACCOUNT= Ultimaker
24	GH_TAGNAME= 3ed9c4de	24	GH_TAGNAME= 3ed9c4de

Lines 2-9 Link Here

(-)b/deskutils/calibre/Makefile (-6 / +7 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= calibre	4	PORTNAME= calibre
5	PORTVERSION= 4.23.0	5	PORTVERSION= 5.6.0
6	PORTREVISION= 5
7	CATEGORIES= deskutils python	6	CATEGORIES= deskutils python
8	MASTER_SITES= http://download.calibre-ebook.com/${PORTVERSION}/	7	MASTER_SITES= http://download.calibre-ebook.com/${PORTVERSION}/
9		8
Lines 30-36 BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVO Link Here
30	${PYTHON_PKGNAMEPREFIX}msgpack>=0.3:devel/py-msgpack@${PY_FLAVOR} \	29	${PYTHON_PKGNAMEPREFIX}msgpack>=0.3:devel/py-msgpack@${PY_FLAVOR} \
31	${PYTHON_PKGNAMEPREFIX}regex>=0:textproc/py-regex@${PY_FLAVOR} \	30	${PYTHON_PKGNAMEPREFIX}regex>=0:textproc/py-regex@${PY_FLAVOR} \
32	${PYTHON_PKGNAMEPREFIX}html5-parser>=0.4.3:www/py-html5-parser@${PY_FLAVOR} \	31	${PYTHON_PKGNAMEPREFIX}html5-parser>=0.4.3:www/py-html5-parser@${PY_FLAVOR} \
33	${PY_PILLOW}	32	${PY_PILLOW} \
		33	${PYTHON_PKGNAMEPREFIX}zeroconf>0:net/py-zeroconf
34	RUN_DEPENDS= xdg-open:devel/xdg-utils \	34	RUN_DEPENDS= xdg-open:devel/xdg-utils \
35	${PYTHON_PKGNAMEPREFIX}css-parser>=1.0.4:www/py-css-parser@${PY_FLAVOR} \	35	${PYTHON_PKGNAMEPREFIX}css-parser>=1.0.4:www/py-css-parser@${PY_FLAVOR} \
36	${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython@${PY_FLAVOR} \	36	${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython@${PY_FLAVOR} \
Lines 49-62 RUN_DEPENDS= xdg-open:devel/xdg-utils \ Link Here
49	${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet@${PY_FLAVOR} \	49	${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet@${PY_FLAVOR} \
50	${PYTHON_PKGNAMEPREFIX}html5-parser>=0.4.3:www/py-html5-parser@${PY_FLAVOR} \	50	${PYTHON_PKGNAMEPREFIX}html5-parser>=0.4.3:www/py-html5-parser@${PY_FLAVOR} \
51	${PY_PILLOW} \	51	${PY_PILLOW} \
52	pdftohtml:graphics/poppler-utils	52	pdftohtml:graphics/poppler-utils \
		53	${PYTHON_PKGNAMEPREFIX}zeroconf>0:net/py-zeroconf
53		54
54	USES= desktop-file-utils gettext-runtime gl gnome localbase:ldflags \	55	USES= desktop-file-utils gettext-runtime gl gnome localbase:ldflags \
55	pkgconfig pyqt:5 python:3.5+ qt:5 shared-mime-info shebangfix \	56	pkgconfig pyqt:5 python:3.5+ qt:5 shared-mime-info shebangfix \
56	ssl tar:xz xorg	57	ssl tar:xz xorg
57	USE_RC_SUBR= calibre	58	USE_RC_SUBR= calibre
58	SUB_LIST+= PYTHON_VERSION=${PYTHON_VERSION}	59	SUB_LIST+= PYTHON_VERSION=${PYTHON_VERSION}
59	USE_PYQT= core gui network sip svg webengine widgets xmlpatterns	60	USE_PYQT= core gui network pysip qtbuilder sip svg webengine widgets xmlpatterns
60	USE_QT= buildtools_build core dbus gui qmake_build widgets	61	USE_QT= buildtools_build core dbus gui qmake_build widgets
61	USE_GL= egl gl	62	USE_GL= egl gl
62	USE_GNOME= glib20	63	USE_GNOME= glib20
Lines 110-115 do-install: Link Here
110	@${RM} ${STAGEDIR}${PREFIX}/bin/calibre-uninstall \	111	@${RM} ${STAGEDIR}${PREFIX}/bin/calibre-uninstall \
111	${STAGEDIR}${PREFIX}/share/applications/defaults.list	112	${STAGEDIR}${PREFIX}/share/applications/defaults.list
112	@${RMDIR} ${STAGEDIR}${PREFIX}/share/desktop-directories	113	@${RMDIR} ${STAGEDIR}${PREFIX}/share/desktop-directories
113	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/calibre/calibre/plugins/3/*	114	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/calibre/calibre/plugins/*
114		115
115	.include <bsd.port.mk>	116	.include <bsd.port.mk>

Lines 1-15 Link Here

(-)b/deskutils/calibre/files/patch-src_calibre_linux.py (-16 / +7 lines)
1	--- src/calibre/linux.py.orig 2018-01-05 05:41:54 UTC	1	--- src/calibre/linux.py.orig 2020-11-13 01:58:49 UTC
2	+++ src/calibre/linux.py	2	+++ src/calibre/linux.py
3	@@ -841,7 +841,7 @@ class PostInstall:	3	@@ -1103,7 +1103,7 @@ Name=E-book viewer
4	f.close()
5	des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop',
6	'calibre-ebook-viewer.desktop', 'calibre-ebook-edit.desktop')
7	- appdata = os.path.join(os.path.dirname(self.opts.staging_sharedir), 'metainfo')
8	+ appdata = os.path.join(os.path.dirname(self.opts.staging_sharedir), 'appdata')
9	if not os.path.exists(appdata):
10	try:
11	os.mkdir(appdata)
12	@@ -1008,7 +1008,7 @@ Name=E-book Viewer
13	GenericName=Viewer for E-books	4	GenericName=Viewer for E-books
14	Comment=Viewer for E-books in all the major formats	5	Comment=Viewer for E-books in all the major formats
15	TryExec=ebook-viewer	6	TryExec=ebook-viewer
Lines 18-24 Link Here
18	Icon=calibre-viewer	9	Icon=calibre-viewer
19	Categories=Graphics;Viewer;	10	Categories=Graphics;Viewer;
20	'''	11	'''
21	@@ -1021,7 +1021,7 @@ Name=E-book Editor	12	@@ -1116,7 +1116,7 @@ Name=E-book editor
22	GenericName=Editor for E-books	13	GenericName=Editor for E-books
23	Comment=Edit E-books in various formats	14	Comment=Edit E-books in various formats
24	TryExec=ebook-edit	15	TryExec=ebook-edit
Lines 27-38 Link Here
27	Icon=calibre-ebook-edit	18	Icon=calibre-ebook-edit
28	Categories=Office;	19	Categories=Office;
29	'''	20	'''
30	@@ -1034,7 +1034,7 @@ Name=calibre	21	@@ -1129,7 +1129,7 @@ Name=calibre
31	GenericName=E-book library management	22	GenericName=E-book library management
32	Comment=E-book library management: Convert, view, share, catalogue all your e-books	23	Comment=E-book library management: Convert, view, share, catalogue all your e-books
33	TryExec=calibre	24	TryExec=calibre
34	-Exec=calibre --detach %F	25	-Exec=calibre --detach %U
35	+Exec=calibre %F	26	+Exec=calibre %U
36	Icon=calibre-gui	27	Icon=calibre-gui
37	Categories=Office;	28	Categories=Office;
38	'''	29	X-GNOME-UsesNotifications=true

Lines 18-27 bin/lrfviewer Link Here

(-)b/deskutils/calibre/pkg-plist (-43 / +49 lines)
18	bin/lrs2lrf	18	bin/lrs2lrf
19	bin/markdown-calibre	19	bin/markdown-calibre
20	bin/web2disk	20	bin/web2disk
21	lib/calibre/backports/__init__.py
22	lib/calibre/backports/functools_lru_cache.py
23	lib/calibre/backports/ipaddress.py
24	lib/calibre/biplist/__init__.py
25	lib/calibre/calibre/__init__.py	21	lib/calibre/calibre/__init__.py
26	lib/calibre/calibre/constants.py	22	lib/calibre/calibre/constants.py
27	lib/calibre/calibre/customize/__init__.py	23	lib/calibre/calibre/customize/__init__.py
Lines 32-37 lib/calibre/calibre/customize/ui.py Link Here
32	lib/calibre/calibre/customize/zipplugin.py	28	lib/calibre/calibre/customize/zipplugin.py
33	lib/calibre/calibre/db/__init__.py	29	lib/calibre/calibre/db/__init__.py
34	lib/calibre/calibre/db/adding.py	30	lib/calibre/calibre/db/adding.py
		31	lib/calibre/calibre/db/annotations.py
35	lib/calibre/calibre/db/backend.py	32	lib/calibre/calibre/db/backend.py
36	lib/calibre/calibre/db/backup.py	33	lib/calibre/calibre/db/backup.py
37	lib/calibre/calibre/db/cache.py	34	lib/calibre/calibre/db/cache.py
Lines 363-376 lib/calibre/calibre/ebooks/metadata/sources/base.py Link Here
363	lib/calibre/calibre/ebooks/metadata/sources/big_book_search.py	360	lib/calibre/calibre/ebooks/metadata/sources/big_book_search.py
364	lib/calibre/calibre/ebooks/metadata/sources/cli.py	361	lib/calibre/calibre/ebooks/metadata/sources/cli.py
365	lib/calibre/calibre/ebooks/metadata/sources/covers.py	362	lib/calibre/calibre/ebooks/metadata/sources/covers.py
366	lib/calibre/calibre/ebooks/metadata/sources/douban.py
367	lib/calibre/calibre/ebooks/metadata/sources/edelweiss.py	363	lib/calibre/calibre/ebooks/metadata/sources/edelweiss.py
368	lib/calibre/calibre/ebooks/metadata/sources/google.py	364	lib/calibre/calibre/ebooks/metadata/sources/google.py
369	lib/calibre/calibre/ebooks/metadata/sources/google_images.py	365	lib/calibre/calibre/ebooks/metadata/sources/google_images.py
370	lib/calibre/calibre/ebooks/metadata/sources/identify.py	366	lib/calibre/calibre/ebooks/metadata/sources/identify.py
371	lib/calibre/calibre/ebooks/metadata/sources/openlibrary.py	367	lib/calibre/calibre/ebooks/metadata/sources/openlibrary.py
372	lib/calibre/calibre/ebooks/metadata/sources/overdrive.py	368	lib/calibre/calibre/ebooks/metadata/sources/overdrive.py
373	lib/calibre/calibre/ebooks/metadata/sources/ozon.py
374	lib/calibre/calibre/ebooks/metadata/sources/prefs.py	369	lib/calibre/calibre/ebooks/metadata/sources/prefs.py
375	lib/calibre/calibre/ebooks/metadata/sources/search_engines.py	370	lib/calibre/calibre/ebooks/metadata/sources/search_engines.py
376	lib/calibre/calibre/ebooks/metadata/sources/test.py	371	lib/calibre/calibre/ebooks/metadata/sources/test.py
Lines 638-643 lib/calibre/calibre/gui2/actions/add.py Link Here
638	lib/calibre/calibre/gui2/actions/add_to_library.py	633	lib/calibre/calibre/gui2/actions/add_to_library.py
639	lib/calibre/calibre/gui2/actions/annotate.py	634	lib/calibre/calibre/gui2/actions/annotate.py
640	lib/calibre/calibre/gui2/actions/author_mapper.py	635	lib/calibre/calibre/gui2/actions/author_mapper.py
		636	lib/calibre/calibre/gui2/actions/browse_annots.py
641	lib/calibre/calibre/gui2/actions/catalog.py	637	lib/calibre/calibre/gui2/actions/catalog.py
642	lib/calibre/calibre/gui2/actions/choose_library.py	638	lib/calibre/calibre/gui2/actions/choose_library.py
643	lib/calibre/calibre/gui2/actions/convert.py	639	lib/calibre/calibre/gui2/actions/convert.py
Lines 661-666 lib/calibre/calibre/gui2/actions/restart.py Link Here
661	lib/calibre/calibre/gui2/actions/save_to_disk.py	657	lib/calibre/calibre/gui2/actions/save_to_disk.py
662	lib/calibre/calibre/gui2/actions/show_book_details.py	658	lib/calibre/calibre/gui2/actions/show_book_details.py
663	lib/calibre/calibre/gui2/actions/show_quickview.py	659	lib/calibre/calibre/gui2/actions/show_quickview.py
		660	lib/calibre/calibre/gui2/actions/show_stored_templates.py
664	lib/calibre/calibre/gui2/actions/show_template_tester.py	661	lib/calibre/calibre/gui2/actions/show_template_tester.py
665	lib/calibre/calibre/gui2/actions/similar_books.py	662	lib/calibre/calibre/gui2/actions/similar_books.py
666	lib/calibre/calibre/gui2/actions/sort.py	663	lib/calibre/calibre/gui2/actions/sort.py
Lines 805-810 lib/calibre/calibre/gui2/dialogs/drm_error_ui.py Link Here
805	lib/calibre/calibre/gui2/dialogs/duplicates.py	802	lib/calibre/calibre/gui2/dialogs/duplicates.py
806	lib/calibre/calibre/gui2/dialogs/edit_authors_dialog.py	803	lib/calibre/calibre/gui2/dialogs/edit_authors_dialog.py
807	lib/calibre/calibre/gui2/dialogs/edit_authors_dialog_ui.py	804	lib/calibre/calibre/gui2/dialogs/edit_authors_dialog_ui.py
		805	lib/calibre/calibre/gui2/dialogs/enum_values_edit.py
808	lib/calibre/calibre/gui2/dialogs/exim.py	806	lib/calibre/calibre/gui2/dialogs/exim.py
809	lib/calibre/calibre/gui2/dialogs/jobs_ui.py	807	lib/calibre/calibre/gui2/dialogs/jobs_ui.py
810	lib/calibre/calibre/gui2/dialogs/match_books.py	808	lib/calibre/calibre/gui2/dialogs/match_books.py
Lines 855-865 lib/calibre/calibre/gui2/layout.py Link Here
855	lib/calibre/calibre/gui2/layout_menu.py	853	lib/calibre/calibre/gui2/layout_menu.py
856	lib/calibre/calibre/gui2/library/__init__.py	854	lib/calibre/calibre/gui2/library/__init__.py
857	lib/calibre/calibre/gui2/library/alternate_views.py	855	lib/calibre/calibre/gui2/library/alternate_views.py
		856	lib/calibre/calibre/gui2/library/annotations.py
858	lib/calibre/calibre/gui2/library/caches.py	857	lib/calibre/calibre/gui2/library/caches.py
859	lib/calibre/calibre/gui2/library/delegates.py	858	lib/calibre/calibre/gui2/library/delegates.py
860	lib/calibre/calibre/gui2/library/models.py	859	lib/calibre/calibre/gui2/library/models.py
861	lib/calibre/calibre/gui2/library/views.py	860	lib/calibre/calibre/gui2/library/views.py
862	lib/calibre/calibre/gui2/linux_file_dialogs.py	861	lib/calibre/calibre/gui2/linux_file_dialogs.py
		862	lib/calibre/calibre/gui2/listener.py
863	lib/calibre/calibre/gui2/lrf_renderer/__init__.py	863	lib/calibre/calibre/gui2/lrf_renderer/__init__.py
864	lib/calibre/calibre/gui2/lrf_renderer/bookview.py	864	lib/calibre/calibre/gui2/lrf_renderer/bookview.py
865	lib/calibre/calibre/gui2/lrf_renderer/config_ui.py	865	lib/calibre/calibre/gui2/lrf_renderer/config_ui.py
Lines 1029-1034 lib/calibre/calibre/gui2/toc/__init__.py Link Here
1029	lib/calibre/calibre/gui2/toc/location.py	1029	lib/calibre/calibre/gui2/toc/location.py
1030	lib/calibre/calibre/gui2/toc/main.py	1030	lib/calibre/calibre/gui2/toc/main.py
1031	lib/calibre/calibre/gui2/tools.py	1031	lib/calibre/calibre/gui2/tools.py
		1032	lib/calibre/calibre/gui2/tts/__init__.py
		1033	lib/calibre/calibre/gui2/tts/common.py
		1034	lib/calibre/calibre/gui2/tts/develop.py
		1035	lib/calibre/calibre/gui2/tts/errors.py
		1036	lib/calibre/calibre/gui2/tts/implementation.py
		1037	lib/calibre/calibre/gui2/tts/linux.py
		1038	lib/calibre/calibre/gui2/tts/macos.py
		1039	lib/calibre/calibre/gui2/tts/windows.py
1032	lib/calibre/calibre/gui2/tweak_book/__init__.py	1040	lib/calibre/calibre/gui2/tweak_book/__init__.py
1033	lib/calibre/calibre/gui2/tweak_book/boss.py	1041	lib/calibre/calibre/gui2/tweak_book/boss.py
1034	lib/calibre/calibre/gui2/tweak_book/char_select.py	1042	lib/calibre/calibre/gui2/tweak_book/char_select.py
Lines 1093-1098 lib/calibre/calibre/gui2/update.py Link Here
1093	lib/calibre/calibre/gui2/viewer/__init__.py	1101	lib/calibre/calibre/gui2/viewer/__init__.py
1094	lib/calibre/calibre/gui2/viewer/annotations.py	1102	lib/calibre/calibre/gui2/viewer/annotations.py
1095	lib/calibre/calibre/gui2/viewer/bookmarks.py	1103	lib/calibre/calibre/gui2/viewer/bookmarks.py
		1104	lib/calibre/calibre/gui2/viewer/config.py
1096	lib/calibre/calibre/gui2/viewer/convert_book.py	1105	lib/calibre/calibre/gui2/viewer/convert_book.py
1097	lib/calibre/calibre/gui2/viewer/highlights.py	1106	lib/calibre/calibre/gui2/viewer/highlights.py
1098	lib/calibre/calibre/gui2/viewer/integration.py	1107	lib/calibre/calibre/gui2/viewer/integration.py
Lines 1106-1111 lib/calibre/calibre/gui2/viewer/toc.py Link Here
1106	lib/calibre/calibre/gui2/viewer/toolbars.py	1115	lib/calibre/calibre/gui2/viewer/toolbars.py
1107	lib/calibre/calibre/gui2/viewer/ui.py	1116	lib/calibre/calibre/gui2/viewer/ui.py
1108	lib/calibre/calibre/gui2/viewer/web_view.py	1117	lib/calibre/calibre/gui2/viewer/web_view.py
		1118	lib/calibre/calibre/gui2/viewer/widgets.py
1109	lib/calibre/calibre/gui2/webengine.py	1119	lib/calibre/calibre/gui2/webengine.py
1110	lib/calibre/calibre/gui2/widgets.py	1120	lib/calibre/calibre/gui2/widgets.py
1111	lib/calibre/calibre/gui2/widgets2.py	1121	lib/calibre/calibre/gui2/widgets2.py
Lines 1142-1173 lib/calibre/calibre/library/schema_upgrades.py Link Here
1142	lib/calibre/calibre/library/sqlite.py	1152	lib/calibre/calibre/library/sqlite.py
1143	lib/calibre/calibre/libunzip.py	1153	lib/calibre/calibre/libunzip.py
1144	lib/calibre/calibre/linux.py	1154	lib/calibre/calibre/linux.py
1145	lib/calibre/calibre/plugins/3/_patiencediff_c.so	1155	lib/calibre/calibre/plugins/_patiencediff_c.so
1146	lib/calibre/calibre/plugins/3/bzzdec.so	1156	lib/calibre/calibre/plugins/bzzdec.so
1147	lib/calibre/calibre/plugins/3/cPalmdoc.so	1157	lib/calibre/calibre/plugins/cPalmdoc.so
1148	lib/calibre/calibre/plugins/3/certgen.so	1158	lib/calibre/calibre/plugins/certgen.so
1149	lib/calibre/calibre/plugins/3/chmlib.so	1159	lib/calibre/calibre/plugins/freetype.so
1150	lib/calibre/calibre/plugins/3/freetype.so	1160	lib/calibre/calibre/plugins/html_as_json.so
1151	lib/calibre/calibre/plugins/3/html_as_json.so	1161	lib/calibre/calibre/plugins/html_syntax_highlighter.so
1152	lib/calibre/calibre/plugins/3/html_syntax_highlighter.so	1162	lib/calibre/calibre/plugins/hunspell.so
1153	lib/calibre/calibre/plugins/3/hunspell.so	1163	lib/calibre/calibre/plugins/hyphen.so
1154	lib/calibre/calibre/plugins/3/hyphen.so	1164	lib/calibre/calibre/plugins/icu.so
1155	lib/calibre/calibre/plugins/3/icu.so	1165	lib/calibre/calibre/plugins/imageops.so
1156	lib/calibre/calibre/plugins/3/imageops.so	1166	lib/calibre/calibre/plugins/libheadless.so
1157	lib/calibre/calibre/plugins/3/libheadless.so	1167	lib/calibre/calibre/plugins/libmtp.so
1158	lib/calibre/calibre/plugins/3/libmtp.so	1168	lib/calibre/calibre/plugins/libusb.so
1159	lib/calibre/calibre/plugins/3/libusb.so	1169	lib/calibre/calibre/plugins/lzx.so
1160	lib/calibre/calibre/plugins/3/lzma_binding.so	1170	lib/calibre/calibre/plugins/matcher.so
1161	lib/calibre/calibre/plugins/3/lzx.so	1171	lib/calibre/calibre/plugins/msdes.so
1162	lib/calibre/calibre/plugins/3/matcher.so	1172	lib/calibre/calibre/plugins/pictureflow.so
1163	lib/calibre/calibre/plugins/3/msdes.so	1173	lib/calibre/calibre/plugins/podofo.so
1164	lib/calibre/calibre/plugins/3/pictureflow.so	1174	lib/calibre/calibre/plugins/progress_indicator.so
1165	lib/calibre/calibre/plugins/3/podofo.so	1175	lib/calibre/calibre/plugins/speedup.so
1166	lib/calibre/calibre/plugins/3/progress_indicator.so	1176	lib/calibre/calibre/plugins/sqlite_custom.so
1167	lib/calibre/calibre/plugins/3/speedup.so	1177	lib/calibre/calibre/plugins/tokenizer.so
1168	lib/calibre/calibre/plugins/3/sqlite_custom.so	1178	lib/calibre/calibre/plugins/unicode_names.so
1169	lib/calibre/calibre/plugins/3/tokenizer.so	1179	lib/calibre/calibre/prints.py
1170	lib/calibre/calibre/plugins/3/unicode_names.so
1171	lib/calibre/calibre/ptempfile.py	1180	lib/calibre/calibre/ptempfile.py
1172	lib/calibre/calibre/rpdb.py	1181	lib/calibre/calibre/rpdb.py
1173	lib/calibre/calibre/spell/__init__.py	1182	lib/calibre/calibre/spell/__init__.py
Lines 1223-1235 lib/calibre/calibre/test_build.py Link Here
1223	lib/calibre/calibre/translations/__init__.py	1232	lib/calibre/calibre/translations/__init__.py
1224	lib/calibre/calibre/translations/dynamic.py	1233	lib/calibre/calibre/translations/dynamic.py
1225	lib/calibre/calibre/translations/msgfmt.py	1234	lib/calibre/calibre/translations/msgfmt.py
1226	lib/calibre/calibre/utils/Zeroconf.py
1227	lib/calibre/calibre/utils/__init__.py	1235	lib/calibre/calibre/utils/__init__.py
1228	lib/calibre/calibre/utils/bibtex.py	1236	lib/calibre/calibre/utils/bibtex.py
1229	lib/calibre/calibre/utils/browser.py	1237	lib/calibre/calibre/utils/browser.py
1230	lib/calibre/calibre/utils/certgen.py	1238	lib/calibre/calibre/utils/certgen.py
1231	lib/calibre/calibre/utils/chm/__init__.py
1232	lib/calibre/calibre/utils/chm/chm.py
1233	lib/calibre/calibre/utils/cleantext.py	1239	lib/calibre/calibre/utils/cleantext.py
1234	lib/calibre/calibre/utils/complete.py	1240	lib/calibre/calibre/utils/complete.py
1235	lib/calibre/calibre/utils/config.py	1241	lib/calibre/calibre/utils/config.py
Lines 1334-1344 lib/calibre/calibre/utils/test_lock.py Link Here
1334	lib/calibre/calibre/utils/text2int.py	1340	lib/calibre/calibre/utils/text2int.py
1335	lib/calibre/calibre/utils/threadpool.py	1341	lib/calibre/calibre/utils/threadpool.py
1336	lib/calibre/calibre/utils/titlecase.py	1342	lib/calibre/calibre/utils/titlecase.py
1337	lib/calibre/calibre/utils/unicode_getpass.py
1338	lib/calibre/calibre/utils/unicode_names.py	1343	lib/calibre/calibre/utils/unicode_names.py
1339	lib/calibre/calibre/utils/unrar.py	1344	lib/calibre/calibre/utils/unrar.py
1340	lib/calibre/calibre/utils/unsmarten.py	1345	lib/calibre/calibre/utils/unsmarten.py
1341	lib/calibre/calibre/utils/windows/__init__.py	1346	lib/calibre/calibre/utils/windows/__init__.py
		1347	lib/calibre/calibre/utils/windows/winsapi.py
1342	lib/calibre/calibre/utils/windows/wintest.py	1348	lib/calibre/calibre/utils/windows/wintest.py
1343	lib/calibre/calibre/utils/winreg/__init__.py	1349	lib/calibre/calibre/utils/winreg/__init__.py
1344	lib/calibre/calibre/utils/winreg/dde.py	1350	lib/calibre/calibre/utils/winreg/dde.py
Lines 1360-1369 lib/calibre/calibre/web/feeds/templates.py Link Here
1360	lib/calibre/calibre/web/fetch/__init__.py	1366	lib/calibre/calibre/web/fetch/__init__.py
1361	lib/calibre/calibre/web/fetch/simple.py	1367	lib/calibre/calibre/web/fetch/simple.py
1362	lib/calibre/calibre/web/fetch/utils.py	1368	lib/calibre/calibre/web/fetch/utils.py
1363	lib/calibre/calibre_lzma/__init__.py
1364	lib/calibre/calibre_lzma/errors.py
1365	lib/calibre/calibre_lzma/lzma1.py
1366	lib/calibre/calibre_lzma/xz.py
1367	lib/calibre/css_selectors/__init__.py	1369	lib/calibre/css_selectors/__init__.py
1368	lib/calibre/css_selectors/errors.py	1370	lib/calibre/css_selectors/errors.py
1369	lib/calibre/css_selectors/ordered_set.py	1371	lib/calibre/css_selectors/ordered_set.py
Lines 1419-1424 lib/calibre/polyglot/reprlib.py Link Here
1419	lib/calibre/polyglot/smtplib.py	1421	lib/calibre/polyglot/smtplib.py
1420	lib/calibre/polyglot/socketserver.py	1422	lib/calibre/polyglot/socketserver.py
1421	lib/calibre/polyglot/urllib.py	1423	lib/calibre/polyglot/urllib.py
		1424	lib/calibre/sgmllib.py
1422	lib/calibre/templite/__init__.py	1425	lib/calibre/templite/__init__.py
1423	lib/calibre/tinycss/__init__.py	1426	lib/calibre/tinycss/__init__.py
1424	lib/calibre/tinycss/color3.py	1427	lib/calibre/tinycss/color3.py
Lines 1451-1456 lib/calibre/tinycss/version.py Link Here
1451	%%DATADIR%%/catalog/section_list_templates.conf	1454	%%DATADIR%%/catalog/section_list_templates.conf
1452	%%DATADIR%%/catalog/stylesheet.css	1455	%%DATADIR%%/catalog/stylesheet.css
1453	%%DATADIR%%/catalog/template.xhtml	1456	%%DATADIR%%/catalog/template.xhtml
		1457	%%DATADIR%%/changelog.json
1454	%%DATADIR%%/content-server/calibre.png	1458	%%DATADIR%%/content-server/calibre.png
1455	%%DATADIR%%/content-server/empty.html	1459	%%DATADIR%%/content-server/empty.html
1456	%%DATADIR%%/content-server/index-generated.html	1460	%%DATADIR%%/content-server/index-generated.html
Lines 1596-1601 lib/calibre/tinycss/version.py Link Here
1596	%%DATADIR%%/images/h-ellipsis.png	1600	%%DATADIR%%/images/h-ellipsis.png
1597	%%DATADIR%%/images/help.png	1601	%%DATADIR%%/images/help.png
1598	%%DATADIR%%/images/heuristics.png	1602	%%DATADIR%%/images/heuristics.png
		1603	%%DATADIR%%/images/highlight.png
1599	%%DATADIR%%/images/highlight_only_off.png	1604	%%DATADIR%%/images/highlight_only_off.png
1600	%%DATADIR%%/images/highlight_only_on.png	1605	%%DATADIR%%/images/highlight_only_on.png
1601	%%DATADIR%%/images/hotmail.png	1606	%%DATADIR%%/images/hotmail.png
Lines 1783-1788 lib/calibre/tinycss/version.py Link Here
1783	%%DATADIR%%/quick_start/fra.epub	1788	%%DATADIR%%/quick_start/fra.epub
1784	%%DATADIR%%/quick_start/ita.epub	1789	%%DATADIR%%/quick_start/ita.epub
1785	%%DATADIR%%/quick_start/swe.epub	1790	%%DATADIR%%/quick_start/swe.epub
		1791	%%DATADIR%%/quick_start/tur.epub
1786	%%DATADIR%%/rapydscript/compiler.js.xz	1792	%%DATADIR%%/rapydscript/compiler.js.xz
1787	%%DATADIR%%/scripts.calibre_msgpack	1793	%%DATADIR%%/scripts.calibre_msgpack
1788	%%DATADIR%%/template-functions.json	1794	%%DATADIR%%/template-functions.json
Lines 1803-1811 lib/calibre/tinycss/version.py Link Here
1803	%%DATADIR%%/viewer.html	1809	%%DATADIR%%/viewer.html
1804	%%DATADIR%%/viewer.js	1810	%%DATADIR%%/viewer.js
1805	%%PYTHON_SITELIBDIR%%/init_calibre.py	1811	%%PYTHON_SITELIBDIR%%/init_calibre.py
1806	share/appdata/calibre-ebook-edit.appdata.xml	1812	share/metainfo/calibre-ebook-edit.metainfo.xml
1807	share/appdata/calibre-ebook-viewer.appdata.xml	1813	share/metainfo/calibre-ebook-viewer.metainfo.xml
1808	share/appdata/calibre-gui.appdata.xml	1814	share/metainfo/calibre-gui.metainfo.xml
1809	share/applications/calibre-ebook-edit.desktop	1815	share/applications/calibre-ebook-edit.desktop
1810	share/applications/calibre-ebook-viewer.desktop	1816	share/applications/calibre-ebook-viewer.desktop
1811	share/applications/calibre-gui.desktop	1817	share/applications/calibre-gui.desktop

Added Link Here

(-)b/deskutils/kaddressbook/files/patch-git-8aee8d40ae2a1c920d3520163d550d3b49720226.diff (+60 lines)
1	Author: Volker Krause <vkrause@kde.org>
2	Date: Sun Oct 25 18:22:58 2020 +0100
3
4	Compile with recent Qt 5.15
5
6	More QPrinter methods got deprecated there. DevicePixel no longer exists
7	as a unit, visually Point looks pretty much the same though.
8
9	diff --git src/printing/compact/compactstyle.cpp src/printing/compact/compactstyle.cpp
10	index d950a963..71e74c0f 100644
11	--- src/printing/compact/compactstyle.cpp
12	+++ src/printing/compact/compactstyle.cpp
13	@@ -168,7 +168,7 @@ void CompactStyle::print(const KContacts::Addressee::List &contacts, PrintProgre
14
15	// print
16	QPrinter *printer = wizard()->printer();
17	- printer->setPageMargins(20, 20, 20, 20, QPrinter::DevicePixel);
18	+ printer->setPageMargins(QMarginsF(20, 20, 20, 20), QPageLayout::Point);
19
20	progress->addMessage(i18n("Setting up document"));
21
22	diff --git src/printing/grantlee/grantleeprintstyle.cpp src/printing/grantlee/grantleeprintstyle.cpp
23	index d7afe8ef..49b5e494 100644
24	--- src/printing/grantlee/grantleeprintstyle.cpp
25	+++ src/printing/grantlee/grantleeprintstyle.cpp
26	@@ -38,7 +38,7 @@ GrantleePrintStyle::~GrantleePrintStyle()
27	void GrantleePrintStyle::print(const KContacts::Addressee::List &contacts, PrintProgress *progress)
28	{
29	QPrinter *printer = wizard()->printer();
30	- printer->setPageMargins(20, 20, 20, 20, QPrinter::DevicePixel);
31	+ printer->setPageMargins(QMarginsF(20, 20, 20, 20), QPageLayout::Point);
32
33	progress->addMessage(i18n("Setting up document"));
34
35	diff --git src/printing/mike/mikesstyle.cpp src/printing/mike/mikesstyle.cpp
36	index 9f698c53..81a4bd6f 100644
37	--- src/printing/mike/mikesstyle.cpp
38	+++ src/printing/mike/mikesstyle.cpp
39	@@ -107,7 +107,7 @@ MikesStyle::~MikesStyle()
40	void MikesStyle::print(const KContacts::Addressee::List &contacts, PrintProgress *progress)
41	{
42	QPrinter *printer = wizard()->printer();
43	- printer->setPageMargins(20, 20, 20, 20, QPrinter::DevicePixel);
44	+ printer->setPageMargins(QMarginsF(20, 20, 20, 20), QPageLayout::Point);
45
46	progress->addMessage(i18n("Setting up document"));
47
48	diff --git src/printing/ringbinder/ringbinderstyle.cpp src/printing/ringbinder/ringbinderstyle.cpp
49	index 60a39c86..5f600d6a 100644
50	--- src/printing/ringbinder/ringbinderstyle.cpp
51	+++ src/printing/ringbinder/ringbinderstyle.cpp
52	@@ -159,7 +159,7 @@ void RingBinderPrintStyle::print(const KContacts::Addressee::List &contacts, Pri
53	config.sync();
54
55	QPrinter *printer = wizard()->printer();
56	- printer->setPageMargins(50, 20, 0, 50, QPrinter::DevicePixel);
57	+ printer->setPageMargins(QMarginsF(50, 20, 0, 50), QPageLayout::Point);
58
59	progress->addMessage(i18n("Setting up document"));
60

Lines 6-21 DISTNAME= ${PORTNAME}-nolang-${DISTVERSION} Link Here

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

Lines 2-21 Link Here

(-)b/devel/libsavitar/Makefile (-3 / +6 lines)
2		2
3	PORTNAME= libSavitar	3	PORTNAME= libSavitar
4	DISTVERSION= 4.5.0	4	DISTVERSION= 4.5.0
5	PORTREVISION= 1	5	PORTREVISION= 2
6	CATEGORIES= devel cad	6	CATEGORIES= devel cad
7	DIST_SUBDIR= Ultimaker	7	DIST_SUBDIR= Ultimaker
8		8
		9	PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
		10	PATCHFILES= 195633cf0c5f.patch:-p1
		11
9	MAINTAINER= db@FreeBSD.org	12	MAINTAINER= db@FreeBSD.org
10	COMMENT= C++ implementation of 3mf loading/python bindings	13	COMMENT= C++ implementation of 3mf loading/python bindings
11		14
12	LICENSE= LGPL3	15	LICENSE= LGPL3
13	LICENSE_FILE= ${WRKSRC}/LICENSE	16	LICENSE_FILE= ${WRKSRC}/LICENSE
14		17
15	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>0:devel/py-sip@${PY_FLAVOR}
16	LIB_DEPENDS= libpugixml.so:textproc/pugixml	18	LIB_DEPENDS= libpugixml.so:textproc/pugixml
17		19
18	USES= cmake compiler:c++11-lang python:3.4+	20	USES= cmake compiler:c++11-lang python:3.5+ pyqt:5
		21	USE_PYQT= sip pysip
19	USE_GITHUB= yes	22	USE_GITHUB= yes
20	GH_ACCOUNT= Ultimaker	23	GH_ACCOUNT= Ultimaker
21	GH_TAGNAME= 96eba0e	24	GH_TAGNAME= 96eba0e

Lines 1-16 Link Here

(-)b/devel/py-qtbuilder/Makefile (-4 / +4 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= qtbuilder	3	PORTNAME= qtbuilder
4	PORTVERSION= 1.4.0 # ${QTBUILDER_VERSION}	4	PORTVERSION= ${PYQTBUILDER_VERSION}
5	CATEGORIES= devel python	5	CATEGORIES= devel python
6	MASTER_SITES= https://pypi.io/packages/source/P/PyQt-builder/ # ${MASTER_SITES_QTBUILDER}	6	MASTER_SITES= ${MASTER_SITES_PYQTBUILDER}
7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
8	DISTNAME= PyQt-builder-${PORTVERSION} # ${QTBUILDER_DISTNAME}	8	DISTNAME= ${PYQTBUILDER_DISTNAME}
9		9
10	MAINTAINER= kde@FreeBSD.org	10	MAINTAINER= kde@FreeBSD.org
11	COMMENT= The PEP 517 compliant PyQt build system	11	COMMENT= The PEP 517 compliant PyQt build system
12		12
13	USES= python	13	USES= python:3.5+ pyqt:5
14	USE_PYTHON= autoplist concurrent distutils flavors py3kplist	14	USE_PYTHON= autoplist concurrent distutils flavors py3kplist
15	USE_PYQT= #	15	USE_PYQT= #
16		16

Lines 12-71 DISTNAME= ${SIP_DISTNAME} Link Here

(-)b/devel/py-sip/Makefile (-54 / +14 lines)
12	MAINTAINER= kde@FreeBSD.org	12	MAINTAINER= kde@FreeBSD.org
13	COMMENT= Python to C and C++ bindings generator	13	COMMENT= Python to C and C++ bindings generator
14		14
15	USES= python pyqt:sip	15	LICENSE= SIP GPLv2 GPLv3
16	USE_PYTHON= concurrent py3kplist flavors	16	LICENSE_COMB= multi
		17	LICENSE_NAME_SIP= SIP License
		18	LICENSE_GROUPS_SIP= FSF GPL OSI
		19	LICENSE_PERMS_SIP= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
		20	LICENSE_FILE_SIP= ${WRKSRC}/LICENSE
		21	LICENSE_FILE_GPLv2= ${WRKSRC}/LICENSE-GPL2
		22	LICENSE_FILE_GPLv3= ${WRKSRC}/LICENSE-GPL3
		23
		24	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}toml>0:textproc/py-toml@${PY_FLAVOR} \
		25	${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR}
		26
		27	USES= python:3.5+ pyqt:sip
		28	USE_PYTHON= autoplist concurrent distutils flavors py3kplist
17	USE_PYQT= #	29	USE_PYQT= #
18		30
19	CONFIGURE_ARGS= -b ${PREFIX}/bin -d ${PYTHONPREFIX_SITELIBDIR} \
20	-e ${PYTHONPREFIX_INCLUDEDIR} -v ${DATADIR} \
21	--sipdir ${PYQT_SIPDIR} \
22	CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \
23	CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
24	INCDIR="${LOCALBASE}/include" LIBDIR="${LOCALBASE}/lib"
25
26	PORTDOCS= *
27
28	OPTIONS_DEFINE= DOCS DEBUG
29	DEBUG_CONFIGURE_ON= --debug
30
31	# From upstreams site:
32	# When building PyQt5 v5.11 or later you must configure SIP to create a
33	# private copy of the sip module using a command line similar to the following:
34	# > python configure.py --sip-module PyQt5.sip --no-tools
35	CONFIGURE_WRKSRC= ${WRKSRC}/default
36	BUILD_WRKSRC= ${CONFIGURE_WRKSRC}
37	INSTALL_WRKSRC= ${CONFIGURE_WRKSRC}
38
39	PYQT_SIPDIR= ${LOCALBASE}/share/PyQt5/${PYTHON_VER}/sip
40
41	do-configure:
42	# The default sip 'flavor'
43	${MKDIR} ${CONFIGURE_WRKSRC} && \
44	cd ${CONFIGURE_WRKSRC} && \
45	${PYTHON_CMD} ${WRKSRC}/configure.py ${CONFIGURE_ARGS} && \
46	${REINPLACE_CMD} -e '/sip_bin.:/s\|'\'',$$\|-${PYTHON_VER}'\'',\|' ${CONFIGURE_WRKSRC}/sipconfig.py
47	# The now needed version for 5.11 (which will be the default from 2019-03-16).
48	${MKDIR} ${WRKSRC}/sip_qt5 && \
49	cd ${WRKSRC}/sip_qt5 && \
50	${PYTHON_CMD} ${WRKSRC}/configure.py ${CONFIGURE_ARGS} --sip-module PyQt5.sip --no-tools && \
51	${REINPLACE_CMD} -e '/sip_bin.:/s\|'\'',$$\|-${PYTHON_VER}'\'',\|' ${WRKSRC}/sip_qt5/sipconfig.py
52
53	post-build:
54	cd ${WRKSRC}/sip_qt5 && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS}
55
56	post-install:
57	${MKDIR} ${STAGEDIR}${DOCSDIR} && cd ${WRKSRC}/doc/html && \
58	${COPYTREE_SHARE} \. ${STAGEDIR}${DOCSDIR}
59	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
60	-f -d ${PYTHONPREFIX_SITELIBDIR} \
61	${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
62	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
63	-f -d ${PYTHONPREFIX_SITELIBDIR} \
64	${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
65	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/sip
66	${STRIP_CMD} ${STAGEDIR}/${PYTHON_SITELIBDIR}/sip.so
67
68	cd ${WRKSRC}/sip_qt5 && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install
69	${STRIP_CMD} ${STAGEDIR}/${PYTHON_SITELIBDIR}/PyQt5/sip.so
70
71	.include <bsd.port.mk>	31	.include <bsd.port.mk>

Lines 1-28 Link Here

(-)b/devel/py-sip/files/patch-siputils.py (-28 lines)
1	sip 4.16.5 has switched the Makefile lines that invoke the moc utility from
2	an invocation with an explicit source file name to "$<".
3
4	This works with GNU make, but not make(1), where it $< evaluates to nothing
5	in this context.
6
7	Switch back to the previous version to avoid having to depend on devel/gmake
8	(figuring out which ports need it is not trivial).
9	--- siputils.py
10	+++ siputils.py
11	@@ -1683,7 +1683,7 @@
12	cpp = "moc_" + root + ".cpp"
13
14	mfile.write("\n%s: %s\n" % (cpp, mf))
15	- mfile.write("\t$(MOC) -o %s $<\n" % cpp)
16	+ mfile.write("\t$(MOC) -o %s %s\n" % (cpp, mf))
17
18	mfile.write("\n$(TARGET): $(OFILES)\n")
19
20	@@ -1980,7 +1980,7 @@
21	mf = os.path.join(self._src_dir, mf)
22
23	mfile.write("\n%s: %s\n" % (cpp, mf))
24	- mfile.write("\t$(MOC) -o %s $<\n" % cpp)
25	+ mfile.write("\t$(MOC) -o %s %s\n" % (cpp, mf))
26
27	mfile.write("\n$(TARGET): $(OFILES)\n")
28

Lines 1-18 Link Here

(-)b/devel/py-sip/pkg-plist (-18 lines)
1	bin/sip
2	%%PYTHON_INCLUDEDIR%%/sip.h
3	%%PYTHON_SITELIBDIR%%/PyQt5/sip.pyi
4	%%PYTHON_SITELIBDIR%%/PyQt5/sip.so
5	%%PYTHON_SITELIBDIR%%/PyQt5_sip-%%PYQT_SIPVERSION%%.dist-info/INSTALLER
6	%%PYTHON_SITELIBDIR%%/PyQt5_sip-%%PYQT_SIPVERSION%%.dist-info/METADATA
7	%%PYTHON_SITELIBDIR%%/PyQt5_sip-%%PYQT_SIPVERSION%%.dist-info/RECORD
8	%%PYTHON_SITELIBDIR%%/sip-%%PYQT_SIPVERSION%%.dist-info/INSTALLER
9	%%PYTHON_SITELIBDIR%%/sip-%%PYQT_SIPVERSION%%.dist-info/METADATA
10	%%PYTHON_SITELIBDIR%%/sip-%%PYQT_SIPVERSION%%.dist-info/RECORD
11	%%PYTHON_SITELIBDIR%%/sip.pyi
12	%%PYTHON_SITELIBDIR%%/sip.so
13	%%PYTHON_SITELIBDIR%%/sipconfig.py
14	%%PYTHON_SITELIBDIR%%/sipconfig.pyc
15	%%PYTHON_SITELIBDIR%%/sipconfig.pyo
16	%%PYTHON_SITELIBDIR%%/sipdistutils.py
17	%%PYTHON_SITELIBDIR%%/sipdistutils.pyc
18	%%PYTHON_SITELIBDIR%%/sipdistutils.pyo

Lines 1-7 Link Here

(-)b/devel/pyside2/Makefile (-1 / +11 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= pyside2	3	PORTNAME= pyside2
4	DISTVERSION= 5.15.1	4	DISTVERSION= 5.15.2
5	CATEGORIES= devel	5	CATEGORIES= devel
6	MASTER_SITES= QT/official_releases/QtForPython/shiboken2/PySide2-${DISTVERSION}-src	6	MASTER_SITES= QT/official_releases/QtForPython/shiboken2/PySide2-${DISTVERSION}-src
7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 43-46 USE_QT+= webengine Link Here
43	PLIST_SUB+= WEBENGINE="@comment "	43	PLIST_SUB+= WEBENGINE="@comment "
44	.endif	44	.endif
45		45
		46	# AVOID a build_fs_violation with poudriere
		47	post-build:
		48	${RM} -r ${PYTHON_SITELIBDIR}/shiboken2/files.dir/shibokensupport/__pycache__
		49	${RM} -r ${PYTHON_SITELIBDIR}/shiboken2/files.dir/shibokensupport/signature/__pycache__
		50	${RM} -r ${PYTHON_SITELIBDIR}/shiboken2/files.dir/shibokensupport/signature/lib/__pycache__
		51	post-stage:
		52	${RM} -r ${PYTHON_SITELIBDIR}/shiboken2/files.dir/shibokensupport/__pycache__
		53	${RM} -r ${PYTHON_SITELIBDIR}/shiboken2/files.dir/shibokensupport/signature/__pycache__
		54	${RM} -r ${PYTHON_SITELIBDIR}/shiboken2/files.dir/shibokensupport/signature/lib/__pycache__
		55
46	.include <bsd.port.post.mk>	56	.include <bsd.port.post.mk>

Lines 1-9 Link Here

(-)b/devel/qt5-assistant/files/patch-src__src.pro (-4 / +5 lines)
1	Only enter the directories we want to build, otherwise we might fail due to	1	Only enter the directories we want to build, otherwise we might fail due to
2	missing dependencies.	2	missing dependencies.
3		3
4	--- src/src.pro.orig 2019-02-14 20:24:23 UTC	4	--- src/src.pro.orig 2020-11-20 20:09:00 UTC
5	+++ src/src.pro	5	+++ src/src.pro
6	@@ -1,54 +1,3 @@	6	@@ -1,55 +1,3 @@
7	TEMPLATE = subdirs	7	TEMPLATE = subdirs
8		8
9	-qtHaveModule(widgets) {	9	-qtHaveModule(widgets) {
Lines 12-21 missing dependencies. Link Here
12	- } else {	12	- } else {
13	- QT_FOR_CONFIG += widgets	13	- QT_FOR_CONFIG += widgets
14	- qtConfig(pushbutton):qtConfig(toolbutton) {	14	- qtConfig(pushbutton):qtConfig(toolbutton) {
15	- SUBDIRS = assistant \	15	- SUBDIRS = designer \
16	- designer \
17	- pixeltool	16	- pixeltool
18	-	17	-
		18	- !static\|contains(QT_PLUGINS, qsqlite): SUBDIRS += assistant
		19	-
19	- linguist.depends = designer	20	- linguist.depends = designer
20	- }	21	- }
21	- qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator	22	- qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator

Lines 1-28 Link Here

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

Lines 1-9 Link Here

(-)b/devel/qt5-designer/files/patch-src__src.pro (-4 / +5 lines)
1	Only enter the directories we want to build, otherwise we might fail due to	1	Only enter the directories we want to build, otherwise we might fail due to
2	missing dependencies.	2	missing dependencies.
3		3
4	--- src/src.pro.orig 2019-02-14 20:38:18 UTC	4	--- src/src.pro.orig 2020-11-20 20:19:40 UTC
5	+++ src/src.pro	5	+++ src/src.pro
6	@@ -1,54 +1,3 @@	6	@@ -1,55 +1,3 @@
7	TEMPLATE = subdirs	7	TEMPLATE = subdirs
8		8
9	-qtHaveModule(widgets) {	9	-qtHaveModule(widgets) {
Lines 12-21 missing dependencies. Link Here
12	- } else {	12	- } else {
13	- QT_FOR_CONFIG += widgets	13	- QT_FOR_CONFIG += widgets
14	- qtConfig(pushbutton):qtConfig(toolbutton) {	14	- qtConfig(pushbutton):qtConfig(toolbutton) {
15	- SUBDIRS = assistant \	15	- SUBDIRS = designer \
16	- designer \
17	- pixeltool	16	- pixeltool
18	-	17	-
		18	- !static\|contains(QT_PLUGINS, qsqlite): SUBDIRS += assistant
		19	-
19	- linguist.depends = designer	20	- linguist.depends = designer
20	- }	21	- }
21	- qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator	22	- qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator

Lines 3-11 missing dependencies. Link Here

(-)b/devel/qt5-help/files/patch-src__assistant__assistant.pro (-3 / +3 lines)
3		3
4	assistant/ is built in devel/qt5-assistant.	4	assistant/ is built in devel/qt5-assistant.
5		5
6	--- src/assistant/assistant.pro.orig 2019-01-15 05:20:10 UTC	6	--- src/assistant/assistant.pro.orig 2020-08-24 09:20:54 UTC
7	+++ src/assistant/assistant.pro	7	+++ src/assistant/assistant.pro
8	@@ -3,7 +3,6 @@ TEMPLATE = subdirs	8	@@ -8,7 +8,6 @@ TEMPLATE = subdirs
9		9
10	SUBDIRS += \	10	SUBDIRS += \
11	help \	11	help \
Lines 13-19 assistant/ is built in devel/qt5-assistant. Link Here
13	qhelpgenerator \	13	qhelpgenerator \
14	qcollectiongenerator	14	qcollectiongenerator
15		15
16	@@ -11,7 +10,6 @@ assistant.depends = help	16	@@ -16,7 +15,6 @@ assistant.depends = help
17	qhelpgenerator.depends = help	17	qhelpgenerator.depends = help
18		18
19	qtNomakeTools( \	19	qtNomakeTools( \

Lines 1-9 Link Here

(-)b/devel/qt5-help/files/patch-src__src.pro (-4 / +5 lines)
1	Only enter the directories we want to build, otherwise we might fail due to	1	Only enter the directories we want to build, otherwise we might fail due to
2	missing dependencies.	2	missing dependencies.
3		3
4	--- src/src.pro.orig 2019-02-14 19:59:04 UTC	4	--- src/src.pro.orig 2020-11-20 20:01:31 UTC
5	+++ src/src.pro	5	+++ src/src.pro
6	@@ -1,54 +1,3 @@	6	@@ -1,55 +1,3 @@
7	TEMPLATE = subdirs	7	TEMPLATE = subdirs
8		8
9	-qtHaveModule(widgets) {	9	-qtHaveModule(widgets) {
Lines 12-21 missing dependencies. Link Here
12	- } else {	12	- } else {
13	- QT_FOR_CONFIG += widgets	13	- QT_FOR_CONFIG += widgets
14	- qtConfig(pushbutton):qtConfig(toolbutton) {	14	- qtConfig(pushbutton):qtConfig(toolbutton) {
15	- SUBDIRS = assistant \	15	- SUBDIRS = designer \
16	- designer \
17	- pixeltool	16	- pixeltool
18	-	17	-
		18	- !static\|contains(QT_PLUGINS, qsqlite): SUBDIRS += assistant
		19	-
19	- linguist.depends = designer	20	- linguist.depends = designer
20	- }	21	- }
21	- qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator	22	- qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator

Lines 1-9 Link Here

(-)b/devel/qt5-linguist/files/patch-src__src.pro (-4 / +5 lines)
1	Only enter the directories we want to build, otherwise we might fail due to	1	Only enter the directories we want to build, otherwise we might fail due to
2	missing dependencies.	2	missing dependencies.
3		3
4	--- src/src.pro.orig 2019-02-14 20:52:15 UTC	4	--- src/src.pro.orig 2020-11-21 06:11:19 UTC
5	+++ src/src.pro	5	+++ src/src.pro
6	@@ -1,54 +1,3 @@	6	@@ -1,55 +1,3 @@
7	TEMPLATE = subdirs	7	TEMPLATE = subdirs
8		8
9	-qtHaveModule(widgets) {	9	-qtHaveModule(widgets) {
Lines 12-21 missing dependencies. Link Here
12	- } else {	12	- } else {
13	- QT_FOR_CONFIG += widgets	13	- QT_FOR_CONFIG += widgets
14	- qtConfig(pushbutton):qtConfig(toolbutton) {	14	- qtConfig(pushbutton):qtConfig(toolbutton) {
15	- SUBDIRS = assistant \	15	- SUBDIRS = designer \
16	- designer \
17	- pixeltool	16	- pixeltool
18	-	17	-
		18	- !static\|contains(QT_PLUGINS, qsqlite): SUBDIRS += assistant
		19	-
19	- linguist.depends = designer	20	- linguist.depends = designer
20	- }	21	- }
21	- qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator	22	- qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator

Lines 1-9 Link Here

(-)b/devel/qt5-linguisttools/files/patch-src__src.pro (-4 / +5 lines)
1	Only enter the directories we want to build, otherwise we might fail due to	1	Only enter the directories we want to build, otherwise we might fail due to
2	missing dependencies.	2	missing dependencies.
3		3
4	--- src/src.pro.orig 2019-02-14 20:23:20 UTC	4	--- src/src.pro.orig 2020-11-20 20:18:27 UTC
5	+++ src/src.pro	5	+++ src/src.pro
6	@@ -1,54 +1,3 @@	6	@@ -1,55 +1,3 @@
7	TEMPLATE = subdirs	7	TEMPLATE = subdirs
8		8
9	-qtHaveModule(widgets) {	9	-qtHaveModule(widgets) {
Lines 12-21 missing dependencies. Link Here
12	- } else {	12	- } else {
13	- QT_FOR_CONFIG += widgets	13	- QT_FOR_CONFIG += widgets
14	- qtConfig(pushbutton):qtConfig(toolbutton) {	14	- qtConfig(pushbutton):qtConfig(toolbutton) {
15	- SUBDIRS = assistant \	15	- SUBDIRS = designer \
16	- designer \
17	- pixeltool	16	- pixeltool
18	-	17	-
		18	- !static\|contains(QT_PLUGINS, qsqlite): SUBDIRS += assistant
		19	-
19	- linguist.depends = designer	20	- linguist.depends = designer
20	- }	21	- }
21	- qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator	22	- qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator

Lines 1-9 Link Here

(-)b/devel/qt5-qdbus/files/patch-src_src.pro (-5 / +7 lines)
1	Only enter the directories we want to build, otherwise we might fail due to	1	Only enter the directories we want to build, otherwise we might fail due to
2	missing dependencies	2	missing dependencies
3		3
4	--- src/src.pro.orig 2019-02-14 19:41:39 UTC	4	--- src/src.pro.orig 2020-11-20 20:10:45 UTC
5	+++ src/src.pro	5	+++ src/src.pro
6	@@ -1,54 +1,3 @@	6	@@ -1,55 +1,3 @@
7	TEMPLATE = subdirs	7	TEMPLATE = subdirs
8		8
9	-qtHaveModule(widgets) {	9	-qtHaveModule(widgets) {
Lines 12-21 missing dependencies Link Here
12	- } else {	12	- } else {
13	- QT_FOR_CONFIG += widgets	13	- QT_FOR_CONFIG += widgets
14	- qtConfig(pushbutton):qtConfig(toolbutton) {	14	- qtConfig(pushbutton):qtConfig(toolbutton) {
15	- SUBDIRS = assistant \	15	- SUBDIRS = designer \
16	- designer \
17	- pixeltool	16	- pixeltool
18	-	17	-
		18	- !static\|contains(QT_PLUGINS, qsqlite): SUBDIRS += assistant
		19	-
19	- linguist.depends = designer	20	- linguist.depends = designer
20	- }	21	- }
21	- qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator	22	- qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator
Lines 39-45 missing dependencies Link Here
39	- SUBDIRS += macdeployqt	40	- SUBDIRS += macdeployqt
40	-}	41	-}
41	-	42	-
42	qtHaveModule(dbus): SUBDIRS += qdbus	43	-qtHaveModule(dbus): SUBDIRS += qdbus
43	-	44	-
44	-win32\|winrt:SUBDIRS += windeployqt	45	-win32\|winrt:SUBDIRS += windeployqt
45	-winrt:SUBDIRS += winrtrunner	46	-winrt:SUBDIRS += winrtrunner
Lines 58-60 missing dependencies Link Here
58	- winrtrunner.depends += qtattributionsscanner	59	- winrtrunner.depends += qtattributionsscanner
59	- linguist.depends += qtattributionsscanner	60	- linguist.depends += qtattributionsscanner
60	-}	61	-}
		62	+SUBDIRS += qdbus

Lines 1-9 Link Here

(-)b/devel/qt5-qdbusviewer/files/patch-src__src.pro (-5 / +7 lines)
1	Only enter the directories we want to build, otherwise we might fail due to	1	Only enter the directories we want to build, otherwise we might fail due to
2	missing dependencies.	2	missing dependencies.
3		3
4	--- src/src.pro.orig 2019-02-14 20:02:00 UTC	4	--- src/src.pro.orig 2020-11-20 20:04:42 UTC
5	+++ src/src.pro	5	+++ src/src.pro
6	@@ -1,54 +1,3 @@	6	@@ -1,55 +1,3 @@
7	TEMPLATE = subdirs	7	TEMPLATE = subdirs
8		8
9	-qtHaveModule(widgets) {	9	-qtHaveModule(widgets) {
Lines 12-21 missing dependencies. Link Here
12	- } else {	12	- } else {
13	- QT_FOR_CONFIG += widgets	13	- QT_FOR_CONFIG += widgets
14	- qtConfig(pushbutton):qtConfig(toolbutton) {	14	- qtConfig(pushbutton):qtConfig(toolbutton) {
15	- SUBDIRS = assistant \	15	- SUBDIRS = designer \
16	- designer \
17	- pixeltool	16	- pixeltool
18	-	17	-
		18	- !static\|contains(QT_PLUGINS, qsqlite): SUBDIRS += assistant
		19	-
19	- linguist.depends = designer	20	- linguist.depends = designer
20	- }	21	- }
21	- qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator	22	- qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator
Lines 39-45 missing dependencies. Link Here
39	- SUBDIRS += macdeployqt	40	- SUBDIRS += macdeployqt
40	-}	41	-}
41	-	42	-
42	qtHaveModule(dbus): SUBDIRS += qdbus	43	-qtHaveModule(dbus): SUBDIRS += qdbus
43	-	44	-
44	-win32\|winrt:SUBDIRS += windeployqt	45	-win32\|winrt:SUBDIRS += windeployqt
45	-winrt:SUBDIRS += winrtrunner	46	-winrt:SUBDIRS += winrtrunner
Lines 58-60 missing dependencies. Link Here
58	- winrtrunner.depends += qtattributionsscanner	59	- winrtrunner.depends += qtattributionsscanner
59	- linguist.depends += qtattributionsscanner	60	- linguist.depends += qtattributionsscanner
60	-}	61	-}
		62	+SUBDIRS = qdbus

Lines 1-9 Link Here

(-)b/devel/qt5-qdoc/files/patch-src_src.pro (-4 / +5 lines)
1	Only enter the directories we want to build, otherwise we might fail due to	1	Only enter the directories we want to build, otherwise we might fail due to
2	missing dependencies.	2	missing dependencies.
3		3
4	--- src/src.pro.orig 2019-02-14 20:14:11 UTC	4	--- src/src.pro.orig 2020-11-20 20:20:35 UTC
5	+++ src/src.pro	5	+++ src/src.pro
6	@@ -1,54 +1,5 @@	6	@@ -1,55 +1,5 @@
7	TEMPLATE = subdirs	7	TEMPLATE = subdirs
8		8
9	-qtHaveModule(widgets) {	9	-qtHaveModule(widgets) {
Lines 12-21 missing dependencies. Link Here
12	- } else {	12	- } else {
13	- QT_FOR_CONFIG += widgets	13	- QT_FOR_CONFIG += widgets
14	- qtConfig(pushbutton):qtConfig(toolbutton) {	14	- qtConfig(pushbutton):qtConfig(toolbutton) {
15	- SUBDIRS = assistant \	15	- SUBDIRS = designer \
16	- designer \
17	- pixeltool	16	- pixeltool
18	-	17	-
		18	- !static\|contains(QT_PLUGINS, qsqlite): SUBDIRS += assistant
		19	-
19	- linguist.depends = designer	20	- linguist.depends = designer
20	- }	21	- }
21	- qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator	22	- qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator

Lines 1-9 Link Here

(-)b/devel/qt5-uitools/files/patch-src__src.pro (-4 / +5 lines)
1	Only enter the directories we want to build, otherwise we might fail due to	1	Only enter the directories we want to build, otherwise we might fail due to
2	missing dependencies.	2	missing dependencies.
3		3
4	--- src/src.pro.orig 2019-02-14 20:09:32 UTC	4	--- src/src.pro.orig 2020-11-20 20:09:40 UTC
5	+++ src/src.pro	5	+++ src/src.pro
6	@@ -1,54 +1,3 @@	6	@@ -1,55 +1,3 @@
7	TEMPLATE = subdirs	7	TEMPLATE = subdirs
8		8
9	-qtHaveModule(widgets) {	9	-qtHaveModule(widgets) {
Lines 12-21 missing dependencies. Link Here
12	- } else {	12	- } else {
13	- QT_FOR_CONFIG += widgets	13	- QT_FOR_CONFIG += widgets
14	- qtConfig(pushbutton):qtConfig(toolbutton) {	14	- qtConfig(pushbutton):qtConfig(toolbutton) {
15	- SUBDIRS = assistant \	15	- SUBDIRS = designer \
16	- designer \
17	- pixeltool	16	- pixeltool
18	-	17	-
		18	- !static\|contains(QT_PLUGINS, qsqlite): SUBDIRS += assistant
		19	-
19	- linguist.depends = designer	20	- linguist.depends = designer
20	- }	21	- }
21	- qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator	22	- qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator

Lines 1-85 Link Here

(-)b/devel/qt5/distinfo (-85 / +85 lines)
1	TIMESTAMP = 1595426464	1	TIMESTAMP = 1605899522
2	SHA256 (KDE/Qt/5.15.0/qt3d-everywhere-src-5.15.0.tar.xz) = 61856f0c453b79e98b7a1e65ea8f59976fa78230ffa8dec959b5f4b45383dffd	2	SHA256 (KDE/Qt/5.15.2/qt3d-everywhere-src-5.15.2.tar.xz) = 03ed6a48c813c75296c19f5d721184ab168280b69d2656cf16f877d3d4c55c1d
3	SIZE (KDE/Qt/5.15.0/qt3d-everywhere-src-5.15.0.tar.xz) = 81921676	3	SIZE (KDE/Qt/5.15.2/qt3d-everywhere-src-5.15.2.tar.xz) = 81925416
4	SHA256 (KDE/Qt/5.15.0/qtactiveqt-everywhere-src-5.15.0.tar.xz) = 1b455eacfb9ef49912d7a79040ea409a6ab88dfa192d313e6b5e02a79d741b51	4	SHA256 (KDE/Qt/5.15.2/qtactiveqt-everywhere-src-5.15.2.tar.xz) = 868161fee0876d17079cd5bed58d1667bf19ffd0018cbe515129f11510ad2a5c
5	SIZE (KDE/Qt/5.15.0/qtactiveqt-everywhere-src-5.15.0.tar.xz) = 267788	5	SIZE (KDE/Qt/5.15.2/qtactiveqt-everywhere-src-5.15.2.tar.xz) = 268380
6	SHA256 (KDE/Qt/5.15.0/qtandroidextras-everywhere-src-5.15.0.tar.xz) = c9019185221e94e37e250c84acaebfb7b2f5342e8ad60cdcff052ac2b85ec671	6	SHA256 (KDE/Qt/5.15.2/qtandroidextras-everywhere-src-5.15.2.tar.xz) = 5813278690d89a9c232eccf697fc280034de6f9f02a7c40d95ad5fcf8ac8dabd
7	SIZE (KDE/Qt/5.15.0/qtandroidextras-everywhere-src-5.15.0.tar.xz) = 183492	7	SIZE (KDE/Qt/5.15.2/qtandroidextras-everywhere-src-5.15.2.tar.xz) = 276344
8	SHA256 (KDE/Qt/5.15.0/qtbase-everywhere-src-5.15.0.tar.xz) = 9e7af10aece15fa9500369efde69cb220eee8ec3a6818afe01ce1e7d484824c5	8	SHA256 (KDE/Qt/5.15.2/qtbase-everywhere-src-5.15.2.tar.xz) = 909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8
9	SIZE (KDE/Qt/5.15.0/qtbase-everywhere-src-5.15.0.tar.xz) = 49931940	9	SIZE (KDE/Qt/5.15.2/qtbase-everywhere-src-5.15.2.tar.xz) = 50179672
10	SHA256 (KDE/Qt/5.15.0/qtcharts-everywhere-src-5.15.0.tar.xz) = 44a24fc16abcaf9ae97ecf3215f6f3b44ebdb3b73bcb4ed3549a51519e4883a7	10	SHA256 (KDE/Qt/5.15.2/qtcharts-everywhere-src-5.15.2.tar.xz) = e0750e4195bd8a8b9758ab4d98d437edbe273cd3d289dd6a8f325df6d13f3d11
11	SIZE (KDE/Qt/5.15.0/qtcharts-everywhere-src-5.15.0.tar.xz) = 4250568	11	SIZE (KDE/Qt/5.15.2/qtcharts-everywhere-src-5.15.2.tar.xz) = 4251992
12	SHA256 (KDE/Qt/5.15.0/qtconnectivity-everywhere-src-5.15.0.tar.xz) = f911fb8f8bf3a9958785d0378d25ced8989047938b7138d619854a94fa0b27dd	12	SHA256 (KDE/Qt/5.15.2/qtconnectivity-everywhere-src-5.15.2.tar.xz) = 0380327871f76103e5b8c2a305988d76d352b6a982b3e7b3bc3cdc184c64bfa0
13	SIZE (KDE/Qt/5.15.0/qtconnectivity-everywhere-src-5.15.0.tar.xz) = 2803792	13	SIZE (KDE/Qt/5.15.2/qtconnectivity-everywhere-src-5.15.2.tar.xz) = 2815492
14	SHA256 (KDE/Qt/5.15.0/qtdatavis3d-everywhere-src-5.15.0.tar.xz) = 8f07747f371f7c515c667240a795105c89aa83c08d88ee92fa1ef7efccea10a3	14	SHA256 (KDE/Qt/5.15.2/qtdatavis3d-everywhere-src-5.15.2.tar.xz) = 226a6575d573ad78aca459709722c496c23aee526aa0c38eb7c93b0bea1eb6fd
15	SIZE (KDE/Qt/5.15.0/qtdatavis3d-everywhere-src-5.15.0.tar.xz) = 5190804	15	SIZE (KDE/Qt/5.15.2/qtdatavis3d-everywhere-src-5.15.2.tar.xz) = 5191436
16	SHA256 (KDE/Qt/5.15.0/qtdeclarative-everywhere-src-5.15.0.tar.xz) = 9c3c93fb7d340b2f7d738d12408c047318c78973cb45bfc5ff6b3a57e1fef699	16	SHA256 (KDE/Qt/5.15.2/qtdeclarative-everywhere-src-5.15.2.tar.xz) = c600d09716940f75d684f61c5bdaced797f623a86db1627da599027f6c635651
17	SIZE (KDE/Qt/5.15.0/qtdeclarative-everywhere-src-5.15.0.tar.xz) = 21493268	17	SIZE (KDE/Qt/5.15.2/qtdeclarative-everywhere-src-5.15.2.tar.xz) = 21559880
18	SHA256 (KDE/Qt/5.15.0/qtdoc-everywhere-src-5.15.0.tar.xz) = 07ca8db98c317f25cc9a041c48a6824baf63893bf5b535d6f8d266dea8c7659f	18	SHA256 (KDE/Qt/5.15.2/qtdoc-everywhere-src-5.15.2.tar.xz) = a47809f00f1bd690ca4e699cb32ffe7717d43da84e0167d1f562210da7714ce4
19	SIZE (KDE/Qt/5.15.0/qtdoc-everywhere-src-5.15.0.tar.xz) = 5742500	19	SIZE (KDE/Qt/5.15.2/qtdoc-everywhere-src-5.15.2.tar.xz) = 5746492
20	SHA256 (KDE/Qt/5.15.0/qtgamepad-everywhere-src-5.15.0.tar.xz) = dda54d9f90897944bed5e6af48a904a677fd97eb6f57ab08a2b232c431caf31a	20	SHA256 (KDE/Qt/5.15.2/qtgamepad-everywhere-src-5.15.2.tar.xz) = c77611f7898326d69176ad67a9b886f617cdedc368ec29f223d63537d25b075c
21	SIZE (KDE/Qt/5.15.0/qtgamepad-everywhere-src-5.15.0.tar.xz) = 386724	21	SIZE (KDE/Qt/5.15.2/qtgamepad-everywhere-src-5.15.2.tar.xz) = 387084
22	SHA256 (KDE/Qt/5.15.0/qtgraphicaleffects-everywhere-src-5.15.0.tar.xz) = 0d2ea4bc73b9df13a4b739dcbc1e3c7b298c7e682f7f9252b232e3bde7b63eda	22	SHA256 (KDE/Qt/5.15.2/qtgraphicaleffects-everywhere-src-5.15.2.tar.xz) = ec8d67f64967d5046410490b549c576f9b9e8b47ec68594ae84aa8870173dfe4
23	SIZE (KDE/Qt/5.15.0/qtgraphicaleffects-everywhere-src-5.15.0.tar.xz) = 14040716	23	SIZE (KDE/Qt/5.15.2/qtgraphicaleffects-everywhere-src-5.15.2.tar.xz) = 14040900
24	SHA256 (KDE/Qt/5.15.0/qtimageformats-everywhere-src-5.15.0.tar.xz) = 83f32101b1a898fcb8ed6f11a657d1125484ac0c2223014b61849d9010efebc8	24	SHA256 (KDE/Qt/5.15.2/qtimageformats-everywhere-src-5.15.2.tar.xz) = bf8285c7ce04284527ab823ddc7cf48a1bb79131db3a7127342167f4814253d7
25	SIZE (KDE/Qt/5.15.0/qtimageformats-everywhere-src-5.15.0.tar.xz) = 1811092	25	SIZE (KDE/Qt/5.15.2/qtimageformats-everywhere-src-5.15.2.tar.xz) = 1806740
26	SHA256 (KDE/Qt/5.15.0/qtlocation-everywhere-src-5.15.0.tar.xz) = c68b0778a521e5522641c41b1778999dd408ebfda1e0de166a83743268be5f3f	26	SHA256 (KDE/Qt/5.15.2/qtlocation-everywhere-src-5.15.2.tar.xz) = 984fcb09e108df49a8dac35d5ce6dffc49caafd2acb1c2f8a5173a6a21f392a0
27	SIZE (KDE/Qt/5.15.0/qtlocation-everywhere-src-5.15.0.tar.xz) = 6542152	27	SIZE (KDE/Qt/5.15.2/qtlocation-everywhere-src-5.15.2.tar.xz) = 6556764
28	SHA256 (KDE/Qt/5.15.0/qtlottie-everywhere-src-5.15.0.tar.xz) = 2053f474dcd7184fdcae2507f47af6527f6ca25b4424483f9265853c3626c833	28	SHA256 (KDE/Qt/5.15.2/qtlottie-everywhere-src-5.15.2.tar.xz) = cec6095ab8f714e609d2ad3ea8c4fd819461ce8793adc42abe37d0f6dc432517
29	SIZE (KDE/Qt/5.15.0/qtlottie-everywhere-src-5.15.0.tar.xz) = 82384	29	SIZE (KDE/Qt/5.15.2/qtlottie-everywhere-src-5.15.2.tar.xz) = 82424
30	SHA256 (KDE/Qt/5.15.0/qtmacextras-everywhere-src-5.15.0.tar.xz) = 95a8c35b30373224cdd6d1ca0bdda1a314b20e91551a4824e8ca7e50ce8ff439	30	SHA256 (KDE/Qt/5.15.2/qtmacextras-everywhere-src-5.15.2.tar.xz) = 6959b0f2cec71cd66800f36cab797430860e55fa33c9c23698d6a08fc2b8776e
31	SIZE (KDE/Qt/5.15.0/qtmacextras-everywhere-src-5.15.0.tar.xz) = 69248	31	SIZE (KDE/Qt/5.15.2/qtmacextras-everywhere-src-5.15.2.tar.xz) = 69484
32	SHA256 (KDE/Qt/5.15.0/qtmultimedia-everywhere-src-5.15.0.tar.xz) = 0708d867697f392dd3600c5c1c88f5c61b772a5250a4d059dca67b844af0fbd7	32	SHA256 (KDE/Qt/5.15.2/qtmultimedia-everywhere-src-5.15.2.tar.xz) = 0c3758810e5131aabcf76e4965e4c18b8911af54d9edd9305d2a8278d8346df5
33	SIZE (KDE/Qt/5.15.0/qtmultimedia-everywhere-src-5.15.0.tar.xz) = 3796364	33	SIZE (KDE/Qt/5.15.2/qtmultimedia-everywhere-src-5.15.2.tar.xz) = 3828172
34	SHA256 (KDE/Qt/5.15.0/qtnetworkauth-everywhere-src-5.15.0.tar.xz) = 96c6107f6e85662a05f114c5b9bd3503a3100bd940e1494c73a99e77f9e7cf85	34	SHA256 (KDE/Qt/5.15.2/qtnetworkauth-everywhere-src-5.15.2.tar.xz) = fcc2ec42faa68561efa8f00cd72e662fbc06563ebc6de1dc42d96bb2997acd85
35	SIZE (KDE/Qt/5.15.0/qtnetworkauth-everywhere-src-5.15.0.tar.xz) = 141360	35	SIZE (KDE/Qt/5.15.2/qtnetworkauth-everywhere-src-5.15.2.tar.xz) = 141688
36	SHA256 (KDE/Qt/5.15.0/qtpurchasing-everywhere-src-5.15.0.tar.xz) = 2127f180c4889055d88e2b402b62be80a5a213a0e48d2056cc9a01d9913b3a16	36	SHA256 (KDE/Qt/5.15.2/qtpurchasing-everywhere-src-5.15.2.tar.xz) = 87120d319ff2f8106e78971f7296d72a66dfe91e763d213199aea55046e93227
37	SIZE (KDE/Qt/5.15.0/qtpurchasing-everywhere-src-5.15.0.tar.xz) = 208560	37	SIZE (KDE/Qt/5.15.2/qtpurchasing-everywhere-src-5.15.2.tar.xz) = 208804
38	SHA256 (KDE/Qt/5.15.0/qtquick3d-everywhere-src-5.15.0.tar.xz) = 6d3b91b653ba5e33fd5b37cd785ded6cf1dd83d35250c3addb77eb35f90e52cb	38	SHA256 (KDE/Qt/5.15.2/qtquick3d-everywhere-src-5.15.2.tar.xz) = 5b0546323365ce34e4716f22f305ebb4902e222c1a0910b65ee448443c2f94bb
39	SIZE (KDE/Qt/5.15.0/qtquick3d-everywhere-src-5.15.0.tar.xz) = 67824160	39	SIZE (KDE/Qt/5.15.2/qtquick3d-everywhere-src-5.15.2.tar.xz) = 55767288
40	SHA256 (KDE/Qt/5.15.0/qtquickcontrols-everywhere-src-5.15.0.tar.xz) = 7072cf4cd27e9f18b36b1c48dec7c79608cf87ba847d3fc3de133f220ec1acee	40	SHA256 (KDE/Qt/5.15.2/qtquickcontrols-everywhere-src-5.15.2.tar.xz) = c393fb7384b1f047f10e91a6832cf3e6a4c2a41408b8cb2d05af2283e8549fb5
41	SIZE (KDE/Qt/5.15.0/qtquickcontrols-everywhere-src-5.15.0.tar.xz) = 5981340	41	SIZE (KDE/Qt/5.15.2/qtquickcontrols-everywhere-src-5.15.2.tar.xz) = 5982344
42	SHA256 (KDE/Qt/5.15.0/qtquickcontrols2-everywhere-src-5.15.0.tar.xz) = 839abda9b58cd8656b2e5f46afbb484e63df466481ace43318c4c2022684648f	42	SHA256 (KDE/Qt/5.15.2/qtquickcontrols2-everywhere-src-5.15.2.tar.xz) = 671b6ce5f4b8ecc94db622d5d5fb29ef4ff92819be08e5ea55bfcab579de8919
43	SIZE (KDE/Qt/5.15.0/qtquickcontrols2-everywhere-src-5.15.0.tar.xz) = 8164236	43	SIZE (KDE/Qt/5.15.2/qtquickcontrols2-everywhere-src-5.15.2.tar.xz) = 8284692
44	SHA256 (KDE/Qt/5.15.0/qtquicktimeline-everywhere-src-5.15.0.tar.xz) = 16ffeb733ba15815121fca5705ed5220ce0a0eb2ec0431ad0d55da9426a03c00	44	SHA256 (KDE/Qt/5.15.2/qtquicktimeline-everywhere-src-5.15.2.tar.xz) = b9c247227607437acec7c7dd18ad46179d20369c9d22bdb1e9fc128dfb832a28
45	SIZE (KDE/Qt/5.15.0/qtquicktimeline-everywhere-src-5.15.0.tar.xz) = 102460	45	SIZE (KDE/Qt/5.15.2/qtquicktimeline-everywhere-src-5.15.2.tar.xz) = 102624
46	SHA256 (KDE/Qt/5.15.0/qtremoteobjects-everywhere-src-5.15.0.tar.xz) = 86fcfdce77f13c7babdec4dc1d0c4b7b6b02e40120a4250dc59e911c53c08abf	46	SHA256 (KDE/Qt/5.15.2/qtremoteobjects-everywhere-src-5.15.2.tar.xz) = 6781b6bc90888254ea77ce812736dac00c67fa4eeb3095f5cd65e4b9c15dcfc2
47	SIZE (KDE/Qt/5.15.0/qtremoteobjects-everywhere-src-5.15.0.tar.xz) = 369100	47	SIZE (KDE/Qt/5.15.2/qtremoteobjects-everywhere-src-5.15.2.tar.xz) = 374740
48	SHA256 (KDE/Qt/5.15.0/qtscript-everywhere-src-5.15.0.tar.xz) = 02dc21b309621876a89671be27cea86a58e74a96aa28da65fe1b37a3aad29373	48	SHA256 (KDE/Qt/5.15.2/qtscript-everywhere-src-5.15.2.tar.xz) = a299715369afbd1caa4d7fa2875d442eab91adcaacafce54a36922442624673e
49	SIZE (KDE/Qt/5.15.0/qtscript-everywhere-src-5.15.0.tar.xz) = 2654416	49	SIZE (KDE/Qt/5.15.2/qtscript-everywhere-src-5.15.2.tar.xz) = 2663016
50	SHA256 (KDE/Qt/5.15.0/qtscxml-everywhere-src-5.15.0.tar.xz) = 9c3a72bf5ebd07553b0049cc1943f04cff93b7e53bde8c81d652422dbf12ff72	50	SHA256 (KDE/Qt/5.15.2/qtscxml-everywhere-src-5.15.2.tar.xz) = 60b9590b9a41c60cee7b8a8c8410ee4625f0389c1ff8d79883ec5a985638a7dc
51	SIZE (KDE/Qt/5.15.0/qtscxml-everywhere-src-5.15.0.tar.xz) = 433368	51	SIZE (KDE/Qt/5.15.2/qtscxml-everywhere-src-5.15.2.tar.xz) = 434204
52	SHA256 (KDE/Qt/5.15.0/qtsensors-everywhere-src-5.15.0.tar.xz) = 12b17ed6cbe6c49c8ab71958bc5d8ad1c42bf20e2fa72613ede11001e98144da	52	SHA256 (KDE/Qt/5.15.2/qtsensors-everywhere-src-5.15.2.tar.xz) = 3f0011f9e9942cad119146b54d960438f4568a22a274cdad4fae06bb4e0e4839
53	SIZE (KDE/Qt/5.15.0/qtsensors-everywhere-src-5.15.0.tar.xz) = 2050404	53	SIZE (KDE/Qt/5.15.2/qtsensors-everywhere-src-5.15.2.tar.xz) = 2056944
54	SHA256 (KDE/Qt/5.15.0/qtserialbus-everywhere-src-5.15.0.tar.xz) = cee067c84d025e221b83d109b58ea16c4d2dc0af0aea45cc6724acd33a1b7379	54	SHA256 (KDE/Qt/5.15.2/qtserialbus-everywhere-src-5.15.2.tar.xz) = aeeb7e5c0d3f8503215b22e1a84c0002ca67cf63862f6e3c6ef44a67ca31bd88
55	SIZE (KDE/Qt/5.15.0/qtserialbus-everywhere-src-5.15.0.tar.xz) = 351232	55	SIZE (KDE/Qt/5.15.2/qtserialbus-everywhere-src-5.15.2.tar.xz) = 356360
56	SHA256 (KDE/Qt/5.15.0/qtserialport-everywhere-src-5.15.0.tar.xz) = ba19369069a707dffddca8d9c477bb2bb4aa26630dfee6792254c4bf9bd57a67	56	SHA256 (KDE/Qt/5.15.2/qtserialport-everywhere-src-5.15.2.tar.xz) = 59c559d748417306bc1b2cf2315c1e63eed011ace38ad92946af71f23e2ef79d
57	SIZE (KDE/Qt/5.15.0/qtserialport-everywhere-src-5.15.0.tar.xz) = 316596	57	SIZE (KDE/Qt/5.15.2/qtserialport-everywhere-src-5.15.2.tar.xz) = 321496
58	SHA256 (KDE/Qt/5.15.0/qtspeech-everywhere-src-5.15.0.tar.xz) = 7219a878c14a24d0ca18d52df1717361b13aee96ac9790baf9ad2b383492dd61	58	SHA256 (KDE/Qt/5.15.2/qtspeech-everywhere-src-5.15.2.tar.xz) = c810fb9eecb08026434422a32e79269627f3bc2941be199e86ec410bdfe883f5
59	SIZE (KDE/Qt/5.15.0/qtspeech-everywhere-src-5.15.0.tar.xz) = 101240	59	SIZE (KDE/Qt/5.15.2/qtspeech-everywhere-src-5.15.2.tar.xz) = 101940
60	SHA256 (KDE/Qt/5.15.0/qtsvg-everywhere-src-5.15.0.tar.xz) = ee4d287e2e205ca8c08921b9cbe0fc58bf46be080b5359ad4d7fbdee44aeee0d	60	SHA256 (KDE/Qt/5.15.2/qtsvg-everywhere-src-5.15.2.tar.xz) = 8bc3c2c1bc2671e9c67d4205589a8309b57903721ad14c60ea21a5d06acb585e
61	SIZE (KDE/Qt/5.15.0/qtsvg-everywhere-src-5.15.0.tar.xz) = 1870588	61	SIZE (KDE/Qt/5.15.2/qtsvg-everywhere-src-5.15.2.tar.xz) = 1886268
62	SHA256 (KDE/Qt/5.15.0/qttools-everywhere-src-5.15.0.tar.xz) = ddbcb49aab3a2e3672582c6e2e7bec0058feff790f67472343c79e2895e0e437	62	SHA256 (KDE/Qt/5.15.2/qttools-everywhere-src-5.15.2.tar.xz) = c189d0ce1ff7c739db9a3ace52ac3e24cb8fd6dbf234e49f075249b38f43c1cc
63	SIZE (KDE/Qt/5.15.0/qttools-everywhere-src-5.15.0.tar.xz) = 8850752	63	SIZE (KDE/Qt/5.15.2/qttools-everywhere-src-5.15.2.tar.xz) = 8894728
64	SHA256 (KDE/Qt/5.15.0/qttranslations-everywhere-src-5.15.0.tar.xz) = 45c43268d9df50784d4d8ca345fce9288a1055fd074ac0ef508097f7aeba22fe	64	SHA256 (KDE/Qt/5.15.2/qttranslations-everywhere-src-5.15.2.tar.xz) = d5788e86257b21d5323f1efd94376a213e091d1e5e03b45a95dd052b5f570db8
65	SIZE (KDE/Qt/5.15.0/qttranslations-everywhere-src-5.15.0.tar.xz) = 1356928	65	SIZE (KDE/Qt/5.15.2/qttranslations-everywhere-src-5.15.2.tar.xz) = 1419504
66	SHA256 (KDE/Qt/5.15.0/qtvirtualkeyboard-everywhere-src-5.15.0.tar.xz) = f22f9204ab65578d9c8aa832a8a39108f826e00a7d391c7884ff490c587f34be	66	SHA256 (KDE/Qt/5.15.2/qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz) = 9a3193913be30f09a896e3b8c2f9696d2e9b3f88a63ae9ca8c97a2786b68cf55
67	SIZE (KDE/Qt/5.15.0/qtvirtualkeyboard-everywhere-src-5.15.0.tar.xz) = 10957752	67	SIZE (KDE/Qt/5.15.2/qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz) = 10955076
68	SHA256 (KDE/Qt/5.15.0/qtwayland-everywhere-src-5.15.0.tar.xz) = 084133e10bfbd32a28125639660c59975f23457bba6a79b30a25802cec76a9fb	68	SHA256 (KDE/Qt/5.15.2/qtwayland-everywhere-src-5.15.2.tar.xz) = 193732229ff816f3aaab9a5e2f6bed71ddddbf1988ce003fe8dd84a92ce9aeb5
69	SIZE (KDE/Qt/5.15.0/qtwayland-everywhere-src-5.15.0.tar.xz) = 562408	69	SIZE (KDE/Qt/5.15.2/qtwayland-everywhere-src-5.15.2.tar.xz) = 564884
70	SHA256 (KDE/Qt/5.15.0/qtwebchannel-everywhere-src-5.15.0.tar.xz) = ea80510b363e6f92ce99932f06d176e43459c4a5159fe97b5ef96fcfbab5ed4f	70	SHA256 (KDE/Qt/5.15.2/qtwebchannel-everywhere-src-5.15.2.tar.xz) = 127fe79c43b386713f151ed7d411cd81e45e29f9c955584f29736f78c9303ec1
71	SIZE (KDE/Qt/5.15.0/qtwebchannel-everywhere-src-5.15.0.tar.xz) = 202844	71	SIZE (KDE/Qt/5.15.2/qtwebchannel-everywhere-src-5.15.2.tar.xz) = 209208
72	SHA256 (KDE/Qt/5.15.0/qtwebengine-everywhere-src-5.15.0.tar.xz) = c38e2fda7ed1b7d5a90f26abf231ec0715d78a5bc39a94673d8e39d75f04c5df	72	SHA256 (KDE/Qt/5.15.2/qtwebengine-everywhere-src-5.15.2.tar.xz) = c8afca0e43d84f7bd595436fbe4d13a5bbdb81ec5104d605085d07545b6f91e0
73	SIZE (KDE/Qt/5.15.0/qtwebengine-everywhere-src-5.15.0.tar.xz) = 278257432	73	SIZE (KDE/Qt/5.15.2/qtwebengine-everywhere-src-5.15.2.tar.xz) = 280142544
74	SHA256 (KDE/Qt/5.15.0/qtwebglplugin-everywhere-src-5.15.0.tar.xz) = f7b81f25ddf7b3a0046daa7224bc1e18c8b754b00b1a33775f30f827a5cdca15	74	SHA256 (KDE/Qt/5.15.2/qtwebglplugin-everywhere-src-5.15.2.tar.xz) = 81e782b517ed29e10bea1aa90c9f59274c98a910f2c8b105fa78368a36b41446
75	SIZE (KDE/Qt/5.15.0/qtwebglplugin-everywhere-src-5.15.0.tar.xz) = 73956	75	SIZE (KDE/Qt/5.15.2/qtwebglplugin-everywhere-src-5.15.2.tar.xz) = 74144
76	SHA256 (KDE/Qt/5.15.0/qtwebsockets-everywhere-src-5.15.0.tar.xz) = 87c2f6542778f9b65b3f208740c1d0db643fd0bede21404b9abb265355da5092	76	SHA256 (KDE/Qt/5.15.2/qtwebsockets-everywhere-src-5.15.2.tar.xz) = a0b42d85dd34ff6e2d23400e02f83d8b85bcd80e60efd1521d12d9625d4a233f
77	SIZE (KDE/Qt/5.15.0/qtwebsockets-everywhere-src-5.15.0.tar.xz) = 253616	77	SIZE (KDE/Qt/5.15.2/qtwebsockets-everywhere-src-5.15.2.tar.xz) = 259000
78	SHA256 (KDE/Qt/5.15.0/qtwebview-everywhere-src-5.15.0.tar.xz) = b87ea205ce79c6b438ebe596e91fa80ba11f6aac7e89ffbf52b337d0fc8d6660	78	SHA256 (KDE/Qt/5.15.2/qtwebview-everywhere-src-5.15.2.tar.xz) = be9f46167e4977ead5ef5ecf883fdb812a4120f2436383583792f65557e481e7
79	SIZE (KDE/Qt/5.15.0/qtwebview-everywhere-src-5.15.0.tar.xz) = 133044	79	SIZE (KDE/Qt/5.15.2/qtwebview-everywhere-src-5.15.2.tar.xz) = 133428
80	SHA256 (KDE/Qt/5.15.0/qtwinextras-everywhere-src-5.15.0.tar.xz) = d77f2cb2ce83bdbfd0a970bc8d7d11c96b2df16befc257d6594f79dfd92abff0	80	SHA256 (KDE/Qt/5.15.2/qtwinextras-everywhere-src-5.15.2.tar.xz) = 65b8272005dec00791ab7d81ab266d1e3313a3bbd8e54e546d984cf4c4ab550e
81	SIZE (KDE/Qt/5.15.0/qtwinextras-everywhere-src-5.15.0.tar.xz) = 763572	81	SIZE (KDE/Qt/5.15.2/qtwinextras-everywhere-src-5.15.2.tar.xz) = 763948
82	SHA256 (KDE/Qt/5.15.0/qtx11extras-everywhere-src-5.15.0.tar.xz) = c72b6c188284facddcf82835af048240e721dc8d6d9e8a7bd71d76fd876881a1	82	SHA256 (KDE/Qt/5.15.2/qtx11extras-everywhere-src-5.15.2.tar.xz) = 7014702ee9a644a5a93da70848ac47c18851d4f8ed622b29a72eed9282fc6e3e
83	SIZE (KDE/Qt/5.15.0/qtx11extras-everywhere-src-5.15.0.tar.xz) = 135648	83	SIZE (KDE/Qt/5.15.2/qtx11extras-everywhere-src-5.15.2.tar.xz) = 143972
84	SHA256 (KDE/Qt/5.15.0/qtxmlpatterns-everywhere-src-5.15.0.tar.xz) = 2752cf2aa25ebfda89c3736457e27b3d0c7c7ed290dcfd52c209f9f905998507	84	SHA256 (KDE/Qt/5.15.2/qtxmlpatterns-everywhere-src-5.15.2.tar.xz) = 76ea2162a7c349188d7e7e4f6c77b78e8a205494c90fee3cea3487a1ae2cf2fa
85	SIZE (KDE/Qt/5.15.0/qtxmlpatterns-everywhere-src-5.15.0.tar.xz) = 1403484	85	SIZE (KDE/Qt/5.15.2/qtxmlpatterns-everywhere-src-5.15.2.tar.xz) = 5209380

Added Link Here

(-)b/graphics/fractgen/files/patch-git-48cf904f47d9eb3819e6e5f6c19feaae0a3bf901.diff (+13 lines)
1	diff --git src/fractalgenerator.cc src/fractalgenerator.cc
2	index dc8fb31..8f5d399 100644
3	--- src/fractalgenerator.cc
4	+++ src/fractalgenerator.cc
5	@@ -128,7 +128,7 @@ FractalGeneratorApp::FractalGeneratorApp(QWidget* parent, const QString& fileNam
6	helpMenu->addAction(tr("&About"), this, SLOT(slotHelpAbout()));
7
8	Printer.setColorMode(QPrinter::Color);
9	- Printer.setOrientation(QPrinter::Landscape);
10	+ Printer.setPageOrientation(QPageLayout::Landscape);
11	Printer.setOutputFileName(tr("Fractal.pdf"));
12
13	statusBar()->showMessage(tr("Welcome to FractGen!"), 3000);

Lines 13-30 COMMENT= Python bindings for the Poppler-Qt PDF rendering library Link Here

(-)b/graphics/py-python-poppler-qt5/Makefile (-6 / +10 lines)
13	LICENSE= LGPL21 LGPL3	13	LICENSE= LGPL21 LGPL3
14	LICENSE_COMB= dual	14	LICENSE_COMB= dual
15		15
		16	BUILD_DEPENDS= qmake:devel/qt5-qmake
16	LIB_DEPENDS= libpoppler-qt5.so:graphics/poppler-qt5	17	LIB_DEPENDS= libpoppler-qt5.so:graphics/poppler-qt5
17		18
18	USES= compiler:c++11-lang pkgconfig pyqt:5 python:3.4+ qmake qt:5	19	USES= compiler:c++11-lang pkgconfig pyqt:5 python:3.5+ qt:5
19	USE_GITHUB= yes	20	USE_GITHUB= yes
20	GH_ACCOUNT= frescobaldi	21	GH_ACCOUNT= frescobaldi
21	USE_PYQT= gui xml sip_build	22	USE_PYQT= gui xml sip_build qtbuilder
22	USE_PYTHON= autoplist distutils
23		23
24	PYDISTUTILS_BUILD_TARGET= build_ext	24	do-build:
25	PYDISTUTILS_BUILDARGS+= --pyqt-sip-dir=${PYQT_SIPDIR}	25	(cd ${WRKSRC} ; sip-build --verbose --no-make --build-dir build ; ${MAKE} -C ./build )
		26
		27	do-install:
		28	(cd ${WRKSRC} ; ${MAKE} -C ./build install INSTALL_ROOT=${STAGEDIR} )
26		29
27	post-install:	30	post-install:
28	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/popplerqt5.so	31	${RLN} ${STAGEDIR}${PYTHON_SITELIBDIR}/popplerqt5.cpython-${PYTHON_SUFFIX}m.so ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/popplerqt5.so
		32	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/popplerqt5.cpython-${PYTHON_SUFFIX}m.so
29		33
30	.include <bsd.port.mk>	34	.include <bsd.port.mk>

Added Link Here

(-)b/graphics/py-python-poppler-qt5/files/patch-poppler-qt5.sip (+13 lines)
1	From https://github.com/frescobaldi/python-poppler-qt5/pull/41/commits/4ee58b6ee02772db915fdc5e70e336e0e5b2f34c
2
3	--- poppler-qt5.sip.orig 2019-11-22 05:56:45 UTC
4	+++ poppler-qt5.sip
5	@@ -19,7 +19,7 @@
6	#include <qt5/poppler-qt5.h>
7	%End
8
9	-%Include version.sip // auto-generated by the setup.py script
10	+%Include version.sip // auto-generated by the project.py script
11	%Include types.sip
12
13	%Include poppler-annotation.sip

Added Link Here

(-)b/graphics/py-python-poppler-qt5/files/patch-project.py (+94 lines)
1	From https://github.com/frescobaldi/python-poppler-qt5/pull/41/commits/4ee58b6ee02772db915fdc5e70e336e0e5b2f34c
2
3	--- project.py.orig 2020-10-11 18:59:42 UTC
4	+++ project.py
5	@@ -0,0 +1,89 @@
6	+"""The build configuration file for Python-Poppler-Qt5, used by sip."""
7	+
8	+from os.path import join
9	+import re
10	+import subprocess
11	+from pyqtbuild import PyQtBindings, PyQtProject
12	+from sipbuild import Option
13	+import PyQt5
14	+
15	+
16	+class PythonPopplerQt5(PyQtProject):
17	+ """The Project class."""
18	+
19	+ def __init__(self):
20	+ super().__init__()
21	+ self.bindings_factories = [PopplerQt5Bindings]
22	+
23	+ def update(self, tool):
24	+ """Allows SIP to find PyQt5 .sip files."""
25	+ super().update(tool)
26	+ self.sip_include_dirs.append(join(PyQt5.__path__[0], 'bindings'))
27	+
28	+
29	+class PopplerQt5Bindings(PyQtBindings):
30	+ """The Poppler-Qt5 Bindings class."""
31	+
32	+ def __init__(self, project):
33	+ super().__init__(project, name='Poppler-Qt5',
34	+ sip_file='poppler-qt5.sip',
35	+ qmake_QT=['xml'])
36	+
37	+ def get_options(self):
38	+ """Our custom options that a user can pass to sip-build."""
39	+ options = super().get_options()
40	+ options.append(
41	+ Option('poppler_version',
42	+ help='version of the poppler library',
43	+ metavar='VERSION'))
44	+ return options
45	+
46	+ @staticmethod
47	+ def run_pkg_config(option):
48	+ output = subprocess.check_output(
49	+ ['pkg-config', option, 'poppler-qt5'],
50	+ text=True)
51	+ return output.rstrip()
52	+
53	+ def apply_user_defaults(self, tool):
54	+ # Set include_dirs, library_dirs and libraries based on pkg-config data
55	+ cflags = self.run_pkg_config('--cflags-only-I').split()
56	+ libs = self.run_pkg_config('--libs').split()
57	+ self.include_dirs.extend(
58	+ flag[2:] for flag in cflags if flag.startswith('-I'))
59	+ self.library_dirs.extend(
60	+ flag[2:] for flag in libs if flag.startswith('-L'))
61	+ self.libraries.extend(
62	+ flag[2:] for flag in libs if flag.startswith('-l'))
63	+
64	+ # Generate version.sip file
65	+ if self.poppler_version is not None:
66	+ poppler_qt5_version = self.poppler_version
67	+ else:
68	+ poppler_qt5_version = self.run_pkg_config('--modversion')
69	+ poppler_qt5_version = tuple(map(int, poppler_qt5_version.split('.')))
70	+ python_poppler_qt5_version = self.project.version_str.split('.')
71	+ format_dict = {
72	+ 'vlen': 'i' * len(python_poppler_qt5_version),
73	+ 'vargs': ', '.join(python_poppler_qt5_version),
74	+ 'pvlen': 'i' * len(poppler_qt5_version),
75	+ 'pvargs': ', '.join(map(str, poppler_qt5_version)),
76	+ }
77	+ with open('version.sip.in') as template_file:
78	+ version_sip_template = template_file.read()
79	+ with open('version.sip', 'w') as version_file:
80	+ version_file.write(version_sip_template.format(**format_dict))
81	+
82	+ # Add Poppler version tag
83	+ if poppler_qt5_version:
84	+ with open('timeline.sip') as timeline_file:
85	+ timeline = timeline_file.read()
86	+ for match in re.finditer(r'POPPLER_V(\d+)_(\d+)_(\d+)', timeline):
87	+ if poppler_qt5_version < tuple(map(int, match.group(1, 2, 3))):
88	+ break
89	+ tag = match.group()
90	+ else:
91	+ tag = 'POPPLER_V0_20_0'
92	+ self.tags.append(tag)
93	+ self.tags.append("WS_X11")
94	+ super().apply_user_defaults(tool)

Added Link Here

(-)b/graphics/py-python-poppler-qt5/files/patch-pyproject.toml (+42 lines)
1	From https://github.com/frescobaldi/python-poppler-qt5/pull/41/commits/4ee58b6ee02772db915fdc5e70e336e0e5b2f34c
2
3	--- pyproject.toml.orig 2020-10-11 18:59:42 UTC
4	+++ pyproject.toml
5	@@ -0,0 +1,37 @@
6	+[build-system]
7	+requires = ["sip >=5", "PyQt-builder", "PyQt5"]
8	+build-backend = "sipbuild.api"
9	+
10	+[tool.sip.metadata]
11	+name = "python-poppler-qt5"
12	+version = "0.75.0"
13	+summary = "A Python binding to Poppler-Qt5"
14	+description-file = "README.rst"
15	+home-page = "https://github.com/frescobaldi/python-poppler-qt5"
16	+maintainer = "Wilbert Berendsen"
17	+maintainer-email = "wbsoft@xs4all.nl"
18	+license = "LGPL"
19	+classifier = [
20	+ "Development Status :: 5 - Production/Stable",
21	+ "Intended Audience :: Developers",
22	+ "License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)",
23	+ "Operating System :: MacOS :: MacOS X",
24	+ "Operating System :: Microsoft :: Windows",
25	+ "Operating System :: POSIX",
26	+ "Programming Language :: Python :: 3",
27	+ "Topic :: Multimedia :: Graphics :: Viewers"
28	+]
29	+requires-dist = "PyQt5"
30	+
31	+[tool.sip.project]
32	+sip-files-dir = "."
33	+sdist-excludes = [
34	+ "version.sip",
35	+ ".git/*",
36	+ ".git//",
37	+ ".git///*",
38	+ ".git////",
39	+ ".git/////*",
40	+ ".git//////",
41	+ ".git///////*"
42	+]