Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
0aba22e
Update Qt to 6.9.2
Neumann-A Oct 9, 2025
6a6077d
Adjust ports for Qt changes
Neumann-A Oct 9, 2025
4880fe2
Add missing wayland feature dep
Neumann-A Oct 10, 2025
05f8057
Try to trace paraview for the hidden mkl dep
Neumann-A Oct 10, 2025
9b0e96e
Add wayland feature
Neumann-A Oct 10, 2025
c0ba780
Fix implicit Fortran libraries for lapack-reference
Neumann-A Oct 11, 2025
0591f51
adjust feature baseline
Neumann-A Oct 11, 2025
89e9c05
[lapack-reference] Add implicit Fortran libs to pc file
Neumann-A Oct 11, 2025
53025d2
v db
Neumann-A Oct 11, 2025
05e92b6
adjust lapack-reference ci feature selection
Neumann-A Oct 11, 2025
fadb6bc
disable lapack-reference on android
Neumann-A Oct 11, 2025
b15c7e2
Merge remote-tracking branch 'origin/fix-lapack-reference-pc-files' i…
Neumann-A Oct 11, 2025
485a7f0
apply format diff
Neumann-A Oct 11, 2025
3996580
[dlib] Fix lapack linkage
Neumann-A Oct 11, 2025
5115f0d
v db
Neumann-A Oct 11, 2025
17d2cf2
Remove CONFIG
Neumann-A Oct 11, 2025
ca721eb
v db
Neumann-A Oct 11, 2025
41385ab
Merge remote-tracking branch 'origin/fix-dlib-lapack' into update_qt_…
Neumann-A Oct 11, 2025
60f03f7
Merge branch 'fix-lapack-reference-pc-files' into fix-dlib-lapack
Neumann-A Oct 11, 2025
e02cb41
CI Retrigger
Neumann-A Oct 12, 2025
c60a5b1
more linkage order details
Neumann-A Oct 12, 2025
bff21b2
v db
Neumann-A Oct 12, 2025
93f68d4
Merge remote-tracking branch 'origin/fix-dlib-lapack' into update_qt_…
Neumann-A Oct 12, 2025
5ceff2a
fix win32
Neumann-A Oct 12, 2025
41f0c43
adjust paraview[python] to not be cascade failure
Neumann-A Oct 12, 2025
d93a19f
fix format diff
Neumann-A Oct 12, 2025
7bd7feb
More CI baseline tuning
Neumann-A Oct 12, 2025
e15737d
trying to deactivate wayland feature in qtbase on osx via baseline tu…
Neumann-A Oct 12, 2025
3916357
Merge remote-tracking branch 'upstream/master' into update_qt_6.9.2
Neumann-A Oct 13, 2025
c3f9ca1
Trying to get rid of wayland on osx
Neumann-A Oct 13, 2025
76079a1
remove double entry
Neumann-A Oct 14, 2025
31fbcd3
Adjust CI baseline
Neumann-A Oct 14, 2025
daab56e
change feature-fail to skip
Neumann-A Oct 14, 2025
88b58c4
Add sessionmanager handling to qtbase
Neumann-A Oct 14, 2025
d84ddda
Introduce port.data.cmake however i would like a json format more
Neumann-A Oct 16, 2025
0a30cb3
Merge remote-tracking branch 'upstream/master' into update_qt_6.9.2
Neumann-A Oct 16, 2025
b03e389
Merge remote-tracking branch 'upstream/master' into update_qt_6.9.2
Neumann-A Oct 17, 2025
0c1ac53
Try updating android image.
BillyONeal Oct 17, 2025
302aba9
skip xcb-sm for ci even though xcb is already a skip
Neumann-A Oct 18, 2025
66dc75c
Merge branch 'update_qt_6.9.2' of https://github.com/Neumann-A/vcpkg …
Neumann-A Oct 18, 2025
5134e31
Merge remote-tracking branch 'upstream/master' into update_qt_6.9.2
Neumann-A Oct 19, 2025
3bde194
change qtinterfaceframework to use github
Neumann-A Oct 19, 2025
2dfb972
remove unnecessary option
Neumann-A Oct 19, 2025
dcb593b
try qtwayland(osx) = skip in feature baseline
Neumann-A Oct 20, 2025
b00f971
Merge remote-tracking branch 'upstream/master' into update_qt_6.9.2
Neumann-A Oct 20, 2025
11965f5
v db
Neumann-A Oct 20, 2025
6b16333
back to fail ?
Neumann-A Oct 21, 2025
5e429bb
use cascade as ci tells me to
Neumann-A Oct 21, 2025
4fd4271
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Nov 21, 2025
91245b1
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Nov 22, 2025
b9dbab9
Remove no longer necessary patch.
BillyONeal Nov 22, 2025
3c702a3
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Nov 24, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/qt/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "qt",
"version": "6.9.1",
"version": "6.9.2",
"description": "A cross-platform application and UI framework.",
"homepage": "https://www.qt.io/",
"license": null,
Expand Down
3 changes: 3 additions & 0 deletions ports/qt3d/port.data.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
set(qt3d_HASH "f0ffceb7185b16ffcf6e757007b6b500e111285dcbb90a85c1a6e9c4400451688f3d631a25d95ab36838dfdea40b4c5557a9c6d67aab11d2f66e7d4dc86ef4b5")
set(qt3d_URL "https://download.qt.io/archive/qt/6.9/6.9.2/submodules/qt3d-everywhere-src-6.9.2.tar.xz;https://mirrors.ocf.berkeley.edu/qt/archive/qt/6.9/6.9.2/submodules/qt3d-everywhere-src-6.9.2.tar.xz")
set(qt3d_FILENAME "qt3d-everywhere-src-6.9.2.tar.xz")
2 changes: 1 addition & 1 deletion ports/qt3d/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "qt3d",
"version": "6.9.1",
"version": "6.9.2",
"description": "Qt wrapper for existing OPC UA stacks",
"homepage": "https://www.qt.io/",
"license": null,
Expand Down
3 changes: 3 additions & 0 deletions ports/qt5compat/port.data.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
set(qt5compat_HASH "281e60fdc9559279fb249d80fd04ea52282db9db402cc81365acafea1d87e96923bfb5a9607163182736a9ca30618da5578cce7271083c08692e95396bbf307c")
set(qt5compat_URL "https://download.qt.io/archive/qt/6.9/6.9.2/submodules/qt5compat-everywhere-src-6.9.2.tar.xz;https://mirrors.ocf.berkeley.edu/qt/archive/qt/6.9/6.9.2/submodules/qt5compat-everywhere-src-6.9.2.tar.xz")
set(qt5compat_FILENAME "qt5compat-everywhere-src-6.9.2.tar.xz")
2 changes: 1 addition & 1 deletion ports/qt5compat/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "qt5compat",
"version": "6.9.1",
"version": "6.9.2",
"description": "The Qt 5 Core Compat module contains the Qt 5 Core APIs that were removed in Qt 6. The module facilitates the transition to Qt 6.",
"homepage": "https://www.qt.io/",
"license": null,
Expand Down
3 changes: 3 additions & 0 deletions ports/qtactiveqt/port.data.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
set(qtactiveqt_HASH "d17f62c17e7f71f5b473598276a77efcc9efcecd6a3eabfef9494d40fb6248c40278b543309f924455c8e26ee68e78a51731cefbdc70b1e6fd2e594166a75a2e")
set(qtactiveqt_URL "https://download.qt.io/archive/qt/6.9/6.9.2/submodules/qtactiveqt-everywhere-src-6.9.2.tar.xz;https://mirrors.ocf.berkeley.edu/qt/archive/qt/6.9/6.9.2/submodules/qtactiveqt-everywhere-src-6.9.2.tar.xz")
set(qtactiveqt_FILENAME "qtactiveqt-everywhere-src-6.9.2.tar.xz")
2 changes: 1 addition & 1 deletion ports/qtactiveqt/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "qtactiveqt",
"version": "6.9.1",
"version": "6.9.2",
"description": "ActiveQt",
"homepage": "https://www.qt.io/",
"license": null,
Expand Down
3 changes: 3 additions & 0 deletions ports/qtapplicationmanager/port.data.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
set(qtapplicationmanager_HASH "0dcbf8fc475959e52db79147e640dd03dde1639f61a781326dfbffacf6d7aab98dfacfe1c91118b13de80be5f47691c739493ae66bd73498f5597b29945433fe")
set(qtapplicationmanager_URL "https://github.com/qt/qtapplicationmanager/archive/v6.9.2.tar.gz")
set(qtapplicationmanager_FILENAME "qt-qtapplicationmanager-v6.9.2.tar.gz")
2 changes: 1 addition & 1 deletion ports/qtapplicationmanager/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "qtapplicationmanager",
"version": "6.9.1",
"version": "6.9.2",
"description": "Qt component for application lifecycle management",
"homepage": "https://www.qt.io/",
"license": null,
Expand Down
7 changes: 3 additions & 4 deletions ports/qtbase/cmake/qt_install_submodule.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ function(qt_download_submodule_impl)
# qtinterfaceframework is not available in the release, so we fall back to a `git clone`.
vcpkg_from_git(
OUT_SOURCE_PATH SOURCE_PATH
URL "https://code.qt.io/qt/${_qarg_SUBMODULE}.git"
URL "${${_qarg_SUBMODULE}_URL}"
REF "${${_qarg_SUBMODULE}_REF}"
PATCHES ${_qarg_PATCHES}
)
Expand Down Expand Up @@ -70,10 +70,9 @@ function(qt_download_submodule_impl)
set(sha512 SHA512 "${${_qarg_SUBMODULE}_HASH}")
endif()

