Re: UPDATE: x11/qt6

On Mon Dec 05, 2022 at 06:49:40PM +0100, Rafael Sadowski wrote:
> Here is an update from Qt 6.3.1 to 6.4.1. Please test with your favorite
> consumers.
>
> Cheers,
>
> Rafael
>

Tweaked after feedback form tb@. Build test with all consumers.


Index: Makefile.version
===================================================================
RCS file: /cvs/ports/x11/qt6/Makefile.version,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile.version
--- Makefile.version 17 Jun 2022 12:55:26 -0000 1.5
+++ Makefile.version 5 Dec 2022 21:00:33 -0000
@@ -1,6 +1,6 @@
# Common source for Qt6 version
-QT6_VERSION = 6.3.1
+QT6_VERSION = 6.4.1

# This one is used for building dependencies for examples and documentation,
# which obviously should be in sync with core packages.
-QT6_NEXT_VERSION = 6.4
+QT6_NEXT_VERSION = 6.5
Index: qt3d/Makefile
===================================================================
RCS file: /cvs/ports/x11/qt6/qt3d/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- qt3d/Makefile 23 Oct 2022 10:55:13 -0000 1.3
+++ qt3d/Makefile 5 Dec 2022 21:00:33 -0000
@@ -1,30 +1,30 @@
-QT6NAME = Qt3D
-COMMENT = Qt6 components for 3D graphics
-REVISION = 1
+QT6NAME = Qt3D
+COMMENT = Qt6 components for 3D graphics
+PKGSPEC = qt6-qt3d-${QT6_PKGSPEC}

-SHARED_LIBS += Qt63DAnimation 0.0 # 0.0
-SHARED_LIBS += Qt63DCore 0.0 # 0.0
-SHARED_LIBS += Qt63DExtras 0.0 # 0.0
-SHARED_LIBS += Qt63DInput 0.0 # 0.0
+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.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.0 # 0.0
+SHARED_LIBS += Qt63DQuickRender 0.1 # 0.0
SHARED_LIBS += Qt63DQuickScene2D 0.0 # 0.0
-SHARED_LIBS += Qt63DRender 0.0 # 0.0
+SHARED_LIBS += Qt63DRender 1.0 # 0.0

WANTLIB += ${COMPILER_LIBCXX} GL Qt6Concurrent Qt6Core Qt6Gui
WANTLIB += Qt6Network Qt6OpenGL Qt6Qml Qt6QmlModels Qt6Quick Qt6ShaderTools
WANTLIB += assimp c m xkbcommon

-BUILD_DEPENDS = x11/qt6/qtmultimedia \
- graphics/vulkan-loader
+BUILD_DEPENDS = x11/qt6/qtmultimedia \
+ graphics/vulkan-loader

