Commit 787e501e authored by Tobias C. Berner's avatar Tobias C. Berner
Browse files

qt5: Update Qt to 5.15.5 (KDE patched) 

- update patch-collection diff to be at the highest patch-level
- update patch-collection diff to be against 5.15.5 instead of 5.15.2
- update devel/qt5-script to 5.15.10
- libressl support by Felix Palmen <felix@palmen-it.de>

PR:			264944
Exp-run by:		antoine
Differential Revision:	https://reviews.freebsd.org/D35619
parent ccc49ad8

Mk/Uses/qt-dist.mk

+40 −34
Original line number Diff line number Diff line
@@ -69,44 +69,48 @@ DESTDIRNAME= INSTALL_ROOT 
.  if ${_QT_VER:M5}



# KDE maintains a repository with a patched Qt5 distribution.

_KDE_3d=		39

_KDE_base=		263

_KDE_charts=		2

_KDE_connectivity=	1

_KDE_datavis3d=		2

_KDE_declarative=	41

_KDE_gamepad=		2

_KDE_graphicaleffects=	2

_KDE_3d=		15

_KDE_base=		165

_KDE_charts=		1

_KDE_connectivity=	5

_KDE_datavis3d=		0

_KDE_declarative=	19

_KDE_gamepad=		0

_KDE_graphicaleffects=	0

_KDE_imageformats=	3

_KDE_location=		6

_KDE_multimedia=	3

_KDE_networkauth=	2

_KDE_quick3d=		19

_KDE_quickcontrols=	3

_KDE_quickcontrols2=	8

_KDE_quicktimeline=	3

_KDE_remoteobjects=	3

_KDE_script=		4

_KDE_scxml=		1

_KDE_sensors=		2

_KDE_serialbus=		2

_KDE_serialport=	2

_KDE_speech=		2

_KDE_svg=		13

_KDE_tools=		17

_KDE_translations=	22

_KDE_virtualkeyboard=	4

_KDE_wayland=		37

_KDE_webchannel=	2

_KDE_webglplugin=	2

_KDE_websockets=	4

_KDE_webview=		2

_KDE_x11extras=		1

_KDE_xmlpatterns=	2

_KDE_location=		3

_KDE_multimedia=	1

_KDE_networkauth=	0

_KDE_quick3d=		1

_KDE_quickcontrols=	0

_KDE_quickcontrols2=	5

_KDE_quicktimeline=	0

_KDE_remoteobjects=	0

_KDE_script=		0

_KDE_script_ORIGIN_TAG=	v5.15.10-lts

_KDE_script_VERSION=	5.15.10

_KDE_scxml=		0

_KDE_sensors=		0

_KDE_serialbus=		0

_KDE_serialport=	0

_KDE_speech=		1

_KDE_svg=		10

_KDE_tools=		1

_KDE_translations=	2

_KDE_virtualkeyboard=	3

_KDE_wayland=		39

_KDE_webchannel=	3

_KDE_webglplugin=	0

_KDE_websockets=	3

_KDE_webview=		0

_KDE_x11extras=		0

_KDE_xmlpatterns=	0



.    if defined(_KDE_${_QT_DIST})

# KDE patched Qt parts

QT5_KDE_PATCH=		p${_KDE_${_QT_DIST}}

_KDE_${_QT_DIST}_VERSION?=	${_QT_VERSION}

_KDE_${_QT_DIST}_ORIGIN_TAG?=	v${_KDE_${_QT_DIST}_VERSION}-lts-lgpl

MASTER_SITES=		LOCAL/tcberner/KDE/Qt/${_QT_VERSION}

DISTNAME=		${_QT_DIST:S,^,kde-qt,:S,$,-${DISTVERSION},}

COMMENT+=		(KDE patched)
@@ -460,6 +464,8 @@ qt-post-install: 
qt-create-kde-distfile:

	${SH} ${PORTSDIR}/devel/${_QT_RELNAME}/files/create_kde-qt_release.sh \

		${_QT_DIST} \

		${DISTDIR}/${DIST_SUBDIR}

		${DISTDIR}/${DIST_SUBDIR} \

		${_KDE_${_QT_DIST}_VERSION} \

		${_KDE_${_QT_DIST}_ORIGIN_TAG}