qt_get_url_filename("${_qarg_SUBMODULE}" urls filename)
vcpkg_download_distfile(archive
URLS ${urls}
FILENAME "${filename}"
URLS ${${_qarg_SUBMODULE}_URL}
FILENAME ${${_qarg_SUBMODULE}_FILENAME}
${sha512}
)
vcpkg_extract_source_archive(
Expand Down
50 changes: 0 additions & 50 deletions ports/qtbase/cmake/qt_port_data.cmake

This file was deleted.

16 changes: 12 additions & 4 deletions ports/qtbase/cmake/qt_port_details.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
## 6. The build should fail with "Done downloading version and emitting hashes." This will have changed out the vcpkg.json versions of the qt ports and rewritten qt_port_data.cmake
## 7. Set QT_UPDATE_VERSION back to 0

set(QT_VERSION 6.9.1)
set(QT_VERSION 6.9.2)
set(QT_DEV_BRANCH 0)

set(QT_UPDATE_VERSION 0)
Expand Down Expand Up @@ -104,11 +104,11 @@ endif()

# 1. By default, modules come from the official release
# 2. These modules are mirrored to github and have tags matching the release
set(QT_FROM_GITHUB qtcoap qtopcua qtmqtt qtapplicationmanager)
set(QT_FROM_GITHUB qtcoap qtopcua qtmqtt qtapplicationmanager qtinterfaceframework)
# 3. These modules are mirrored to github and have branches matching the release
set(QT_FROM_GITHUB_BRANCH qtdeviceutilities)
# 4. These modules are not mirrored to github and not part of the release
set(QT_FROM_QT_GIT qtinterfaceframework)
set(QT_FROM_QT_GIT "")
# For beta releases uncomment the next two lines and comment the lines with QT_FROM_GITHUB, QT_FROM_GITHUB_BRANCH, QT_FROM_QT_GIT
#set(QT_FROM_QT_GIT ${QT_PORTS})
#list(POP_FRONT QT_FROM_QT_GIT)
Expand Down Expand Up @@ -153,6 +153,8 @@ if(QT_UPDATE_VERSION)
string(REGEX REPLACE "\"version(-(string|semver))?\": [^\n]+\n" "\"version\": \"${QT_VERSION}\",\n" _control_contents "${_control_contents}")
string(REGEX REPLACE "\"port-version\": [^\n]+\n" "" _control_contents "${_control_contents}")
file(WRITE "${port_json}" "${_control_contents}")

set(port_data "")
if(qt_port STREQUAL "qt")
continue()
endif()
Expand All @@ -164,6 +166,8 @@ if(QT_UPDATE_VERSION)
)
string(SUBSTRING "${out}" 0 40 tag_sha)
string(APPEND msg "set(${qt_port}_REF ${tag_sha})\n")
string(APPEND port_data "set(${qt_port}_REF ${tag_sha})\n")
string(APPEND port_data "set(${qt_port}_URL \"https://code.qt.io/cgit/qt/${qt_port}.git\")\n")
else()
qt_get_url_filename("${qt_port}" urls filename)
vcpkg_download_distfile(archive
Expand All @@ -173,11 +177,15 @@ if(QT_UPDATE_VERSION)
)
file(SHA512 "${archive}" hash)
string(APPEND msg "set(${qt_port}_HASH \"${hash}\")\n")
string(APPEND port_data "set(${qt_port}_HASH \"${hash}\")\n")
string(APPEND port_data "set(${qt_port}_URL \"${urls}\")\n")
string(APPEND port_data "set(${qt_port}_FILENAME \"${filename}\")\n")
endif()
file(WRITE "${CMAKE_CURRENT_LIST_DIR}/../../${qt_port}/port.data.cmake" "${port_data}")
endforeach()
message("${msg}")
file(WRITE "${CMAKE_CURRENT_LIST_DIR}/qt_port_data_new.cmake" "${msg}")
message(FATAL_ERROR "Done downloading version and emitting hashes.")
endif()