-LIB_DEPENDS = multimedia/assimp \
- x11/qt6/qtshadertools \
- x11/qt6/qtdeclarative
+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.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- qt3d/distinfo 30 Aug 2022 05:20:06 -0000 1.1.1.1
+++ qt3d/distinfo 5 Dec 2022 21:00:33 -0000
@@ -1,2 +1,2 @@
-SHA256 (qt/qt3d-everywhere-src-6.3.1.tar.xz) = mRm2bfslP6JtsafWZDWMvAf0bIgQCC7jEg0KVLFT7f4=
-SIZE (qt/qt3d-everywhere-src-6.3.1.tar.xz) = 104053756
+SHA256 (qt/qt3d-everywhere-src-6.4.1.tar.xz) = 5LUyQ76l0LEqVf4ou1FFHqMqjdQkz3Kli22bSUCHpJg=
+SIZE (qt/qt3d-everywhere-src-6.4.1.tar.xz) = 104016460
Index: qt3d/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/qt6/qt3d/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- qt3d/pkg/PLIST 30 Aug 2022 05:20:06 -0000 1.1.1.1
+++ qt3d/pkg/PLIST 5 Dec 2022 21:00:33 -0000
@@ -1247,6 +1247,7 @@ lib/cmake/Qt63DRender/Qt63DRenderConfig.
lib/cmake/Qt63DRender/Qt63DRenderConfigVersion.cmake
lib/cmake/Qt63DRender/Qt63DRenderConfigVersionImpl.cmake
lib/cmake/Qt63DRender/Qt63DRenderDependencies.cmake
+lib/cmake/Qt63DRender/Qt63DRenderPlugins.cmake
lib/cmake/Qt63DRender/Qt63DRenderTargets${MODCMAKE_BUILD_SUFFIX}
lib/cmake/Qt63DRender/Qt63DRenderTargets.cmake
lib/cmake/Qt63DRender/Qt63DRenderVersionlessTargets.cmake
Index: qt5compat/Makefile
===================================================================
RCS file: /cvs/ports/x11/qt6/qt5compat/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- qt5compat/Makefile 12 May 2022 09:40:32 -0000 1.4
+++ qt5compat/Makefile 5 Dec 2022 21:00:33 -0000
@@ -1,15 +1,15 @@
QT6NAME = Qt5Compat
COMMENT = Qt6 module contains unsupported Qt 5 APIs
-
PKGSPEC = qt6-qt5compat-${QT6_PKGSPEC}

-SHARED_LIBS += Qt6Core5Compat 0.1 # 6.3
+SHARED_LIBS += Qt6Core5Compat 0.2 # 6.4

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

LIB_DEPENDS = x11/qt6/qtdeclarative \
+ x11/qt6/qtshadertools \
x11/xkbcommon

