UPDATE: x11/qt6 to 6.5.0

Hi ports hackers,

Update Qt6 to 6.5.0. I would like to hear feedback from real world users
(tdesktop, wireshark, uefitooll...). I'll build all consumers before I
committing the diff below but some *real* feedback would be quite nice.

https://www.qt.io/blog/qt-6.5-lts-released
https://code.qt.io/cgit/qt/qtreleasenotes.git/tree/qt/6.5.0/release-note.md

Any kind of feedback is welcome.

Rafael

Index: Makefile.version
===================================================================
RCS file: /cvs/ports/x11/qt6/Makefile.version,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile.version
--- Makefile.version 7 Jan 2023 11:18:57 -0000 1.7
+++ Makefile.version 4 Apr 2023 18:46:43 -0000
@@ -1,6 +1,6 @@
# Common source for Qt6 version
-QT6_VERSION = 6.4.2
+QT6_VERSION = 6.5.0

# This one is used for building dependencies for examples and documentation,
# which obviously should be in sync with core packages.
-QT6_NEXT_VERSION = 6.5
+QT6_NEXT_VERSION = 6.6
Index: qt3d/Makefile
===================================================================
RCS file: /cvs/ports/x11/qt6/qt3d/Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile
--- qt3d/Makefile 6 Dec 2022 14:22:51 -0000 1.4
+++ qt3d/Makefile 4 Apr 2023 18:46:43 -0000
@@ -2,18 +2,18 @@ QT6NAME = Qt3D
COMMENT = Qt6 components for 3D graphics
PKGSPEC = qt6-qt3d-${QT6_PKGSPEC}

-SHARED_LIBS += Qt63DAnimation 0.1 # 0.0
-SHARED_LIBS += Qt63DCore 0.1 # 0.0
-SHARED_LIBS += Qt63DExtras 0.1 # 0.0
-SHARED_LIBS += Qt63DInput 0.1 # 0.0
-SHARED_LIBS += Qt63DLogic 0.0 # 0.0
-SHARED_LIBS += Qt63DQuick 0.1 # 0.0
-SHARED_LIBS += Qt63DQuickAnimation 0.0 # 0.0
-SHARED_LIBS += Qt63DQuickExtras 0.0 # 0.0
-SHARED_LIBS += Qt63DQuickInput 0.0 # 0.0
-SHARED_LIBS += Qt63DQuickRender 0.1 # 0.0
-SHARED_LIBS += Qt63DQuickScene2D 0.0 # 0.0
-SHARED_LIBS += Qt63DRender 1.0 # 0.0
+SHARED_LIBS += Qt63DAnimation 1.0 # 6.5
+SHARED_LIBS += Qt63DCore 1.0 # 6.5
+SHARED_LIBS += Qt63DExtras 1.0 # 6.5
+SHARED_LIBS += Qt63DInput 1.0 # 6.5
+SHARED_LIBS += Qt63DLogic 1.0 # 6.5
+SHARED_LIBS += Qt63DQuick 1.0 # 6.5
+SHARED_LIBS += Qt63DQuickAnimation 1.0 # 6.5
+SHARED_LIBS += Qt63DQuickExtras 1.0 # 6.5
+SHARED_LIBS += Qt63DQuickInput 1.0 # 6.5
+SHARED_LIBS += Qt63DQuickRender 1.0 # 6.5
+SHARED_LIBS += Qt63DQuickScene2D 1.0 # 6.5
+SHARED_LIBS += Qt63DRender 1.0 # 6.5

WANTLIB += ${COMPILER_LIBCXX} GL Qt6Concurrent Qt6Core Qt6Gui
WANTLIB += Qt6Network Qt6OpenGL Qt6Qml Qt6QmlModels Qt6Quick Qt6ShaderTools
@@ -25,6 +25,5 @@ BUILD_DEPENDS = x11/qt6/qtmultimedia \
LIB_DEPENDS = multimedia/assimp \
x11/qt6/qtshadertools \
x11/qt6/qtdeclarative
-

