diff --git a/ports/qtbase/fix_removed_api_windows_static.patch b/ports/qtbase/fix_removed_api_windows_static.patch new file mode 100644 index 00000000000000..7674755938b788 --- /dev/null +++ b/ports/qtbase/fix_removed_api_windows_static.patch @@ -0,0 +1,14 @@ +diff --git a/cmake/modulecppexports.h.in b/cmake/modulecppexports.h.in +--- a/cmake/modulecppexports.h.in ++++ b/cmake/modulecppexports.h.in +@@ -33,6 +32,10 @@ endif + # define QT_@module_define_infix@_CONSTEXPR_INLINE_SINCE(major, minor) \ + QT_IF_DEPRECATED_SINCE(major, minor, constexpr, /* not inline */) + # define QT_@module_define_infix@_INLINE_IMPL_SINCE(major, minor) 1 ++#elif !defined(QT_BUILD_@module_define_infix@_LIB) && !defined(QT_BOOTSTRAPPED) ++# define QT_@module_define_infix@_INLINE_SINCE(major, minor) ++# define QT_@module_define_infix@_CONSTEXPR_INLINE_SINCE(major, minor) ++# define QT_@module_define_infix@_INLINE_IMPL_SINCE(major, minor) 0 + #else + /* inside library, outside removed_api.cpp: + * keep deprecated API -> non-inline decl, no defi; diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake index 543627d39e330a..57c0045d99cd4b 100644 --- a/ports/qtbase/portfile.cmake +++ b/ports/qtbase/portfile.cmake @@ -28,6 +28,7 @@ set(${PORT}_PATCHES fix-libresolv-test.patch framework.patch use_inotify_on_freebsd.patch + fix_removed_api_windows_static.patch ) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index 852c5f02d8d5dc..e1da0e52d75d2a 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qtbase", "version": "6.10.2", + "port-version": 1, "description": "Qt Base (Core, Gui, Widgets, Network, ...)", "homepage": "https://www.qt.io/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 5eb42231c6a6f9..0c4ae417c33d5d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8274,7 +8274,7 @@ }, "qtbase": { "baseline": "6.10.2", - "port-version": 0 + "port-version": 1 }, "qtcharts": { "baseline": "6.10.2", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index 81154e0d718685..8d8b68801215d6 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f26811d213ec3c80cb539868344b47cad84c6f20", + "version": "6.10.2", + "port-version": 1 + }, { "git-tree": "0e931a0ffedd613937a8b9cad29f92087a7f83e8", "version": "6.10.2",