include("${CMAKE_CURRENT_LIST_DIR}/qt_port_data.cmake")
include("${CURRENT_PORT_DIR}/port.data.cmake")
44 changes: 0 additions & 44 deletions ports/qtbase/macos26-opengl.patch

This file was deleted.

3 changes: 3 additions & 0 deletions ports/qtbase/port.data.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
set(qtbase_HASH "3fab05fd17165b5e4501236f736c2b4c8d28929e17ce19de614851ae69adad88d621360c441d1ff2954ab24dee0d461d948cf699bc1c58f4b766ca8379de651e")
set(qtbase_URL "https://download.qt.io/archive/qt/6.9/6.9.2/submodules/qtbase-everywhere-src-6.9.2.tar.xz;https://mirrors.ocf.berkeley.edu/qt/archive/qt/6.9/6.9.2/submodules/qtbase-everywhere-src-6.9.2.tar.xz")
set(qtbase_FILENAME "qtbase-everywhere-src-6.9.2.tar.xz")
15 changes: 5 additions & 10 deletions ports/qtbase/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,6 @@ if(VCPKG_TARGET_IS_LINUX)
"libxkbcommon-x11-dev libegl1-mesa-dev.")
endif()

if(VCPKG_TARGET_IS_OSX)
execute_process(COMMAND xcrun --show-sdk-version
OUTPUT_VARIABLE OSX_SDK_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE)
if(${OSX_SDK_VERSION} VERSION_GREATER_EQUAL 26)
# macOS 26 Tahoe has removed AGL APIs https://bugreports.qt.io/browse/QTBUG-137687
list(APPEND ${PORT}_PATCHES macos26-opengl.patch)
endif()
endif()