.include <bsd.port.mk>
Index: qt5compat/distinfo
===================================================================
RCS file: /cvs/ports/x11/qt6/qt5compat/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- qt5compat/distinfo 17 Jun 2022 12:55:26 -0000 1.4
+++ qt5compat/distinfo 5 Dec 2022 21:00:33 -0000
@@ -1,2 +1,2 @@
-SHA256 (qt/qt5compat-everywhere-src-6.3.1.tar.xz) = pD7GK9d46uz4iteEcRjRwqRxsPy4IPk76zEderlWbP0=
-SIZE (qt/qt5compat-everywhere-src-6.3.1.tar.xz) = 8195804
+SHA256 (qt/qt5compat-everywhere-src-6.4.1.tar.xz) = 1KUz7kXWNBuetALmm8IZCe7u2istKabHFbMcPsEv0DE=
+SIZE (qt/qt5compat-everywhere-src-6.4.1.tar.xz) = 14637884
Index: qt5compat/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/qt6/qt5compat/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- qt5compat/pkg/PLIST 17 Jun 2022 12:55:26 -0000 1.5
+++ qt5compat/pkg/PLIST 5 Dec 2022 21:00:33 -0000
@@ -94,27 +94,41 @@ lib/qt6/mkspecs/modules/qt_lib_core5comp
lib/qt6/mkspecs/modules/qt_lib_core5compat_private.pri
lib/qt6/qml/Qt5Compat/
lib/qt6/qml/Qt5Compat/GraphicalEffects/
+lib/qt6/qml/Qt5Compat/GraphicalEffects/Blend.qml
lib/qt6/qml/Qt5Compat/GraphicalEffects/BrightnessContrast.qml
lib/qt6/qml/Qt5Compat/GraphicalEffects/ColorOverlay.qml
lib/qt6/qml/Qt5Compat/GraphicalEffects/Colorize.qml
lib/qt6/qml/Qt5Compat/GraphicalEffects/ConicalGradient.qml
lib/qt6/qml/Qt5Compat/GraphicalEffects/Desaturate.qml
+lib/qt6/qml/Qt5Compat/GraphicalEffects/DirectionalBlur.qml
lib/qt6/qml/Qt5Compat/GraphicalEffects/Displace.qml
lib/qt6/qml/Qt5Compat/GraphicalEffects/DropShadow.qml
lib/qt6/qml/Qt5Compat/GraphicalEffects/FastBlur.qml
lib/qt6/qml/Qt5Compat/GraphicalEffects/GammaAdjust.qml
+lib/qt6/qml/Qt5Compat/GraphicalEffects/GaussianBlur.qml
lib/qt6/qml/Qt5Compat/GraphicalEffects/Glow.qml
lib/qt6/qml/Qt5Compat/GraphicalEffects/HueSaturation.qml
+lib/qt6/qml/Qt5Compat/GraphicalEffects/InnerShadow.qml
lib/qt6/qml/Qt5Compat/GraphicalEffects/LevelAdjust.qml
lib/qt6/qml/Qt5Compat/GraphicalEffects/LinearGradient.qml
+lib/qt6/qml/Qt5Compat/GraphicalEffects/MaskedBlur.qml
lib/qt6/qml/Qt5Compat/GraphicalEffects/OpacityMask.qml
+lib/qt6/qml/Qt5Compat/GraphicalEffects/RadialBlur.qml
lib/qt6/qml/Qt5Compat/GraphicalEffects/RadialGradient.qml
lib/qt6/qml/Qt5Compat/GraphicalEffects/RectangularGlow.qml
+lib/qt6/qml/Qt5Compat/GraphicalEffects/RecursiveBlur.qml
lib/qt6/qml/Qt5Compat/GraphicalEffects/ThresholdMask.qml
+lib/qt6/qml/Qt5Compat/GraphicalEffects/ZoomBlur.qml
@so lib/qt6/qml/Qt5Compat/GraphicalEffects/libqtgraphicaleffectsplugin.so
lib/qt6/qml/Qt5Compat/GraphicalEffects/plugins.qmltypes
lib/qt6/qml/Qt5Compat/GraphicalEffects/private/
+lib/qt6/qml/Qt5Compat/GraphicalEffects/private/DropShadowBase.qml
lib/qt6/qml/Qt5Compat/GraphicalEffects/private/FastGlow.qml
+lib/qt6/qml/Qt5Compat/GraphicalEffects/private/FastInnerShadow.qml
+lib/qt6/qml/Qt5Compat/GraphicalEffects/private/GaussianDirectionalBlur.qml
+lib/qt6/qml/Qt5Compat/GraphicalEffects/private/GaussianGlow.qml
+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/qmldir
lib/qt6/qml/Qt5Compat/GraphicalEffects/qmldir
Index: qtbase/Makefile
===================================================================
RCS file: /cvs/ports/x11/qt6/qtbase/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- qtbase/Makefile 14 Nov 2022 05:13:03 -0000 1.19
+++ qtbase/Makefile 5 Dec 2022 21:00:33 -0000
@@ -10,30 +10,26 @@ PKGSPEC-main = qt6-qtbase-${QT6_PKGSPEC
PKGNAME-mysql = qt6-mysql-${VERSION}
PKGNAME-global = qt6-global-${VERSION}
PKGNAME-psql = qt6-postgresql-${VERSION}
-REVISION-main = 3
-REVISION-global = 1
-REVISION-mysql = 1
-REVISION-psql = 1

PKG_ARCH-global = *

-SHARED_LIBS += Qt6Concurrent 0.1 # 6.3
-SHARED_LIBS += Qt6Core 0.2 # 6.3
-SHARED_LIBS += Qt6DBus 0.1 # 6.3
-SHARED_LIBS += Qt6Gui 1.0 # 6.3
-SHARED_LIBS += Qt6Network 0.2 # 6.3
-SHARED_LIBS += Qt6OpenGL 0.1 # 6.3
-SHARED_LIBS += Qt6PrintSupport 0.1 # 6.3
-SHARED_LIBS += Qt6Sql 0.1 # 6.3
-SHARED_LIBS += Qt6Test 1.0 # 6.3
-SHARED_LIBS += Qt6Widgets 0.2 # 6.3
-SHARED_LIBS += Qt6Xml 0.1 # 6.3
-SHARED_LIBS += Qt6EglFSDeviceIntegration 0.1 # 6.3
-SHARED_LIBS += Qt6EglFsKmsSupport 0.1 # 6.3
-SHARED_LIBS += Qt6OpenGLExtensions 0.1 # 6.3
-SHARED_LIBS += Qt6XcbQpa 1.0 # 6.3
-SHARED_LIBS += Qt6EglFsKmsGbmSupport 0.1 # 6.3
-SHARED_LIBS += Qt6OpenGLWidgets 0.1 # 6.3
+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

WANTLIB-global =

Index: qtbase/distinfo
===================================================================
RCS file: /cvs/ports/x11/qt6/qtbase/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- qtbase/distinfo 17 Jun 2022 12:55:26 -0000 1.4
+++ qtbase/distinfo 5 Dec 2022 21:00:33 -0000
@@ -1,2 +1,2 @@
-SHA256 (qt/qtbase-everywhere-src-6.3.1.tar.xz) = CmRCHZwkacLEhJCgMquR1UcBfJzBcfP4BwvDGIjyTgM=
-SIZE (qt/qtbase-everywhere-src-6.3.1.tar.xz) = 47118260
+SHA256 (qt/qtbase-everywhere-src-6.4.1.tar.xz) = UyrXHMD5yPfLknZsR7w9IyY8YIdr7NkFOAL5cnryT64=
+SIZE (qt/qtbase-everywhere-src-6.4.1.tar.xz) = 47988872
Index: qtbase/patches/patch-cmake_QtBuild_cmake
===================================================================
RCS file: /cvs/ports/x11/qt6/qtbase/patches/patch-cmake_QtBuild_cmake,v
retrieving revision 1.3
diff -u -p -r1.3 patch-cmake_QtBuild_cmake
--- qtbase/patches/patch-cmake_QtBuild_cmake 6 May 2022 18:59:59 -0000 1.3
+++ qtbase/patches/patch-cmake_QtBuild_cmake 5 Dec 2022 21:00:33 -0000
@@ -1,7 +1,7 @@
Index: cmake/QtBuild.cmake
--- cmake/QtBuild.cmake.orig
+++ cmake/QtBuild.cmake
-@@ -436,6 +436,20 @@ if(CMAKE_HOST_APPLE AND APPLE)
+@@ -419,6 +419,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.3
diff -u -p -r1.3 patch-cmake_QtCompilerOptimization_cmake
--- qtbase/patches/patch-cmake_QtCompilerOptimization_cmake 6 May 2022 18:59:59 -0000 1.3
+++ qtbase/patches/patch-cmake_QtCompilerOptimization_cmake 5 Dec 2022 21:00:33 -0000
@@ -1,7 +1,7 @@
Index: cmake/QtCompilerOptimization.cmake
--- cmake/QtCompilerOptimization.cmake.orig
+++ cmake/QtCompilerOptimization.cmake
-@@ -94,7 +94,7 @@ endif()
+@@ -73,7 +73,7 @@ endif()
# gcc and clang base
if(GCC OR CLANG AND NOT WASM)
set(QT_CFLAGS_OPTIMIZE "-O2")
@@ -10,7 +10,7 @@ Index: cmake/QtCompilerOptimization.cmak
set(QT_CFLAGS_OPTIMIZE_DEBUG "-Og")
set(QT_CFLAGS_OPTIMIZE_SIZE "-Os")

-@@ -105,7 +105,7 @@ endif()
+@@ -84,7 +84,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_QtPlatformSupport_cmake
===================================================================
RCS file: qtbase/patches/patch-cmake_QtPlatformSupport_cmake
diff -N qtbase/patches/patch-cmake_QtPlatformSupport_cmake
--- qtbase/patches/patch-cmake_QtPlatformSupport_cmake 17 Jun 2022 12:55:26 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-Index: cmake/QtPlatformSupport.cmake
---- cmake/QtPlatformSupport.cmake.orig
-+++ cmake/QtPlatformSupport.cmake
-@@ -25,6 +25,8 @@ qt_set01(WEBOS CMAKE_CXX_FLAGS MATCHES "-D__WEBOS__")
-
- qt_set01(BSD APPLE OR OPENBSD OR FREEBSD OR NETBSD)
-
-+qt_set01(X11_PLATFORM LINUX OR HPUX OR OPENBSD OR FREEBSD OR NETBSD OR SOLARIS)
-+
- qt_set01(WINRT WIN32 AND CMAKE_VS_PLATFORM_TOOSLET STREQUAL "winrt") # FIXME: How to identify this?
-
- qt_set01(IOS APPLE AND CMAKE_SYSTEM_NAME STREQUAL "iOS")
Index: qtbase/patches/patch-cmake_QtProcessConfigureArgs_cmake
===================================================================
RCS file: /cvs/ports/x11/qt6/qtbase/patches/patch-cmake_QtProcessConfigureArgs_cmake,v
retrieving revision 1.3
diff -u -p -r1.3 patch-cmake_QtProcessConfigureArgs_cmake
--- qtbase/patches/patch-cmake_QtProcessConfigureArgs_cmake 6 May 2022 18:59:59 -0000 1.3
+++ qtbase/patches/patch-cmake_QtProcessConfigureArgs_cmake 5 Dec 2022 21:00:33 -0000
@@ -1,7 +1,7 @@
Index: cmake/QtProcessConfigureArgs.cmake
--- cmake/QtProcessConfigureArgs.cmake.orig
+++ cmake/QtProcessConfigureArgs.cmake
-@@ -175,6 +175,7 @@ defstub(qt_feature_definition)
+@@ -177,6 +177,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.1
diff -u -p -r1.1 patch-cmake_QtRpathHelpers_cmake
--- qtbase/patches/patch-cmake_QtRpathHelpers_cmake 19 Jun 2022 06:04:49 -0000 1.1
+++ qtbase/patches/patch-cmake_QtRpathHelpers_cmake 5 Dec 2022 21:00:33 -0000
@@ -1,12 +1,12 @@
Index: cmake/QtRpathHelpers.cmake
--- cmake/QtRpathHelpers.cmake.orig
+++ cmake/QtRpathHelpers.cmake
-@@ -27,7 +27,7 @@ function(qt_compute_relative_rpath_base rpath install_
- # needed in the .prf files, but for CMake we need to prepend them ourselves.
+@@ -3,7 +3,7 @@
+ function(qt_internal_get_relative_rpath_base_token out_var)
if(APPLE)
set(rpath_rel_base "@loader_path")
-- elseif(LINUX OR SOLARIS OR FREEBSD)
-+ elseif(LINUX OR SOLARIS OR FREEBSD OR OPENBSD)
+- elseif(LINUX OR SOLARIS OR FREEBSD OR HURD)
++ elseif(LINUX OR SOLARIS OR FREEBSD OR HURD OR OPENBSD)
set(rpath_rel_base "$ORIGIN")
else()
- message(WARNING "No known RPATH_REL_BASE for target platform.")
+ set(rpath_rel_base "NO_KNOWN_RPATH_REL_BASE")
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.3
diff -u -p -r1.3 patch-qmake_generators_unix_unixmake2_cpp
--- qtbase/patches/patch-qmake_generators_unix_unixmake2_cpp 6 May 2022 18:59:59 -0000 1.3
+++ qtbase/patches/patch-qmake_generators_unix_unixmake2_cpp 5 Dec 2022 21:00:33 -0000
@@ -1,7 +1,7 @@
Index: qmake/generators/unix/unixmake2.cpp
--- qmake/generators/unix/unixmake2.cpp.orig
+++ qmake/generators/unix/unixmake2.cpp
-@@ -66,6 +66,10 @@ UnixMakefileGenerator::writeMakefile(QTextStream &t)
+@@ -41,6 +41,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") {
-@@ -192,16 +196,17 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
+@@ -167,16 +171,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())
-@@ -217,9 +222,9 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
+@@ -192,9 +197,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;
-@@ -227,8 +232,8 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
+@@ -202,8 +207,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;

-@@ -262,12 +267,19 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
+@@ -237,12 +242,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
}
}
}
-@@ -601,7 +613,8 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
+@@ -576,7 +588,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"))
-@@ -635,7 +648,22 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
+@@ -610,7 +623,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";
-@@ -1264,6 +1292,12 @@ void UnixMakefileGenerator::init2()
+@@ -1239,6 +1267,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")
-@@ -1503,18 +1537,33 @@ UnixMakefileGenerator::writeLibtoolFile()
- << QT_VERSION_STR << ")";
+@@ -1478,18 +1512,33 @@ UnixMakefileGenerator::writeLibtoolFile()
+ << qVersion() << ")";
t << "\n";