.endif # defined(_QT_DIST_MK_INCLUDED)

Mk/Uses/qt.mk

+3 −3
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ _QT_MK_INCLUDED= qt.mk 


# Qt versions currently supported by the framework.

_QT_SUPPORTED?=		5

QT5_VERSION?=		5.15.2

QT5_VERSION?=		5.15.5



# We accept the Qt version to be passed by either or all of the three mk files.

.  if empty(qt_ARGS) && empty(qmake_ARGS) && empty(qt-dist_ARGS)
@@ -154,7 +154,7 @@ qt-assistant_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/assistant 


# Always build with *this* version's buildtools

qt-buildtools_PORT=	devel/${_QT_RELNAME}-buildtools

qt-buildtools_PATH=	${_QT_RELNAME}-buildtools>=${_QT_VERSION}

qt-buildtools_PATH=	${_QT_RELNAME}-buildtools>=${_QT_VERSION:R}



qt-charts_PORT=		x11-toolkits/${_QT_RELNAME}-charts

qt-charts_LIB=		libQt${_QT_LIBVER}Charts.so
@@ -263,7 +263,7 @@ qt-qev_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qev 


# Always build with *this* version's qmake

qt-qmake_PORT=		devel/${_QT_RELNAME}-qmake

qt-qmake_PATH=		${_QT_RELNAME}-qmake>=${_QT_VERSION}

qt-qmake_PATH=		${_QT_RELNAME}-qmake>=${_QT_VERSION:R}



qt-quick3d_PORT=	x11-toolkits/${_QT_RELNAME}-quick3d

qt-quick3d_LIB=		libQt${_QT_LIBVER}Quick3D.so

accessibility/qt5-speech/distinfo

+3 −3
Original line number Diff line number Diff line 
TIMESTAMP = 1639423750

SHA256 (KDE/Qt/5.15.2/kde-qtspeech-5.15.2p2.tar.xz) = 83f3543ef261b7603615fd07a3f9d938ba1377aa2a955e449b0cc87efd543989

SIZE (KDE/Qt/5.15.2/kde-qtspeech-5.15.2p2.tar.xz) = 80208
 
TIMESTAMP = 1656427309

SHA256 (KDE/Qt/5.15.5/kde-qtspeech-5.15.5p1.tar.xz) = 46ac06e9a8761375e0588ef79b201147ce9129e5614160f59081f91a6342da13

SIZE (KDE/Qt/5.15.5/kde-qtspeech-5.15.5p1.tar.xz) = 80124

comms/qt5-connectivity/distinfo

+3 −3
Original line number Diff line number Diff line 
TIMESTAMP = 1639423751

SHA256 (KDE/Qt/5.15.2/kde-qtconnectivity-5.15.2p1.tar.xz) = 768324678b18c535c34d10a304124352b6befc7be6f0496bbb7b6ed6376f382e

SIZE (KDE/Qt/5.15.2/kde-qtconnectivity-5.15.2p1.tar.xz) = 2784408
 
TIMESTAMP = 1656427310

SHA256 (KDE/Qt/5.15.5/kde-qtconnectivity-5.15.5p5.tar.xz) = 5b35c05bdd556b38674e81910532bc1f7a9d61fecb19548a0b7dfce0ae4589b4

SIZE (KDE/Qt/5.15.5/kde-qtconnectivity-5.15.5p5.tar.xz) = 2784836

comms/qt5-sensors/distinfo

+3 −3
Original line number Diff line number Diff line 
TIMESTAMP = 1639423751

SHA256 (KDE/Qt/5.15.2/kde-qtsensors-5.15.2p2.tar.xz) = ad17bde11441d00f5a0db4ecf87a40833953981ac3a8039243c8de1b0d2122de

SIZE (KDE/Qt/5.15.2/kde-qtsensors-5.15.2p2.tar.xz) = 2030628
 
TIMESTAMP = 1656427311

SHA256 (KDE/Qt/5.15.5/kde-qtsensors-5.15.5p0.tar.xz) = dc57096ab2b6f6167b12c89961378b10fe9c2b1a263da8a8b9cda54c8788f870

SIZE (KDE/Qt/5.15.5/kde-qtsensors-5.15.5p0.tar.xz) = 2030764