# Features can be found via searching for qt_feature in all configure.cmake files in the source:
# The files also contain information about the Platform for which it is searched
# Always use FEATURE_<feature> in vcpkg_cmake_configure
Expand Down Expand Up @@ -152,6 +142,7 @@ list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_PPS:BOOL=ON)
list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Slog2:BOOL=ON)
list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Libsystemd:BOOL=ON)
list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_WrapBacktrace:BOOL=ON)
list(APPEND FEATURE_CORE_OPTIONS -DFEATURE_pkg_config:BOOL=ON)
#list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_WrapAtomic:BOOL=ON) # Cannot be disabled on x64 platforms
#list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_WrapRt:BOOL=ON) # Cannot be disabled on osx

Expand Down Expand Up @@ -192,9 +183,11 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_GUI_OPTIONS
"jpeg" FEATURE_jpeg
"png" FEATURE_png
"opengl" FEATURE_opengl
"sessionmanager" FEATURE_sessionmanager
"xlib" FEATURE_xlib
"xkb" FEATURE_xkbcommon
"xcb" FEATURE_xcb
"xcb-sm" FEATURE_xcb_sm
"xcb-xlib" FEATURE_xcb_xlib
"xkbcommon-x11" FEATURE_xkbcommon_x11
"xrender" FEATURE_xrender # requires FEATURE_xcb_native_painting; otherwise disabled.
Expand All @@ -208,6 +201,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_GUI_OPTIONS
#"harfbuzz" CMAKE_REQUIRE_FIND_PACKAGE_WrapSystemHarfbuzz
#"jpeg" CMAKE_REQUIRE_FIND_PACKAGE_JPEG
#"png" CMAKE_REQUIRE_FIND_PACKAGE_PNG
"wayland" FEATURE_wayland
#"xlib" CMAKE_REQUIRE_FIND_PACKAGE_X11
#"xkb" CMAKE_REQUIRE_FIND_PACKAGE_XKB
#"xcb" CMAKE_REQUIRE_FIND_PACKAGE_XCB
Expand All @@ -225,6 +219,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_GUI_OPTIONS
"harfbuzz" CMAKE_DISABLE_FIND_PACKAGE_WrapSystemHarfbuzz
"jpeg" CMAKE_DISABLE_FIND_PACKAGE_JPEG
#"png" CMAKE_DISABLE_FIND_PACKAGE_PNG # Unable to disable if Freetype requires it
"wayland" CMAKE_DISABLE_FIND_PACKAGE_Wayland
"xlib" CMAKE_DISABLE_FIND_PACKAGE_X11
"xkb" CMAKE_DISABLE_FIND_PACKAGE_XKB
"xcb" CMAKE_DISABLE_FIND_PACKAGE_XCB
Expand Down
Loading
Loading