mirror of
https://git.freebsd.org/ports.git
synced 2025-05-01 11:06:39 -04:00
7e3e6797d2
December 02, 2024 We (Qt upstream) have released Qt 6.8.1 today. As a patch release, Qt 6.8.1 does not introduce new features but contains more than 550 bug fixes, security updates, and other improvements on top of Qt 6.8.0 release. See more information about the most important changes and bug fixes from the Qt 6.8.1 release note. Announcement: https://www.qt.io/blog/qt-6.8.1-released Release note: https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.8.1/release-note.md We (kde@) skipped shipping Qt 6.8.0 due to waiting for a compatible version of PyQt to be released, but here are the announcements and release notes from Qt 6.8.0. Announcement: https://www.qt.io/blog/qt-6.8-released Release note: https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.8.0/release-note.md PySide6: Update to 6.8.0.2 PySide6 and its related components have been updated alongside the Qt release for compatibility. Older versions will not build with Qt 6.8.x. Announcement: https://www.qt.io/blog/qt-for-python-release-6.8 PyQt6: Update to 6.8.0 This release also introduces x11-toolkits/py-qt6-graphs, python bindings for the Qt Graphs module. As with PySide6, older versions of PyQt6 will not build with Qt 6.8.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.8.0_Released Special thanks to Kenneth Raplee for testing and to SponiX for providing access to build hardware! PR: 283290 Exp-run by: antoine (x2)
95 lines
4.1 KiB
CMake
95 lines
4.1 KiB
CMake
--- cmake/Functions.cmake.orig 2024-10-02 15:40:01 UTC
|
|
+++ cmake/Functions.cmake
|
|
@@ -416,7 +416,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")
|
|
@@ -676,6 +676,8 @@ function(get_gn_os result)
|
|
set(${result} "mac" PARENT_SCOPE)
|
|
elseif(IOS)
|
|
set(${result} "ios" PARENT_SCOPE)
|
|
+ elseif(FREEBSD)
|
|
+ set(${result} "freebsd" PARENT_SCOPE)
|
|
else()
|
|
message(DEBUG "Unrecognized OS")
|
|
endif()
|
|
@@ -879,7 +881,7 @@ macro(append_build_type_setup)
|
|
|
|
extend_gn_list(gnArgArg
|
|
ARGS enable_precompiled_headers
|
|
- CONDITION BUILD_WITH_PCH AND NOT LINUX
|
|
+ CONDITION BUILD_WITH_PCH AND NOT LINUX AND NOT FREEBSD
|
|
)
|
|
extend_gn_list(gnArgArg
|
|
ARGS dcheck_always_on
|
|
@@ -939,7 +941,7 @@ macro(append_compiler_linker_sdk_setup)
|
|
use_libcxx=true
|
|
)
|
|
endif()
|
|
- if(DEFINED QT_FEATURE_stdlib_libcpp AND LINUX)
|
|
+ if(DEFINED QT_FEATURE_stdlib_libcpp AND (LINUX OR FREEBSD))
|
|
extend_gn_list(gnArgArg ARGS use_libcxx
|
|
CONDITION QT_FEATURE_stdlib_libcpp
|
|
)
|
|
@@ -977,7 +979,7 @@ macro(append_compiler_linker_sdk_setup)
|
|
)
|
|
endif()
|
|
get_gn_arch(cpu ${TEST_architecture_arch})
|
|
- if(LINUX AND CMAKE_CROSSCOMPILING AND cpu STREQUAL "arm")
|
|
+ if((LINUX OR FREEBSD) AND CMAKE_CROSSCOMPILING AND cpu STREQUAL "arm")
|
|
|
|
extend_gn_list_cflag(gnArgArg
|
|
ARG arm_tune
|
|
@@ -1067,7 +1069,7 @@ macro(append_toolchain_setup)
|
|
host_cpu="${cpu}"
|
|
)
|
|
endif()
|
|
- elseif(LINUX)
|
|
+ elseif(LINUX OR FREEBSD)
|
|
get_gn_arch(cpu ${TEST_architecture_arch})
|
|
list(APPEND gnArgArg
|
|
custom_toolchain="${buildDir}/target_toolchain:target"
|
|
@@ -1205,6 +1207,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)
|
|
@@ -1331,7 +1347,7 @@ function(check_for_ulimit)
|
|
|
|
function(check_for_ulimit)
|
|
message("-- Checking 'ulimit -n'")
|
|
- execute_process(COMMAND bash -c "ulimit -n"
|
|
+ execute_process(COMMAND sh -c "ulimit -n"
|
|
OUTPUT_VARIABLE ulimitOutput
|
|
)
|
|
string(REGEX MATCHALL "[0-9]+" limit "${ulimitOutput}")
|
|
@@ -1340,7 +1356,7 @@ function(check_for_ulimit)
|
|
if(NOT ${CMAKE_VERSION} VERSION_LESS "3.21.0")
|
|
message(" -- Creating linker launcher")
|
|
file(GENERATE OUTPUT ${PROJECT_BINARY_DIR}/linker_ulimit.sh
|
|
- CONTENT "#!/bin/bash\nulimit -n 4096\nexec \"$@\""
|
|
+ CONTENT "#!/bin/sh\nulimit -n 4096\nexec \"$@\""
|
|
FILE_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
|
|
)
|
|
set(COIN_BUG_699 ON PARENT_SCOPE)
|