ports/www/qt6-webengine/files/patch-cmake_Functions.cmake
Jason E. Hale 03b02222d6 Qt6: Update to 6.9.1
June 03, 2024 by Jani Heikkinen

We have released Qt 6.9.1 today. As a patch release, Qt 6.9.1 does not
introduce new features but contains more than 450 bug fixes, security
updates, and other improvements on top of Qt 6.9.0 release. See more
information about the most important changes and bug fixes from the Qt
6.9.1 release note.

Announcement: https://www.qt.io/blog/qt-6.9.1-released
Release note:
https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.9.1/release-note.md

We (kde@) skipped shipping Qt 6.9.0 due to unacceptable rendering bugs
in the WebEngine component, but here are the announcements and release
notes from Qt 6.9.0.

Announcement: https://www.qt.io/blog/qt-6.9-released
Release note:
https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.9.0/release-note.md

PySide6: Update to 6.9.1

PySide6 and its related components have been updated alongside the Qt
release for compatibility. Older versions will not build with Qt 6.9.x.

Announcement: https://www.qt.io/blog/qt-for-python-release-6.9

PyQt6: Update to 6.9.1

As with PySide6, older versions of PyQt6 will not build with Qt 6.9.x.

Support tools like py-sip and py-qtbuilder have also been updated to their
latest versions.

Announcement: https://www.riverbankcomputing.com/news/PyQt_v6.9.0_Released
              https://www.riverbankcomputing.com/news/PyQt_v6.9.1_Released

PR:		286051
Exp-run by:	antoine
2025-06-10 03:25:00 -04:00

32 lines
1.8 KiB
CMake

--- cmake/Functions.cmake.orig 2025-05-29 01:27:28 UTC
+++ cmake/Functions.cmake
@@ -103,7 +103,7 @@ function(add_linker_options target buildDir completeSt
set(libs_rsp "${buildDir}/${ninjaTarget}_libs.rsp")
set(ldir_rsp "${buildDir}/${ninjaTarget}_ldir.rsp")
set_target_properties(${cmakeTarget} PROPERTIES STATIC_LIBRARY_OPTIONS "@${objects_rsp}")
- if(LINUX OR ANDROID)
+ if(LINUX OR ANDROID OR FREEBSD)
get_gn_arch(cpu ${TEST_architecture_arch})
if(CMAKE_CROSSCOMPILING AND cpu STREQUAL "arm" AND ${config} STREQUAL "Debug")
target_link_options(${cmakeTarget} PRIVATE "LINKER:--long-plt")
@@ -370,6 +370,20 @@ function(add_gn_build_artifacts_to_target)
set_target_properties(${arg_CMAKE_TARGET} PROPERTIES
LINK_DEPENDS ${arg_BUILDDIR}/${config}/${arch}/${arg_NINJA_STAMP}
)
+ # For some reason when the build of QtWebEngine's "convert_dict" is
+ # completed the "convert_dict.stamp" isn't created.
+ #
+ # Work around this issue by creating "convert_dict.stamp" manually.
+ if(${arg_NINJA_TARGET} STREQUAL "convert_dict")
+ add_custom_command(
+ POST_BUILD
+ COMMENT "Add workaround for missing ${arg_NINJA_TARGET}.stamp file after build"
+ COMMAND ${CMAKE_COMMAND} -E touch ${buildDir}/${config}/${arch}/${arg_NINJA_TARGET}.stamp
+ TARGET ${target}
+ DEPENDS run_${module}_NinjaDone
+ USES_TERMINAL
+ )
+ endif()
if(QT_IS_MACOS_UNIVERSAL)
add_intermediate_archive(${target} ${arg_BUILDDIR}/${config}/${arch} ${arg_COMPLETE_STATIC})
elseif(IOS)