+ if (!project->isEmpty("QMAKE_OPENBSD_SHLIB"))
Index: qtbase/patches/patch-qmake_generators_unix_unixmake_cpp
===================================================================
RCS file: /cvs/ports/x11/qt6/qtbase/patches/patch-qmake_generators_unix_unixmake_cpp,v
retrieving revision 1.2
diff -u -p -r1.2 patch-qmake_generators_unix_unixmake_cpp
--- qtbase/patches/patch-qmake_generators_unix_unixmake_cpp 11 Mar 2022 20:17:12 -0000 1.2
+++ qtbase/patches/patch-qmake_generators_unix_unixmake_cpp 5 Dec 2022 21:00:33 -0000
@@ -1,7 +1,7 @@
Index: qmake/generators/unix/unixmake.cpp
--- qmake/generators/unix/unixmake.cpp.orig
+++ qmake/generators/unix/unixmake.cpp
-@@ -34,8 +34,50 @@
+@@ -9,8 +9,50 @@
#include <time.h>
#include <qdebug.h>

@@ -52,7 +52,7 @@ Index: qmake/generators/unix/unixmake.cp
ProStringList UnixMakefileGenerator::libdirToFlags(const ProKey &key)
{
ProStringList results;
-@@ -107,6 +149,13 @@ UnixMakefileGenerator::init()
+@@ -82,6 +124,13 @@ UnixMakefileGenerator::init()
project->values("QMAKE_RPATHLINKDIR") += project->values("QMAKE_RPATHLINKDIR_POST");
if(!project->isEmpty("QMAKE_INCDIR"))
project->values("INCLUDEPATH") += project->values("QMAKE_INCDIR");
@@ -66,7 +66,7 @@ Index: qmake/generators/unix/unixmake.cp
// The order of the next two lines is relevant due to side effect on QMAKE_LFLAGS.
ProStringList ldadd = project->values("QMAKE_LIBDIR_FLAGS") + libdirToFlags("QMAKE_LIBDIR");
ProStringList ldaddpost = libdirToFlags("QMAKE_LIBDIR_POST");
-@@ -119,7 +168,12 @@ UnixMakefileGenerator::init()
+@@ -94,7 +143,12 @@ UnixMakefileGenerator::init()
ldadd += project->values("QMAKE_FRAMEWORKPATH_FLAGS");
}
ProStringList &qmklibs = project->values("LIBS");
@@ -80,7 +80,7 @@ Index: qmake/generators/unix/unixmake.cp
ProStringList &qmklibspost = project->values("QMAKE_LIBS");
qmklibspost = ldaddpost + qmklibspost;
if (!project->isEmpty("QMAKE_RPATHDIR") && !project->isEmpty("QMAKE_LFLAGS_RPATH")) {
-@@ -147,7 +201,10 @@ UnixMakefileGenerator::init()
+@@ -122,7 +176,10 @@ UnixMakefileGenerator::init()
}
}
if (!project->isEmpty("QMAKE_RPATHLINKDIR")) {
@@ -92,7 +92,7 @@ Index: qmake/generators/unix/unixmake.cp
for (int i = 0; i < rpathdirs.size(); ++i) {
if (!project->isEmpty("QMAKE_LFLAGS_RPATHLINK"))
project->values("QMAKE_LFLAGS") += var("QMAKE_LFLAGS_RPATHLINK") + escapeFilePath(QFileInfo(rpathdirs[i].toQString()).absoluteFilePath());
-@@ -403,6 +460,9 @@ UnixMakefileGenerator::findLibraries(bool linkPrl, boo
+@@ -378,6 +435,9 @@ UnixMakefileGenerator::findLibraries(bool linkPrl, boo
"QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", nullptr };
for (int i = 0; lflags[i]; i++) {
ProStringList &l = project->values(lflags[i]);
@@ -102,7 +102,7 @@ Index: qmake/generators/unix/unixmake.cp
for (ProStringList::Iterator it = l.begin(); it != l.end(); ) {
QString opt = (*it).toQString();
if(opt.startsWith("-")) {
-@@ -546,6 +606,13 @@ UnixMakefileGenerator::findLibraries(bool linkPrl, boo
+@@ -521,6 +581,13 @@ UnixMakefileGenerator::findLibraries(bool linkPrl, boo
}
}
}
@@ -116,7 +116,7 @@ Index: qmake/generators/unix/unixmake.cp
return false;
}

-@@ -708,7 +775,7 @@ UnixMakefileGenerator::defaultInstall(const QString &t
+@@ -683,7 +750,7 @@ UnixMakefileGenerator::defaultInstall(const QString &t
uninst.append("-$(DEL_FILE) " + dst);
}
}
Index: qtbase/patches/patch-qmake_generators_unix_unixmake_h
===================================================================
RCS file: /cvs/ports/x11/qt6/qtbase/patches/patch-qmake_generators_unix_unixmake_h,v
retrieving revision 1.3
diff -u -p -r1.3 patch-qmake_generators_unix_unixmake_h
--- qtbase/patches/patch-qmake_generators_unix_unixmake_h 6 May 2022 18:59:59 -0000 1.3
+++ qtbase/patches/patch-qmake_generators_unix_unixmake_h 5 Dec 2022 21:00:33 -0000
@@ -1,7 +1,7 @@
Index: qmake/generators/unix/unixmake.h
--- qmake/generators/unix/unixmake.h.orig
+++ qmake/generators/unix/unixmake.h
-@@ -61,6 +61,7 @@ class UnixMakefileGenerator : public MakefileGenerator
+@@ -36,6 +36,7 @@ class UnixMakefileGenerator : public MakefileGenerator
bool writeObjectsPart(QTextStream &, bool do_incremental);
private:
void init2();
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.2
diff -u -p -r1.2 patch-src_corelib_plugin_qelfparser_p_cpp
--- qtbase/patches/patch-src_corelib_plugin_qelfparser_p_cpp 17 Jun 2022 12:55:26 -0000 1.2
+++ qtbase/patches/patch-src_corelib_plugin_qelfparser_p_cpp 5 Dec 2022 21:00:33 -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
-@@ -363,9 +363,9 @@ Q_DECL_UNUSED Q_DECL_COLD_FUNCTION static QDebug &oper
+@@ -327,9 +327,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;
-@@ -419,7 +419,7 @@ Q_DECL_UNUSED Q_DECL_COLD_FUNCTION static QDebug &oper
+@@ -383,7 +383,7 @@ Q_DECL_UNUSED Q_DECL_COLD_FUNCTION static QDebug &oper
#ifdef EM_RISCV
case EM_RISCV: d << ", RISC-V"; break;