.include <bsd.port.mk>
Index: qt3d/distinfo
===================================================================
RCS file: /cvs/ports/x11/qt6/qt3d/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- qt3d/distinfo 7 Jan 2023 11:18:57 -0000 1.3
+++ qt3d/distinfo 4 Apr 2023 18:46:43 -0000
@@ -1,2 +1,2 @@
-SHA256 (qt/qt3d-everywhere-src-6.4.2.tar.xz) = RWwkw9OEAnPnILef6P7UUvqIm1TLrmtF2x0d7U2jc0E=
-SIZE (qt/qt3d-everywhere-src-6.4.2.tar.xz) = 104002364
+SHA256 (qt/qt3d-everywhere-src-6.5.0.tar.xz) = ILJQAjJE8h377FwAe6yAXUSU+kY6bdJ1OK+xqBsjCBY=
+SIZE (qt/qt3d-everywhere-src-6.5.0.tar.xz) = 161603004
Index: qt3d/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/qt6/qt3d/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- qt3d/pkg/PLIST 6 Dec 2022 14:22:51 -0000 1.2
+++ qt3d/pkg/PLIST 4 Apr 2023 18:46:43 -0000
@@ -133,7 +133,6 @@ include/X11/qt6/Qt3DCore/${VERSION}/Qt3D
include/X11/qt6/Qt3DCore/${VERSION}/Qt3DCore/private/corelogging_p.h
include/X11/qt6/Qt3DCore/${VERSION}/Qt3DCore/private/coresettings_p.h
include/X11/qt6/Qt3DCore/${VERSION}/Qt3DCore/private/job_common_p.h
-include/X11/qt6/Qt3DCore/${VERSION}/Qt3DCore/private/matrix4x4_avx2_p.h
include/X11/qt6/Qt3DCore/${VERSION}/Qt3DCore/private/matrix4x4_p.h
include/X11/qt6/Qt3DCore/${VERSION}/Qt3DCore/private/matrix4x4_sse_p.h
include/X11/qt6/Qt3DCore/${VERSION}/Qt3DCore/private/nullservices_p.h
@@ -163,7 +162,6 @@ include/X11/qt6/Qt3DCore/${VERSION}/Qt3D
include/X11/qt6/Qt3DCore/${VERSION}/Qt3DCore/private/qcoresettings_p.h
include/X11/qt6/Qt3DCore/${VERSION}/Qt3DCore/private/qdestructionidandtypecollector_p.h
include/X11/qt6/Qt3DCore/${VERSION}/Qt3DCore/private/qdownloadhelperservice_p.h
-include/X11/qt6/Qt3DCore/${VERSION}/Qt3DCore/private/qdownloadhelperservice_p_p.h
include/X11/qt6/Qt3DCore/${VERSION}/Qt3DCore/private/qdownloadnetworkworker_p.h
include/X11/qt6/Qt3DCore/${VERSION}/Qt3DCore/private/qentity_p.h
include/X11/qt6/Qt3DCore/${VERSION}/Qt3DCore/private/qeventfilterservice_p.h
@@ -200,7 +198,6 @@ include/X11/qt6/Qt3DCore/${VERSION}/Qt3D
include/X11/qt6/Qt3DCore/${VERSION}/Qt3DCore/private/vector4d_p.h
include/X11/qt6/Qt3DCore/${VERSION}/Qt3DCore/private/vector4d_sse_p.h
include/X11/qt6/Qt3DCore/${VERSION}/Qt3DCore/private/vector_helper_p.h
-include/X11/qt6/Qt3DCore/FunctorType
include/X11/qt6/Qt3DCore/QAbstractAspect
include/X11/qt6/Qt3DCore/QAbstractFunctor
include/X11/qt6/Qt3DCore/QAbstractSkeleton
@@ -441,7 +438,6 @@ include/X11/qt6/Qt3DInput/${VERSION}/Qt3
include/X11/qt6/Qt3DInput/${VERSION}/Qt3DInput/private/qaxisaccumulator_p.h
include/X11/qt6/Qt3DInput/${VERSION}/Qt3DInput/private/qaxissetting_p.h
include/X11/qt6/Qt3DInput/${VERSION}/Qt3DInput/private/qbuttonaxisinput_p.h
-include/X11/qt6/Qt3DInput/${VERSION}/Qt3DInput/private/qgamepadinput_p.h
include/X11/qt6/Qt3DInput/${VERSION}/Qt3DInput/private/qgenericinputdevice_p.h
include/X11/qt6/Qt3DInput/${VERSION}/Qt3DInput/private/qinputaspect_p.h
include/X11/qt6/Qt3DInput/${VERSION}/Qt3DInput/private/qinputchord_p.h
@@ -887,7 +883,6 @@ include/X11/qt6/Qt3DRender/${VERSION}/Qt
include/X11/qt6/Qt3DRender/${VERSION}/Qt3DRender/private/setfence_p.h
include/X11/qt6/Qt3DRender/${VERSION}/Qt3DRender/private/shader_p.h
include/X11/qt6/Qt3DRender/${VERSION}/Qt3DRender/private/shaderbuilder_p.h
-include/X11/qt6/Qt3DRender/${VERSION}/Qt3DRender/private/shadercache_p.h
include/X11/qt6/Qt3DRender/${VERSION}/Qt3DRender/private/shaderdata_p.h
include/X11/qt6/Qt3DRender/${VERSION}/Qt3DRender/private/shaderimage_p.h
include/X11/qt6/Qt3DRender/${VERSION}/Qt3DRender/private/skeleton_p.h
@@ -903,7 +898,6 @@ include/X11/qt6/Qt3DRender/${VERSION}/Qt
include/X11/qt6/Qt3DRender/${VERSION}/Qt3DRender/private/techniquefilternode_p.h
include/X11/qt6/Qt3DRender/${VERSION}/Qt3DRender/private/techniquemanager_p.h
include/X11/qt6/Qt3DRender/${VERSION}/Qt3DRender/private/texture_p.h
-include/X11/qt6/Qt3DRender/${VERSION}/Qt3DRender/private/texturedatamanager_p.h
include/X11/qt6/Qt3DRender/${VERSION}/Qt3DRender/private/textureimage_p.h
include/X11/qt6/Qt3DRender/${VERSION}/Qt3DRender/private/transform_p.h
include/X11/qt6/Qt3DRender/${VERSION}/Qt3DRender/private/triangleboundingvolume_p.h
@@ -922,8 +916,6 @@ include/X11/qt6/Qt3DRender/${VERSION}/Qt
include/X11/qt6/Qt3DRender/${VERSION}/Qt3DRender/private/vsyncframeadvanceservice_p.h
include/X11/qt6/Qt3DRender/${VERSION}/Qt3DRender/private/vulkaninstance_p.h
include/X11/qt6/Qt3DRender/${VERSION}/Qt3DRender/private/waitfence_p.h
-include/X11/qt6/Qt3DRender/PropertyReaderInterface
-include/X11/qt6/Qt3DRender/PropertyReaderInterfacePtr
include/X11/qt6/Qt3DRender/QAbstractLight
include/X11/qt6/Qt3DRender/QAbstractRayCaster
include/X11/qt6/Qt3DRender/QAbstractTexture
@@ -933,7 +925,6 @@ include/X11/qt6/Qt3DRender/QAlphaTest
include/X11/qt6/Qt3DRender/QBlendEquation
include/X11/qt6/Qt3DRender/QBlendEquationArguments
include/X11/qt6/Qt3DRender/QBlitFramebuffer
-include/X11/qt6/Qt3DRender/QBufferCapture
include/X11/qt6/Qt3DRender/QCamera
include/X11/qt6/Qt3DRender/QCameraLens
include/X11/qt6/Qt3DRender/QCameraSelector
@@ -1018,7 +1009,6 @@ include/X11/qt6/Qt3DRender/QStencilOpera
include/X11/qt6/Qt3DRender/QStencilOperationArguments
include/X11/qt6/Qt3DRender/QStencilTest
include/X11/qt6/Qt3DRender/QStencilTestArguments
-include/X11/qt6/Qt3DRender/QSubtreeEnabler
include/X11/qt6/Qt3DRender/QTechnique
include/X11/qt6/Qt3DRender/QTechniqueFilter
include/X11/qt6/Qt3DRender/QTexture
@@ -1372,18 +1362,6 @@ lib/libQt63DQuickScene2D.prl
@lib lib/libQt63DQuickScene2D.so.${LIBQt63DQuickScene2D_VERSION}
lib/libQt63DRender.prl
@lib lib/libQt63DRender.so.${LIBQt63DRender_VERSION}
-lib/metatypes/qt63danimation_release_metatypes.json
-lib/metatypes/qt63dcore_release_metatypes.json
-lib/metatypes/qt63dextras_release_metatypes.json
-lib/metatypes/qt63dinput_release_metatypes.json
-lib/metatypes/qt63dlogic_release_metatypes.json
-lib/metatypes/qt63dquick_release_metatypes.json
-lib/metatypes/qt63dquickanimation_release_metatypes.json
-lib/metatypes/qt63dquickextras_release_metatypes.json
-lib/metatypes/qt63dquickinput_release_metatypes.json
-lib/metatypes/qt63dquickrender_release_metatypes.json
-lib/metatypes/qt63dquickscene2d_release_metatypes.json
-lib/metatypes/qt63drender_release_metatypes.json
lib/pkgconfig/Qt63DAnimation.pc
lib/pkgconfig/Qt63DCore.pc
lib/pkgconfig/Qt63DExtras.pc
@@ -1396,6 +1374,18 @@ lib/pkgconfig/Qt63DQuickInput.pc
lib/pkgconfig/Qt63DQuickRender.pc
lib/pkgconfig/Qt63DQuickScene2D.pc
lib/pkgconfig/Qt63DRender.pc
+lib/qt6/metatypes/qt63danimation_release_metatypes.json
+lib/qt6/metatypes/qt63dcore_release_metatypes.json
+lib/qt6/metatypes/qt63dextras_release_metatypes.json
+lib/qt6/metatypes/qt63dinput_release_metatypes.json
+lib/qt6/metatypes/qt63dlogic_release_metatypes.json
+lib/qt6/metatypes/qt63dquick_release_metatypes.json
+lib/qt6/metatypes/qt63dquickanimation_release_metatypes.json
+lib/qt6/metatypes/qt63dquickextras_release_metatypes.json
+lib/qt6/metatypes/qt63dquickinput_release_metatypes.json
+lib/qt6/metatypes/qt63dquickrender_release_metatypes.json
+lib/qt6/metatypes/qt63dquickscene2d_release_metatypes.json
+lib/qt6/metatypes/qt63drender_release_metatypes.json
lib/qt6/mkspecs/modules/qt_lib_3danimation.pri
lib/qt6/mkspecs/modules/qt_lib_3danimation_private.pri
lib/qt6/mkspecs/modules/qt_lib_3dcore.pri
@@ -1420,6 +1410,18 @@ lib/qt6/mkspecs/modules/qt_lib_3dquicksc
lib/qt6/mkspecs/modules/qt_lib_3dquickscene2d_private.pri
lib/qt6/mkspecs/modules/qt_lib_3drender.pri
lib/qt6/mkspecs/modules/qt_lib_3drender_private.pri
+lib/qt6/modules/3DAnimation.json
+lib/qt6/modules/3DCore.json
+lib/qt6/modules/3DExtras.json
+lib/qt6/modules/3DInput.json
+lib/qt6/modules/3DLogic.json
+lib/qt6/modules/3DQuick.json
+lib/qt6/modules/3DQuickAnimation.json
+lib/qt6/modules/3DQuickExtras.json
+lib/qt6/modules/3DQuickInput.json
+lib/qt6/modules/3DQuickRender.json
+lib/qt6/modules/3DQuickScene2D.json
+lib/qt6/modules/3DRender.json
lib/qt6/plugins/geometryloaders/
@so lib/qt6/plugins/geometryloaders/libdefaultgeometryloader.so
@so lib/qt6/plugins/geometryloaders/libgltfgeometryloader.so
@@ -1465,15 +1467,3 @@ lib/qt6/qml/QtQuick/Scene3D/
@so lib/qt6/qml/QtQuick/Scene3D/libqtquickscene3dplugin.so
lib/qt6/qml/QtQuick/Scene3D/plugins.qmltypes
lib/qt6/qml/QtQuick/Scene3D/qmldir
-share/qt6/modules/3DAnimation.json
-share/qt6/modules/3DCore.json
-share/qt6/modules/3DExtras.json
-share/qt6/modules/3DInput.json
-share/qt6/modules/3DLogic.json
-share/qt6/modules/3DQuick.json
-share/qt6/modules/3DQuickAnimation.json
-share/qt6/modules/3DQuickExtras.json
-share/qt6/modules/3DQuickInput.json
-share/qt6/modules/3DQuickRender.json
-share/qt6/modules/3DQuickScene2D.json
-share/qt6/modules/3DRender.json
Index: qt5compat/Makefile
===================================================================
RCS file: /cvs/ports/x11/qt6/qt5compat/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- qt5compat/Makefile 6 Dec 2022 14:22:51 -0000 1.5
+++ qt5compat/Makefile 4 Apr 2023 18:46:43 -0000
@@ -2,11 +2,10 @@ QT6NAME = Qt5Compat
COMMENT = Qt6 module contains unsupported Qt 5 APIs
PKGSPEC = qt6-qt5compat-${QT6_PKGSPEC}

