On Mon Jan 22, 2024 at 12:31:14AM +0100, Rafael Sadowski wrote:
> Hi ports hackers,
>
> here is a reworked diff to update Qt6 to 6.6.1.
>
> Notable changes:
>
> - I added python as new dependency to qtbase to use compileall.py.
> Objections to do this?
>
> tb@ could you again double check the ssl bits?
>
> I built all Qt6 consumers to make sure they build and package fine.
>
> If I don't hear any objections I would commit next Sunday.
>
> Rafael
>
New diff that includes feedback form tb@ (ssl diff tweaks) and kn@
(python tweaks).
diff --git a/x11/qt6/Makefile.version b/x11/qt6/Makefile.version
index 7cff813d082..0ebbbe2fc94 100644
--- a/x11/qt6/Makefile.version
+++ b/x11/qt6/Makefile.version
@@ -1,6 +1,8 @@
# Common source for Qt6 version
-QT6_VERSION = 6.5.2
+QT6_VERSION = 6.6.1
+
+QT6_WEBENGINE_VERSION = 6.5.2
# This one is used for building dependencies for examples and documentation,
# which obviously should be in sync with core packages.
-QT6_NEXT_VERSION = 6.6
+QT6_NEXT_VERSION = 6.7.0
diff --git a/x11/qt6/qt3d/Makefile b/x11/qt6/qt3d/Makefile
index 4de2dc09f9a..76da86df196 100644
--- a/x11/qt6/qt3d/Makefile
+++ b/x11/qt6/qt3d/Makefile
@@ -2,22 +2,22 @@ QT6NAME = Qt3D
COMMENT = Qt6 components for 3D graphics
PKGSPEC = qt6-qt3d-${QT6_PKGSPEC}
-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
+SHARED_LIBS += Qt63DAnimation 1.0 # 6.6
+SHARED_LIBS += Qt63DCore 1.1 # 6.6
+SHARED_LIBS += Qt63DExtras 1.0 # 6.6
+SHARED_LIBS += Qt63DInput 1.0 # 6.6
+SHARED_LIBS += Qt63DLogic 1.0 # 6.6
+SHARED_LIBS += Qt63DQuick 1.0 # 6.6
+SHARED_LIBS += Qt63DQuickAnimation 1.0 # 6.6
+SHARED_LIBS += Qt63DQuickExtras 1.0 # 6.6
+SHARED_LIBS += Qt63DQuickInput 1.0 # 6.6
+SHARED_LIBS += Qt63DQuickRender 2.0 # 6.6
+SHARED_LIBS += Qt63DQuickScene2D 1.0 # 6.6
+SHARED_LIBS += Qt63DRender 1.0 # 6.6
WANTLIB += ${COMPILER_LIBCXX} GL Qt6Concurrent Qt6Core Qt6Gui
WANTLIB += Qt6Network Qt6OpenGL Qt6Qml Qt6QmlModels Qt6Quick Qt6ShaderTools
-WANTLIB += assimp c m xkbcommon
+WANTLIB += assimp c m xkbcommon z
BUILD_DEPENDS = x11/qt6/qtmultimedia \
graphics/vulkan-loader
diff --git a/x11/qt6/qt3d/distinfo b/x11/qt6/qt3d/distinfo
index 614496f4f3c..9833c8dbee6 100644
--- a/x11/qt6/qt3d/distinfo
+++ b/x11/qt6/qt3d/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qt/qt3d-everywhere-src-6.5.2.tar.xz) = IfBk2yGtG/xVR/1OjLoJrMjBh95Y1+7iBvZUmrni+RA=
-SIZE (qt/qt3d-everywhere-src-6.5.2.tar.xz) = 161691776
+SHA256 (qt/qt3d-everywhere-src-6.6.1.tar.xz) = 84Su108Upxxo9gejsehZ6iJ0boJlDndf1A8GU8JEMik=
+SIZE (qt/qt3d-everywhere-src-6.6.1.tar.xz) = 163183224
diff --git a/x11/qt6/qt3d/pkg/PLIST b/x11/qt6/qt3d/pkg/PLIST
index 43846b8ca22..9ca5b38ff0f 100644
--- a/x11/qt6/qt3d/pkg/PLIST
+++ b/x11/qt6/qt3d/pkg/PLIST
@@ -133,7 +133,9 @@ include/X11/qt6/Qt3DCore/${VERSION}/Qt3DCore/private/calcboundingvolumejob_p.h
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
include/X11/qt6/Qt3DCore/${VERSION}/Qt3DCore/private/propertychangehandler_p.h
include/X11/qt6/Qt3DCore/${VERSION}/Qt3DCore/private/qabstractaspect_p.h
@@ -193,7 +195,9 @@ include/X11/qt6/Qt3DCore/${VERSION}/Qt3DCore/private/qurlhelper_p.h
include/X11/qt6/Qt3DCore/${VERSION}/Qt3DCore/private/sqt_p.h
include/X11/qt6/Qt3DCore/${VERSION}/Qt3DCore/private/task_p.h
include/X11/qt6/Qt3DCore/${VERSION}/Qt3DCore/private/vector3d_p.h
+include/X11/qt6/Qt3DCore/${VERSION}/Qt3DCore/private/vector3d_sse_p.h
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/QAbstractAspect
include/X11/qt6/Qt3DCore/QAbstractFunctor
diff --git a/x11/qt6/qt5compat/distinfo b/x11/qt6/qt5compat/distinfo
index 88b854e8b3b..0e2d582135f 100644
--- a/x11/qt6/qt5compat/distinfo
+++ b/x11/qt6/qt5compat/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qt/qt5compat-everywhere-src-6.5.2.tar.xz) = uavkLuIFXCeo51eceBYGnpGq4fmxBkm/Vy24upb6kcQ=
-SIZE (qt/qt5compat-everywhere-src-6.5.2.tar.xz) = 14638008
+SHA256 (qt/qt5compat-everywhere-src-6.6.1.tar.xz) = Dh0Vtu2kFyODIIEJ2VclfI+iaoqIHykBpOnzR6MbwfI=
+SIZE (qt/qt5compat-everywhere-src-6.6.1.tar.xz) = 14640664
diff --git a/x11/qt6/qtbase/Makefile b/x11/qt6/qtbase/Makefile
index bcb64a97b98..efc43f7a4a3 100644
--- a/x11/qt6/qtbase/Makefile
+++ b/x11/qt6/qtbase/Makefile
@@ -13,27 +13,25 @@ PKGNAME-psql = qt6-postgresql-${VERSION}
PKG_ARCH-global = *
-REVISION-main = 1
-
DPB_PROPERTIES = parallel
-SHARED_LIBS += Qt6Concurrent 0.1 # 6.5
-SHARED_LIBS += Qt6Core 3.0 # 6.5
-SHARED_LIBS += Qt6DBus 2.0 # 6.5
-SHARED_LIBS += Qt6Gui 4.0 # 6.5
-SHARED_LIBS += Qt6Network 2.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.1 # 6.5
-SHARED_LIBS += Qt6EglFsKmsGbmSupport 0.2 # 6.5
-SHARED_LIBS += Qt6OpenGLWidgets 1.0 # 6.5
+SHARED_LIBS += Qt6Concurrent 0.1 # 6.6
+SHARED_LIBS += Qt6Core 4.0 # 6.6
+SHARED_LIBS += Qt6DBus 2.1 # 6.6
+SHARED_LIBS += Qt6Gui 5.0 # 6.6
+SHARED_LIBS += Qt6Network 2.1 # 6.6
+SHARED_LIBS += Qt6OpenGL 2.0 # 6.6
+SHARED_LIBS += Qt6PrintSupport 0.2 # 6.6
+SHARED_LIBS += Qt6Sql 2.0 # 6.6
+SHARED_LIBS += Qt6Test 3.0 # 6.6
+SHARED_LIBS += Qt6Widgets 2.0 # 6.6
+SHARED_LIBS += Qt6Xml 1.0 # 6.6
+SHARED_LIBS += Qt6EglFSDeviceIntegration 1.0 # 6.6
+SHARED_LIBS += Qt6EglFsKmsSupport 1.0 # 6.6
+SHARED_LIBS += Qt6OpenGLExtensions 0.1 # 6.6
+SHARED_LIBS += Qt6XcbQpa 2.1 # 6.6
+SHARED_LIBS += Qt6EglFsKmsGbmSupport 0.2 # 6.6
+SHARED_LIBS += Qt6OpenGLWidgets 1.0 # 6.6
WANTLIB-global =
@@ -57,6 +55,10 @@ WANTLIB-psql += ${COMPILER_LIBCXX} Qt6Core Qt6Sql c execinfo m pq
MULTI_PACKAGES = -main -global -mysql -psql
+MODULES = lang/python
+CONFIGURE_STYLE = cmake
+MODPY_RUNDEP = No
+
LIB_DEPENDS-main = ${LIB_DEPENDS} \
archivers/brotli \
archivers/zstd \
@@ -125,6 +127,10 @@ MODCMAKE_LDFLAGS += -lexecinfo
MODQT6_DEPS = No
+MODPY_ADJ_FILES = util/testrunner/qt-testrunner.py \
+ util/testrunner/sanitizer-testrunner.py \
+ mkspecs/features/uikit/devices.py
+
post-extract:
mkdir -p ${WRKDIST}/mkspecs/openbsd-clang
cp ${FILESDIR}/clang-qmake.conf \
@@ -132,6 +138,12 @@ post-extract:
cp ${WRKDIST}/mkspecs/openbsd-g++/qplatformdefs.h \
${WRKDIST}/mkspecs/openbsd-clang/
+post-install:
+ ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
+ ${PREFIX}/lib/qt6/libexec/qt-testrunner.py \
+ ${PREFIX}/lib/qt6/libexec/sanitizer-testrunner.py\
+ ${PREFIX}/lib/qt6/mkspecs/features/uikit/devices.py
+
.include <bsd.port.mk>
.if ${USE_CCACHE:L} == "yes"
diff --git a/x11/qt6/qtbase/distinfo b/x11/qt6/qtbase/distinfo
index d08c32fe434..d88ef925352 100644
--- a/x11/qt6/qtbase/distinfo
+++ b/x11/qt6/qtbase/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qt/qtbase-everywhere-src-6.5.2.tar.xz) = PbTHKbTYCp2P2o3XcShAY1O6/0dVymGRd+2kzdrnEmk=
-SIZE (qt/qtbase-everywhere-src-6.5.2.tar.xz) = 48410716
+SHA256 (qt/qtbase-everywhere-src-6.6.1.tar.xz) = RQxbRney/kDtB5VNfw9AaQBo6AqUyd+GwskFzNWdAvc=
+SIZE (qt/qtbase-everywhere-src-6.6.1.tar.xz) = 48370760
diff --git a/x11/qt6/qtbase/patches/patch-cmake_QtBuild_cmake b/x11/qt6/qtbase/patches/patch-cmake_QtBuild_cmake
index 37ed43895d8..ffaa63b266f 100644
--- a/x11/qt6/qtbase/patches/patch-cmake_QtBuild_cmake
+++ b/x11/qt6/qtbase/patches/patch-cmake_QtBuild_cmake
@@ -1,7 +1,7 @@
Index: cmake/QtBuild.cmake
--- cmake/QtBuild.cmake.orig
+++ cmake/QtBuild.cmake
-@@ -441,6 +441,20 @@ if(CMAKE_HOST_APPLE AND APPLE)
+@@ -441,6 +441,20 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "AppleClang")
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()
diff --git a/x11/qt6/qtbase/patches/patch-cmake_QtFeature_cmake b/x11/qt6/qtbase/patches/patch-cmake_QtFeature_cmake
index d1382dbc45f..bb708810504 100644
--- a/x11/qt6/qtbase/patches/patch-cmake_QtFeature_cmake
+++ b/x11/qt6/qtbase/patches/patch-cmake_QtFeature_cmake
@@ -1,7 +1,7 @@
Index: cmake/QtFeature.cmake
--- cmake/QtFeature.cmake.orig
+++ cmake/QtFeature.cmake
-@@ -1068,7 +1068,23 @@ function(qt_get_platform_try_compile_vars out_var)
+@@ -1194,7 +1194,23 @@ function(qt_get_platform_try_compile_vars out_var)
set("${out_var}" "${flags_cmd_line}" PARENT_SCOPE)
endfunction()
diff --git a/x11/qt6/qtbase/patches/patch-cmake_QtProcessConfigureArgs_cmake b/x11/qt6/qtbase/patches/patch-cmake_QtProcessConfigureArgs_cmake
index 0f3e2ccb8b0..5a3c62d22d1 100644
--- a/x11/qt6/qtbase/patches/patch-cmake_QtProcessConfigureArgs_cmake
+++ b/x11/qt6/qtbase/patches/patch-cmake_QtProcessConfigureArgs_cmake
@@ -1,7 +1,7 @@
Index: cmake/QtProcessConfigureArgs.cmake
--- cmake/QtProcessConfigureArgs.cmake.orig
+++ cmake/QtProcessConfigureArgs.cmake
-@@ -210,6 +210,7 @@ defstub(qt_feature_definition)
+@@ -238,6 +238,7 @@ defstub(qt_feature_definition)
defstub(qt_find_package)
defstub(set_package_properties)
defstub(qt_qml_find_python)
diff --git a/x11/qt6/qtbase/patches/patch-src_gui_platform_unix_qxkbcommon_cpp b/x11/qt6/qtbase/patches/patch-src_gui_platform_unix_qxkbcommon_cpp
deleted file mode 100644
index f1f8c0e70b0..00000000000
--- a/x11/qt6/qtbase/patches/patch-src_gui_platform_unix_qxkbcommon_cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-From 8af35d27e8f02bbb99aef4ac495ed406e50e3cca Mon Sep 17 00:00:00 2001
-From: Liang Qi <liang.qi@qt.io>
-Date: Tue, 10 Oct 2023 14:08:48 +0200
-Subject: [PATCH] xkb: fix build with libxkbcommon 1.6.0 and later
-
-Index: src/gui/platform/unix/qxkbcommon.cpp
---- src/gui/platform/unix/qxkbcommon.cpp.orig
-+++ src/gui/platform/unix/qxkbcommon.cpp
-@@ -239,10 +239,14 @@ static constexpr const auto KeyTbl = qMakeArray(
- Xkb2Qt<XKB_KEY_dead_small_schwa, Qt::Key_Dead_Small_Schwa>,
- Xkb2Qt<XKB_KEY_dead_capital_schwa, Qt::Key_Dead_Capital_Schwa>,
- Xkb2Qt<XKB_KEY_dead_greek, Qt::Key_Dead_Greek>,
-+/* The following four XKB_KEY_dead keys got removed in libxkbcommon 1.6.0
-+ The define check is kind of version check here. */
-+#ifdef XKB_KEY_dead_lowline
- Xkb2Qt<XKB_KEY_dead_lowline, Qt::Key_Dead_Lowline>,
- Xkb2Qt<XKB_KEY_dead_aboveverticalline, Qt::Key_Dead_Aboveverticalline>,
- Xkb2Qt<XKB_KEY_dead_belowverticalline, Qt::Key_Dead_Belowverticalline>,
- Xkb2Qt<XKB_KEY_dead_longsolidusoverlay, Qt::Key_Dead_Longsolidusoverlay>,
-+
No comments:
Post a Comment