From e9d0d6fe71ec440a6a7906f92f941a181b937556 Mon Sep 17 00:00:00 2001 From: Kai Blaschke Date: Tue, 29 Apr 2025 23:46:04 +0200 Subject: [PATCH] [qtbase] Fix path for finding syncqt in Manifest mode (#45230) Co-authored-by: Billy Robert O'Neal III --- ports/qtbase/portfile.cmake | 4 ++-- ports/qtbase/vcpkg.json | 4 +++- scripts/ci.feature.baseline.txt | 18 ++++++++++++++---- versions/baseline.json | 2 +- versions/q-/qtbase.json | 5 +++++ 5 files changed, 25 insertions(+), 8 deletions(-) diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake index a989671108..132563cfdd 100644 --- a/ports/qtbase/portfile.cmake +++ b/ports/qtbase/portfile.cmake @@ -513,8 +513,8 @@ file(WRITE "${hostinfofile}" "${_contents}") if(NOT VCPKG_CROSSCOMPILING OR EXISTS "${CURRENT_PACKAGES_DIR}/share/Qt6CoreTools/Qt6CoreToolsAdditionalTargetInfo.cmake") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/Qt6CoreTools/Qt6CoreToolsAdditionalTargetInfo.cmake" - "PACKAGE_PREFIX_DIR}/bin/syncqt" - "PACKAGE_PREFIX_DIR}/tools/Qt6/bin/syncqt" + "CMAKE_CURRENT_LIST_DIR}/../../bin/syncqt" + "CMAKE_CURRENT_LIST_DIR}/../../tools/Qt6/bin/syncqt" IGNORE_UNCHANGED) endif() diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index cf66559fdd..51b5cd00b1 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qtbase", "version": "6.8.3", + "port-version": 1, "description": "Qt Base (Core, Gui, Widgets, Network, ...)", "homepage": "https://www.qt.io/", "license": null, @@ -193,7 +194,8 @@ "name": "qtbase", "default-features": false, "features": [ - "network" + "network", + "thread" ] } ] diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index 7fb15352f3..f9d4880321 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -1844,7 +1844,20 @@ qtactiveqt:x64-uwp = cascade qtapplicationmanager:arm64-osx = cascade qtapplicationmanager:arm64-uwp = cascade qtapplicationmanager:x64-uwp = cascade -qtbase[sql-mysql]:x86-windows = cascade +qtbase[cups]:x64-linux = skip +qtbase[dbus]:x64-windows-static = cascade +qtbase[dbus,doubleconversion,sql-mysql](android) = cascade +qtbase[fontconfig](!linux) = feature-fails # see https://github.com/microsoft/vcpkg/issues/31247 +qtbase[glib] = feature-fails +qtbase[gtk]:x64-linux = feature-fails +qtbase[gtk3]:x64-linux = feature-fails +qtbase[sql-oci]:arm64-windows = cascade +qtbase[sql-oci]:arm64-windows-static-md = cascade +qtbase[sql-oci](!(arm & windows)) = feature-fails # see https://github.com/microsoft/vcpkg/issues/32052 +qtbase[vulkan](osx)=skip # fatal error: 'MoltenVK/mvk_vulkan.h' file not found +qtbase[xcb,xcb-xlib,xkb,xkbcommon-x11,xlib,xrender](osx) = skip # no x11 on macOS +qtbase[xcb,xcb-xlib,xkb,xkbcommon-x11,xlib,xrender](windows) = skip # X11_SUPPORTED == LINUX OR HPUX OR FREEBSD OR NETBSD OR OPENBSD OR SOLARIS OR HURD in qt's build system +qtbase(android)=skip # qtbase requires ANDROID_SDK_ROOT to be set. Consider adding it to the triplet. qtcharts:arm64-uwp = cascade qtcharts:x64-uwp = cascade qtcoap:arm64-uwp = cascade @@ -2264,8 +2277,6 @@ poco[core,mariadb,mysql] = options # You can not install mariadb and mysql at th qt3d[animation] = options # is a requirement, see https://github.com/microsoft/vcpkg/issues/31336 qt3d[extras] = options # is a requirement, see https://github.com/microsoft/vcpkg/issues/31336 qt5compat[iconv](!uwp) = feature-fails # requires qtbase without icu -qtbase[fontconfig] = feature-fails # see https://github.com/microsoft/vcpkg/issues/31247 -qtbase[sql-oci](!(arm & windows)) = feature-fails # see https://github.com/microsoft/vcpkg/issues/32052 qtmultimedia[core,ffmpeg,gstreamer,qml,widgets](osx) = combination-fails # Error: Qt will by default autolink both plugin backends in static builds leading to symbol collisions and a build failure in dependent ports! As such in static builds only one backend is allowed by default. qtopcua[uacpp](!uwp) = feature-fails # Unified Automation C++ SDK is not installed realsense2:arm64-windows = fail # fw-update-device.h(1): warning C4828: The file contains a character starting at offset 0x4c3 that is illegal in the current source character set (codepage 65001). See https://github.com/microsoft/vcpkg/issues/35628 @@ -2298,7 +2309,6 @@ libhdfs3 = skip # never worked https://github.com/microsoft/vcpkg/pull/10021#iss magnum[anyshaderconverter,shadertools,shaderconverter,vk-info] = skip # only available in head build magnum-plugins[cgltfimporter,glslangshaderconverter,ktximageconverter,ktximporter,openexrimageconverter,openexrimporter,spirvtoolsshaderconverter,stbdxtimageconverter] = skip # only available in head build openjpeg[tools] = skip # fails and is deprecated -qtbase[xcb,xcb-xlib,xkb,xkbcommon-x11,xlib,xrender](osx) = skip # no x11 on macOS s2n = skip # builds too slow sciter = skip # The sciter port is deprecated by upstream and conflicts with upstream's replacement. shogun = skip # shogun is not compatible with c++17 because it uses dynamic exception specifications but the dependency abseil requires c++17 diff --git a/versions/baseline.json b/versions/baseline.json index 9643bae4c2..488ba4329d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7782,7 +7782,7 @@ }, "qtbase": { "baseline": "6.8.3", - "port-version": 0 + "port-version": 1 }, "qtcharts": { "baseline": "6.8.3", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index a50e9630cb..6375098db9 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8fadd1802001862cb8fba5b579469c2cb8bb8b30", + "version": "6.8.3", + "port-version": 1 + }, { "git-tree": "2c2f2819b3529b00be4004badb6effa8f3db123b", "version": "6.8.3",