-SHARED_LIBS += Qt6Core5Compat 0.2 # 6.4
+SHARED_LIBS += Qt6Core5Compat 1.0 # 6.5

WANTLIB += ${COMPILER_LIBCXX} GL Qt6Core Qt6Gui Qt6Network Qt6OpenGL
-WANTLIB += Qt6Qml Qt6QmlModels Qt6Quick Qt6ShaderTools c icudata
-WANTLIB += icui18n icuuc m xkbcommon
+WANTLIB += Qt6Qml Qt6QmlModels Qt6Quick Qt6ShaderTools c m xkbcommon

LIB_DEPENDS = x11/qt6/qtdeclarative \
x11/qt6/qtshadertools \
Index: qt5compat/distinfo
===================================================================
RCS file: /cvs/ports/x11/qt6/qt5compat/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- qt5compat/distinfo 7 Jan 2023 11:18:57 -0000 1.6
+++ qt5compat/distinfo 4 Apr 2023 18:46:43 -0000
@@ -1,2 +1,2 @@
-SHA256 (qt/qt5compat-everywhere-src-6.4.2.tar.xz) = 9R9QXI6YW1G31zPifXgsb84YG+71M2SssDaMyJLEt5I=
-SIZE (qt/qt5compat-everywhere-src-6.4.2.tar.xz) = 14638200
+SHA256 (qt/qt5compat-everywhere-src-6.5.0.tar.xz) = qeL1Ohk/wuExsBovbnofv+MTCcJBP9whPlqBxVjCEmE=
+SIZE (qt/qt5compat-everywhere-src-6.5.0.tar.xz) = 14638216
Index: qt5compat/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/qt6/qt5compat/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 PLIST
--- qt5compat/pkg/PLIST 6 Dec 2022 14:22:51 -0000 1.6
+++ qt5compat/pkg/PLIST 4 Apr 2023 18:46:43 -0000
@@ -2,28 +2,18 @@ include/X11/qt6/QtCore5Compat/
include/X11/qt6/QtCore5Compat/${VERSION}/
include/X11/qt6/QtCore5Compat/${VERSION}/QtCore5Compat/
include/X11/qt6/QtCore5Compat/${VERSION}/QtCore5Compat/private/
-include/X11/qt6/QtCore5Compat/${VERSION}/QtCore5Compat/private/cp949codetbl_p.h
-include/X11/qt6/QtCore5Compat/${VERSION}/QtCore5Compat/private/qbig5codec_p.h
include/X11/qt6/QtCore5Compat/${VERSION}/QtCore5Compat/private/qbinaryjson_p.h
include/X11/qt6/QtCore5Compat/${VERSION}/QtCore5Compat/private/qbinaryjsonarray_p.h
include/X11/qt6/QtCore5Compat/${VERSION}/QtCore5Compat/private/qbinaryjsonobject_p.h
include/X11/qt6/QtCore5Compat/${VERSION}/QtCore5Compat/private/qbinaryjsonvalue_p.h
-include/X11/qt6/QtCore5Compat/${VERSION}/QtCore5Compat/private/qeucjpcodec_p.h
-include/X11/qt6/QtCore5Compat/${VERSION}/QtCore5Compat/private/qeuckrcodec_p.h
-include/X11/qt6/QtCore5Compat/${VERSION}/QtCore5Compat/private/qgb18030codec_p.h
-include/X11/qt6/QtCore5Compat/${VERSION}/QtCore5Compat/private/qiconvcodec_p.h
include/X11/qt6/QtCore5Compat/${VERSION}/QtCore5Compat/private/qicucodec_p.h
include/X11/qt6/QtCore5Compat/${VERSION}/QtCore5Compat/private/qisciicodec_p.h
-include/X11/qt6/QtCore5Compat/${VERSION}/QtCore5Compat/private/qjiscodec_p.h
-include/X11/qt6/QtCore5Compat/${VERSION}/QtCore5Compat/private/qjpunicode_p.h
include/X11/qt6/QtCore5Compat/${VERSION}/QtCore5Compat/private/qlatincodec_p.h
include/X11/qt6/QtCore5Compat/${VERSION}/QtCore5Compat/private/qsimplecodec_p.h
-include/X11/qt6/QtCore5Compat/${VERSION}/QtCore5Compat/private/qsjiscodec_p.h
include/X11/qt6/QtCore5Compat/${VERSION}/QtCore5Compat/private/qtcore5compat-config_p.h
include/X11/qt6/QtCore5Compat/${VERSION}/QtCore5Compat/private/qtextcodec_p.h
include/X11/qt6/QtCore5Compat/${VERSION}/QtCore5Compat/private/qtsciicodec_p.h
include/X11/qt6/QtCore5Compat/${VERSION}/QtCore5Compat/private/qutfcodec_p.h
-include/X11/qt6/QtCore5Compat/${VERSION}/QtCore5Compat/private/qwindowscodec_p.h
include/X11/qt6/QtCore5Compat/${VERSION}/QtCore5Compat/private/qxml_p.h
include/X11/qt6/QtCore5Compat/QBinaryJson
include/X11/qt6/QtCore5Compat/QConcatenable
@@ -88,10 +78,11 @@ lib/cmake/Qt6Qml/QmlPlugins/Qt6qtgraphic
lib/cmake/Qt6Qml/QmlPlugins/Qt6qtgraphicaleffectsprivateTargets.cmake
lib/libQt6Core5Compat.prl
@lib lib/libQt6Core5Compat.so.${LIBQt6Core5Compat_VERSION}
-lib/metatypes/qt6core5compat_release_metatypes.json
lib/pkgconfig/Qt6Core5Compat.pc
+lib/qt6/metatypes/qt6core5compat_release_metatypes.json
lib/qt6/mkspecs/modules/qt_lib_core5compat.pri
lib/qt6/mkspecs/modules/qt_lib_core5compat_private.pri
+lib/qt6/modules/Core5Compat.json
lib/qt6/qml/Qt5Compat/
lib/qt6/qml/Qt5Compat/GraphicalEffects/
lib/qt6/qml/Qt5Compat/GraphicalEffects/Blend.qml
@@ -130,6 +121,6 @@ lib/qt6/qml/Qt5Compat/GraphicalEffects/p
lib/qt6/qml/Qt5Compat/GraphicalEffects/private/GaussianInnerShadow.qml
lib/qt6/qml/Qt5Compat/GraphicalEffects/private/GaussianMaskedBlur.qml
@so lib/qt6/qml/Qt5Compat/GraphicalEffects/private/libqtgraphicaleffectsprivateplugin.so
+lib/qt6/qml/Qt5Compat/GraphicalEffects/private/plugins.qmltypes
lib/qt6/qml/Qt5Compat/GraphicalEffects/private/qmldir
lib/qt6/qml/Qt5Compat/GraphicalEffects/qmldir
-share/qt6/modules/Core5Compat.json
Index: qtbase/Makefile
===================================================================
RCS file: /cvs/ports/x11/qt6/qtbase/Makefile,v
retrieving revision 1.21
diff -u -p -u -p -r1.21 Makefile
--- qtbase/Makefile 19 Feb 2023 20:56:09 -0000 1.21
+++ qtbase/Makefile 4 Apr 2023 18:46:43 -0000
@@ -15,23 +15,23 @@ PKG_ARCH-global = *

