microsoft · BillyONeal · Aug 11, 2025 · May 31, 2025 · May 31, 2025 · May 31, 2025
diff --git a/ports/kdstatemachineeditor/portfile.cmake b/ports/kdstatemachineeditor/portfile.cmake
@@ -4,6 +4,8 @@ vcpkg_from_github(
     REF v${VERSION}
     SHA512 dedd7166f434689cd5acf4ee3172169d3f77182269d3187f0a7a12966467dd5c7733e3ff64cd1fd03b0f3866c2aafa37cc3f2d7b8a3f4a5d8a7592da039de7af
     HEAD_REF master
+    PATCHES
+      qt6.9.patch # This is already upstream
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" VCPKG_BUILD_SHARED_LIBS)

diff --git a/ports/kdstatemachineeditor/qt6.9.patch b/ports/kdstatemachineeditor/qt6.9.patch
@@ -0,0 +1,22 @@
+diff --git a/src/view/quick/qopengl2pexvertexarray_p.h b/src/view/quick/qopengl2pexvertexarray_p.h
+index f80975ed..65058333 100644
+--- a/src/view/quick/qopengl2pexvertexarray_p.h
++++ b/src/view/quick/qopengl2pexvertexarray_p.h
+@@ -80,6 +80,8 @@ class QOpenGLPoint
+     operator QPointF() const {return QPointF(x,y);}
+ };
+
++Q_DECLARE_TYPEINFO(QOpenGLPoint, Q_PRIMITIVE_TYPE);
++
+ struct QOpenGLRect
+ {
+     QOpenGLRect(const QRectF &r)
+@@ -96,6 +98,8 @@ struct QOpenGLRect
+     operator QRectF() const {return QRectF(left, top, right-left, bottom-top);}
+ };
+
++Q_DECLARE_TYPEINFO(QOpenGLRect, Q_PRIMITIVE_TYPE);
++
+ class QOpenGL2PEXVertexArray
+ {
+ public:
diff --git a/ports/kdstatemachineeditor/vcpkg.json b/ports/kdstatemachineeditor/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "kdstatemachineeditor",
   "version": "2.0.0",
+  "port-version": 1,
   "description": "KDStateMachineEditor is a library for visualizing and editing state charts.",
   "homepage": "https://github.com/KDAB/KDStateMachineEditor",
   "license": "LGPL-2.1-only",

diff --git a/ports/open62541/android-librt.diff b/ports/open62541/android-librt.diff
diff --git a/ports/open62541/android.patch b/ports/open62541/android.patch
@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index acbd6b4971..1ed8cb72ab 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -495,10 +495,10 @@ set(open62541_LIBRARIES "")
+ set(open62541_PUBLIC_LIBRARIES "")
+ if("${UA_ARCHITECTURE}" STREQUAL "posix")
+     list(APPEND open62541_LIBRARIES "m")
+-    if(UA_MULTITHREADING GREATER_EQUAL 100 OR UA_BUILD_UNIT_TESTS)
++    if(UA_MULTITHREADING GREATER_EQUAL 100 OR UA_BUILD_UNIT_TESTS AND NOT ANDROID)
+         list(APPEND open62541_PUBLIC_LIBRARIES "pthread")
+     endif()
+-    if(NOT APPLE AND (NOT ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD"))
++    if(NOT APPLE AND (NOT ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD") AND NOT ANDROID)
+         list(APPEND open62541_LIBRARIES "rt")
+     endif()
+ elseif("${UA_ARCHITECTURE}" STREQUAL "win32")
diff --git a/ports/open62541/clang-sanitizer.diff b/ports/open62541/clang-sanitizer.diff
diff --git a/ports/open62541/portfile.cmake b/ports/open62541/portfile.cmake
@@ -2,11 +2,10 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO open62541/open62541
     REF v${VERSION}
-    SHA512 a6493a96e911e4b67dd017125eedf6f3d794a8c931d897e3fdd050a8e65c20dcb84e9dfad207d1fcec6d2f019ad406954d1711827a74c1665fe24cc32f3b019f
+    SHA512 637f662a38b4d09288bbf9fc5cce3c3c8711a90a4afe570ef85bd30437353208a2cabc0e5a8edaac453e1b7b50ff97ce4757b1376ec1be248066cceda6362257
     HEAD_REF master
     PATCHES
-        android-librt.diff
-        clang-sanitizer.diff
+      android.patch
 )
 
 # disable docs
@@ -16,8 +15,6 @@ vcpkg_replace_string("${SOURCE_PATH}/CMakeLists.txt" "include(linting_target)" "
 # do not enable LTO by default
 vcpkg_replace_string("${SOURCE_PATH}/CMakeLists.txt" "set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ON)" "")
 
-vcpkg_replace_string("${SOURCE_PATH}/tools/cmake/open62541Config.cmake.in" "find_dependency(PythonInterp REQUIRED)" "")
-
 vcpkg_check_features(
     OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
@@ -48,6 +45,10 @@ vcpkg_find_acquire_program(PYTHON3)
 get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
 vcpkg_add_to_path("${PYTHON3_DIR}")
 
+if(VCPKG_TARGET_IS_ANDROID)
+  list(APPEND FEATURE_OPTIONS "-DUA_ARCHITECTURE=posix")
+endif()
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS

diff --git a/ports/open62541/vcpkg.json b/ports/open62541/vcpkg.json
@@ -1,12 +1,18 @@
 {
   "name": "open62541",
-  "version": "1.3.15",
-  "port-version": 3,
+  "version": "1.4.12",
   "description": "open62541 is an open source C (C99) implementation of OPC UA licensed under the Mozilla Public License v2.0.",
   "homepage": "https://open62541.org",
   "license": "MPL-2.0",
   "supports": "!xbox",
   "dependencies": [
+    {
+      "name": "open62541",
+      "default-features": false,
+      "features": [
+        "methodcalls"
+      ]
+    },
     {
       "name": "vcpkg-cmake",
       "host": true
@@ -34,7 +40,15 @@
       ]
     },
     "discovery": {
-      "description": "Enable Discovery Service (LDS)"
+      "description": "Enable Discovery Service (LDS)",
+      "dependencies": [
+        {
+          "name": "open62541",
+          "features": [
+            "methodcalls"
+          ]
+        }
+      ]
     },
     "historizing": {
       "description": "Enable basic support for historical access (client and server)",
@@ -50,7 +64,14 @@
     "mbedtls": {
       "description": "Enable encryption support (uses MbedTLS)",
       "dependencies": [
-        "mbedtls"
+        "mbedtls",
+        {
+          "name": "open62541",
+          "default-features": false,
+          "features": [
+            "methodcalls"
+          ]
+        }
       ]
     },
     "methodcalls": {
@@ -61,6 +82,7 @@
       "dependencies": [
         {
           "name": "open62541",
+          "default-features": false,
           "features": [
             "methodcalls"
           ]
@@ -70,6 +92,13 @@
     "openssl": {
       "description": "Enable encryption support (uses OpenSSL)",
       "dependencies": [
+        {
+          "name": "open62541",
+          "default-features": false,
+          "features": [
+            "methodcalls"
+          ]
+        },
         "openssl"
       ]
     },

diff --git a/ports/opencv4/0021-fix-qt-gen-def.patch b/ports/opencv4/0021-fix-qt-gen-def.patch
@@ -0,0 +1,13 @@
+diff --git a/modules/highgui/CMakeLists.txt b/modules/highgui/CMakeLists.txt
+index f0a668e..6fafa33 100644
+--- a/modules/highgui/CMakeLists.txt
++++ b/modules/highgui/CMakeLists.txt
+@@ -125,8 +125,6 @@ elseif(HAVE_QT)
+     endif()
+
+     foreach(dt_dep ${qt_deps})
+-      add_definitions(${Qt${QT_VERSION_MAJOR}${dt_dep}_DEFINITIONS})
+-      include_directories(${Qt${QT_VERSION_MAJOR}${dt_dep}_INCLUDE_DIRS})
+       list(APPEND HIGHGUI_LIBRARIES ${Qt${QT_VERSION_MAJOR}${dt_dep}_LIBRARIES})
+     endforeach()
+   else()
diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake
@@ -23,6 +23,7 @@ vcpkg_from_github(
       0017-fix-flatbuffers.patch
       0019-opencl-kernel.patch
       0020-fix-narrow-filesystem.diff
+      0021-fix-qt-gen-def.patch
 )
 
 vcpkg_find_acquire_program(PKGCONFIG)

diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "opencv4",
   "version": "4.11.0",
-  "port-version": 3,
+  "port-version": 4,
   "description": "computer vision library",
   "homepage": "https://github.com/opencv/opencv",
   "license": "Apache-2.0",
@@ -165,7 +165,8 @@
       ]
     },
     "dshow": {
-      "description": "Enable DirectShow"
+      "description": "Enable DirectShow",
+      "supports": "windows"
     },
     "eigen": {
       "description": "Eigen support for opencv",

diff --git a/ports/qt/vcpkg.json b/ports/qt/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "qt",
-  "version": "6.8.3",
-  "port-version": 1,
+  "version": "6.9.0",
   "description": "A cross-platform application and UI framework.",
   "homepage": "https://www.qt.io/",
   "license": null,

diff --git a/ports/qt3d/vcpkg.json b/ports/qt3d/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt3d",
-  "version": "6.8.3",
+  "version": "6.9.0",
   "description": "Qt wrapper for existing OPC UA stacks",
   "homepage": "https://www.qt.io/",
   "license": null,
@@ -96,9 +96,17 @@
           "name": "qt3d",
           "default-features": false,
           "features": [
+            "render",
             "rhi"
           ]
         },
+        {
+          "name": "qtbase",
+          "default-features": false,
+          "features": [
+            "vulkan"
+          ]
+        },
         "vulkan"
       ]
     }

diff --git a/ports/qt5compat/vcpkg.json b/ports/qt5compat/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt5compat",
-  "version": "6.8.3",
+  "version": "6.9.0",
   "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,

diff --git a/ports/qtactiveqt/vcpkg.json b/ports/qtactiveqt/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtactiveqt",
-  "version": "6.8.3",
+  "version": "6.9.0",
   "description": "ActiveQt",
   "homepage": "https://www.qt.io/",
   "license": null,

diff --git a/ports/qtapplicationmanager/vcpkg.json b/ports/qtapplicationmanager/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtapplicationmanager",
-  "version": "6.8.3",
+  "version": "6.9.0",
   "description": "Qt component for application lifecycle management",
   "homepage": "https://www.qt.io/",
   "license": null,