DPB_PROPERTIES = parallel

-SHARED_LIBS += Qt6Concurrent 0.1 # 6.4
-SHARED_LIBS += Qt6Core 1.0 # 6.4
-SHARED_LIBS += Qt6DBus 1.0 # 6.4
-SHARED_LIBS += Qt6Gui 2.0 # 6.4
-SHARED_LIBS += Qt6Network 0.3 # 6.4
-SHARED_LIBS += Qt6OpenGL 1.0 # 6.4
-SHARED_LIBS += Qt6PrintSupport 0.2 # 6.4
-SHARED_LIBS += Qt6Sql 0.1 # 6.4
-SHARED_LIBS += Qt6Test 2.0 # 6.4
-SHARED_LIBS += Qt6Widgets 1.0 # 6.4
-SHARED_LIBS += Qt6Xml 0.1 # 6.4
-SHARED_LIBS += Qt6EglFSDeviceIntegration 0.2 # 6.4
-SHARED_LIBS += Qt6EglFsKmsSupport 0.1 # 6.4
-SHARED_LIBS += Qt6OpenGLExtensions 0.1 # 6.4
-SHARED_LIBS += Qt6XcbQpa 1.1 # 6.4
-SHARED_LIBS += Qt6EglFsKmsGbmSupport 0.2 # 6.4
-SHARED_LIBS += Qt6OpenGLWidgets 0.1 # 6.4
+SHARED_LIBS += Qt6Concurrent 0.1 # 6.5
+SHARED_LIBS += Qt6Core 2.0 # 6.5
+SHARED_LIBS += Qt6DBus 2.0 # 6.5
+SHARED_LIBS += Qt6Gui 3.0 # 6.5
+SHARED_LIBS += Qt6Network 1.0 # 6.5
+SHARED_LIBS += Qt6OpenGL 2.0 # 6.5
+SHARED_LIBS += Qt6PrintSupport 0.2 # 6.5
+SHARED_LIBS += Qt6Sql 1.0 # 6.5
+SHARED_LIBS += Qt6Test 3.0 # 6.5
+SHARED_LIBS += Qt6Widgets 1.1 # 6.5
+SHARED_LIBS += Qt6Xml 1.0 # 6.5
+SHARED_LIBS += Qt6EglFSDeviceIntegration 1.0 # 6.5
+SHARED_LIBS += Qt6EglFsKmsSupport 1.0 # 6.5
+SHARED_LIBS += Qt6OpenGLExtensions 0.1 # 6.5
+SHARED_LIBS += Qt6XcbQpa 2.0 # 6.5
+SHARED_LIBS += Qt6EglFsKmsGbmSupport 0.2 # 6.5
+SHARED_LIBS += Qt6OpenGLWidgets 1.0 # 6.5

WANTLIB-global =

Index: qtbase/distinfo
===================================================================
RCS file: /cvs/ports/x11/qt6/qtbase/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- qtbase/distinfo 7 Jan 2023 11:18:57 -0000 1.6
+++ qtbase/distinfo 4 Apr 2023 18:46:43 -0000
@@ -1,2 +1,2 @@
-SHA256 (qt/qtbase-everywhere-src-6.4.2.tar.xz) = qIvGztuzSHikmmIrqnnKznjPutT5X9vTZW3bIccFUl0=
-SIZE (qt/qtbase-everywhere-src-6.4.2.tar.xz) = 47987188
+SHA256 (qt/qtbase-everywhere-src-6.5.0.tar.xz) = /eGqe0++ZOwbT8V2pX9GiK0UU9L6tZy63ZSKEKbq9e8=
+SIZE (qt/qtbase-everywhere-src-6.5.0.tar.xz) = 48020636
Index: qtbase/patches/patch-cmake_QtBuild_cmake
===================================================================
RCS file: /cvs/ports/x11/qt6/qtbase/patches/patch-cmake_QtBuild_cmake,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-cmake_QtBuild_cmake
--- qtbase/patches/patch-cmake_QtBuild_cmake 6 Dec 2022 14:22:51 -0000 1.4
+++ qtbase/patches/patch-cmake_QtBuild_cmake 4 Apr 2023 18:46:43 -0000
@@ -1,7 +1,7 @@
Index: cmake/QtBuild.cmake
--- cmake/QtBuild.cmake.orig
+++ cmake/QtBuild.cmake
-@@ -419,6 +419,20 @@ if(CMAKE_HOST_APPLE AND APPLE)
+@@ -433,6 +433,20 @@ if(CMAKE_HOST_APPLE AND APPLE)
set(CMAKE_${lang}_ARCHIVE_APPEND "<CMAKE_AR> qS <TARGET> <LINK_FLAGS> <OBJECTS>")
set(CMAKE_${lang}_ARCHIVE_FINISH "<CMAKE_RANLIB> -no_warning_for_no_symbols <TARGET>")
endforeach()
Index: qtbase/patches/patch-cmake_QtCompilerOptimization_cmake
===================================================================
RCS file: /cvs/ports/x11/qt6/qtbase/patches/patch-cmake_QtCompilerOptimization_cmake,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-cmake_QtCompilerOptimization_cmake
--- qtbase/patches/patch-cmake_QtCompilerOptimization_cmake 6 Dec 2022 14:22:51 -0000 1.4
+++ qtbase/patches/patch-cmake_QtCompilerOptimization_cmake 4 Apr 2023 18:46:43 -0000
@@ -1,16 +1,16 @@
Index: cmake/QtCompilerOptimization.cmake
--- cmake/QtCompilerOptimization.cmake.orig
+++ cmake/QtCompilerOptimization.cmake
-@@ -73,7 +73,7 @@ endif()
+@@ -75,7 +75,7 @@ endif()
# gcc and clang base
- if(GCC OR CLANG AND NOT WASM)
+ if(GCC OR CLANG)
set(QT_CFLAGS_OPTIMIZE "-O2")
- set(QT_CFLAGS_OPTIMIZE_FULL "-O3")
+ set(QT_CFLAGS_OPTIMIZE_FULL "")
set(QT_CFLAGS_OPTIMIZE_DEBUG "-Og")
set(QT_CFLAGS_OPTIMIZE_SIZE "-Os")

-@@ -84,7 +84,7 @@ endif()
+@@ -86,7 +86,7 @@ endif()

# Flags that CMake might set, aka flags the compiler would see as valid values.
if(GCC OR CLANG OR QCC)
Index: qtbase/patches/patch-cmake_QtFeature_cmake
===================================================================
RCS file: /cvs/ports/x11/qt6/qtbase/patches/patch-cmake_QtFeature_cmake,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-cmake_QtFeature_cmake
--- qtbase/patches/patch-cmake_QtFeature_cmake 6 May 2022 18:59:59 -0000 1.3
+++ qtbase/patches/patch-cmake_QtFeature_cmake 4 Apr 2023 18:46:43 -0000
@@ -1,7 +1,7 @@
Index: cmake/QtFeature.cmake
--- cmake/QtFeature.cmake.orig
+++ cmake/QtFeature.cmake
-@@ -1054,7 +1054,23 @@ function(qt_get_platform_try_compile_vars out_var)
+@@ -1067,7 +1067,23 @@ function(qt_get_platform_try_compile_vars out_var)
set("${out_var}" "${flags_cmd_line}" PARENT_SCOPE)
endfunction()

Index: qtbase/patches/patch-cmake_QtProcessConfigureArgs_cmake
===================================================================
RCS file: /cvs/ports/x11/qt6/qtbase/patches/patch-cmake_QtProcessConfigureArgs_cmake,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-cmake_QtProcessConfigureArgs_cmake
--- qtbase/patches/patch-cmake_QtProcessConfigureArgs_cmake 6 Dec 2022 14:22:51 -0000 1.4
+++ qtbase/patches/patch-cmake_QtProcessConfigureArgs_cmake 4 Apr 2023 18:46:43 -0000
@@ -1,7 +1,7 @@
Index: cmake/QtProcessConfigureArgs.cmake
--- cmake/QtProcessConfigureArgs.cmake.orig
+++ cmake/QtProcessConfigureArgs.cmake
-@@ -177,6 +177,7 @@ defstub(qt_feature_definition)
+@@ -206,6 +206,7 @@ defstub(qt_feature_definition)
defstub(qt_find_package)
defstub(set_package_properties)
defstub(qt_qml_find_python)
Index: qtbase/patches/patch-cmake_QtRpathHelpers_cmake
===================================================================
RCS file: /cvs/ports/x11/qt6/qtbase/patches/patch-cmake_QtRpathHelpers_cmake,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-cmake_QtRpathHelpers_cmake
--- qtbase/patches/patch-cmake_QtRpathHelpers_cmake 6 Dec 2022 14:22:51 -0000 1.2
+++ qtbase/patches/patch-cmake_QtRpathHelpers_cmake 4 Apr 2023 18:46:43 -0000
@@ -1,7 +1,7 @@
Index: cmake/QtRpathHelpers.cmake
--- cmake/QtRpathHelpers.cmake.orig
+++ cmake/QtRpathHelpers.cmake
-@@ -3,7 +3,7 @@
+@@ -6,7 +6,7 @@
function(qt_internal_get_relative_rpath_base_token out_var)
if(APPLE)
set(rpath_rel_base "@loader_path")
Index: qtbase/patches/patch-mkspecs_features_qt_module_prf
===================================================================
RCS file: qtbase/patches/patch-mkspecs_features_qt_module_prf
diff -N qtbase/patches/patch-mkspecs_features_qt_module_prf
--- qtbase/patches/patch-mkspecs_features_qt_module_prf 11 Mar 2022 20:17:12 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-Index: mkspecs/features/qt_module.prf
---- mkspecs/features/qt_module.prf.orig
-+++ mkspecs/features/qt_module.prf
-@@ -212,6 +212,7 @@ equals(QT_ARCH, i386):contains(QT_CPU_FEATURES.$$QT_AR
- }
-
- android: CONFIG += qt_android_deps no_linker_version_script
-+openbsd-*: CONFIG += no_linker_version_script
-
- !header_module:unix:!isEmpty(QMAKE_LFLAGS_VERSION_SCRIPT):!no_linker_version_script:!static {
- verscript = $${TARGET}.version
Index: qtbase/patches/patch-qmake_generators_unix_unixmake2_cpp
===================================================================
RCS file: /cvs/ports/x11/qt6/qtbase/patches/patch-qmake_generators_unix_unixmake2_cpp,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-qmake_generators_unix_unixmake2_cpp
--- qtbase/patches/patch-qmake_generators_unix_unixmake2_cpp 6 Dec 2022 14:22:51 -0000 1.4
+++ qtbase/patches/patch-qmake_generators_unix_unixmake2_cpp 4 Apr 2023 18:46:43 -0000
@@ -1,7 +1,7 @@
Index: qmake/generators/unix/unixmake2.cpp
--- qmake/generators/unix/unixmake2.cpp.orig
+++ qmake/generators/unix/unixmake2.cpp
-@@ -41,6 +41,10 @@ UnixMakefileGenerator::writeMakefile(QTextStream &t)
+@@ -42,6 +42,10 @@ UnixMakefileGenerator::writeMakefile(QTextStream &t)
if (writeDummyMakefile(t))
return true;

@@ -12,7 +12,7 @@ Index: qmake/generators/unix/unixmake2.c
if (project->first("TEMPLATE") == "app" ||
project->first("TEMPLATE") == "lib" ||
project->first("TEMPLATE") == "aux") {
-@@ -167,16 +171,17 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
+@@ -168,16 +172,17 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
writeExportedVariables(t);

t << "####### Compiler, tools and options\n\n";
@@ -37,7 +37,7 @@ Index: qmake/generators/unix/unixmake2.c
for(int i = 0; i < incs.size(); ++i) {
const ProString &inc = incs.at(i);
if (inc.isEmpty())
-@@ -192,9 +197,9 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
+@@ -193,9 +198,9 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
writeDefaultVariables(t);

if(!project->isActiveConfig("staticlib")) {
@@ -49,7 +49,7 @@ Index: qmake/generators/unix/unixmake2.c
<< fixLibFlags("LIBS_PRIVATE").join(' ') << ' '
<< fixLibFlags("QMAKE_LIBS").join(' ') << ' '
<< fixLibFlags("QMAKE_LIBS_PRIVATE").join(' ') << Qt::endl;
-@@ -202,8 +207,8 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
+@@ -203,8 +208,8 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)

t << "AR = " << var("QMAKE_AR") << Qt::endl;
t << "RANLIB = " << var("QMAKE_RANLIB") << Qt::endl;
@@ -60,7 +60,7 @@ Index: qmake/generators/unix/unixmake2.c

t << Qt::endl;

-@@ -237,12 +242,19 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
+@@ -238,12 +243,19 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
t << "TARGET0 = " << fileVar("TARGET_") << Qt::endl;
} else if (!project->isActiveConfig("unversioned_libname")) {
t << "TARGET0 = " << fileVar("TARGET_") << Qt::endl;
@@ -85,7 +85,7 @@ Index: qmake/generators/unix/unixmake2.c
}
}
}
-@@ -576,7 +588,8 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
+@@ -577,7 +589,8 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
if(!project->isEmpty("QMAKE_POST_LINK"))
t << "\n\t" << var("QMAKE_POST_LINK");
t << Qt::endl << Qt::endl;
@@ -95,7 +95,7 @@ Index: qmake/generators/unix/unixmake2.c
t << "\n\t";

if (!project->isActiveConfig("unversioned_libname"))
-@@ -610,7 +623,22 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
+@@ -611,7 +624,22 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
if(!project->isEmpty("QMAKE_POST_LINK"))
t << "\n\t" << var("QMAKE_POST_LINK");
t << Qt::endl << Qt::endl;
@@ -118,7 +118,7 @@ Index: qmake/generators/unix/unixmake2.c
t << "\n\t"
<< "-$(DEL_FILE) $(TARGET) $(TARGET0)\n\t"
<< var("QMAKE_LINK_SHLIB_CMD") << "\n\t";
-@@ -1239,6 +1267,12 @@ void UnixMakefileGenerator::init2()
+@@ -1242,6 +1270,12 @@ void UnixMakefileGenerator::init2()
project->values("TARGET_x").append("lib" + project->first("TARGET") + "." +
project->first("VER_MAJ"));
project->values("TARGET") = project->values("TARGET_x");
@@ -131,8 +131,8 @@ Index: qmake/generators/unix/unixmake2.c
} else if (!project->isEmpty("QMAKE_AIX_SHLIB")) {
project->values("PRL_TARGET").prepend("lib" + project->first("TARGET"));
project->values("TARGET_").append(project->first("QMAKE_PREFIX_STATICLIB") + project->first("TARGET")
-@@ -1478,18 +1512,33 @@ UnixMakefileGenerator::writeLibtoolFile()
- << qVersion() << ")";
+@@ -1481,18 +1515,33 @@ UnixMakefileGenerator::writeLibtoolFile()
+ << QT_VERSION_STR << ")";
t << "\n";

+ if (!project->isEmpty("QMAKE_OPENBSD_SHLIB"))
Index: qtbase/patches/patch-src_corelib_plugin_qelfparser_p_cpp
===================================================================
RCS file: /cvs/ports/x11/qt6/qtbase/patches/patch-src_corelib_plugin_qelfparser_p_cpp,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-src_corelib_plugin_qelfparser_p_cpp
--- qtbase/patches/patch-src_corelib_plugin_qelfparser_p_cpp 7 Jan 2023 11:18:57 -0000 1.4
+++ qtbase/patches/patch-src_corelib_plugin_qelfparser_p_cpp 4 Apr 2023 18:46:43 -0000
@@ -1,7 +1,7 @@
Index: src/corelib/plugin/qelfparser_p.cpp
--- src/corelib/plugin/qelfparser_p.cpp.orig
+++ src/corelib/plugin/qelfparser_p.cpp
-@@ -332,9 +332,9 @@ Q_DECL_UNUSED Q_DECL_COLD_FUNCTION static QDebug &oper
+@@ -340,9 +340,9 @@ Q_DECL_UNUSED Q_DECL_COLD_FUNCTION static QDebug &oper
case ELFOSABI_SYSV: d << " (SYSV"; break;
case ELFOSABI_HPUX: d << " (HP-UX"; break;
case ELFOSABI_NETBSD: d << " (NetBSD"; break;
@@ -13,7 +13,7 @@ Index: src/corelib/plugin/qelfparser_p.c
case ELFOSABI_IRIX: d << " (IRIX"; break;
case ELFOSABI_FREEBSD: d << " (FreeBSD"; break;
case ELFOSABI_OPENBSD: d << " (OpenBSD"; break;
-@@ -388,7 +388,7 @@ Q_DECL_UNUSED Q_DECL_COLD_FUNCTION static QDebug &oper
+@@ -402,7 +402,7 @@ Q_DECL_UNUSED Q_DECL_COLD_FUNCTION static QDebug &oper
#ifdef EM_RISCV
case EM_RISCV: d << ", RISC-V"; break;