more fixes

microsoft · Oct 17, 2024 · 6824632 · 6824632
1 parent 77c8b95
commit 6824632
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/ports/open62541/portfile.cmake b/ports/open62541/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO open62541/open62541
     REF "v${VERSION}"
-    SHA512 7fd5f9a4df38dbe973995f410fe51ee9228e3a06554e9c02168a9851b7480f90fc1e2f522962be73d1e4b9ede5fe889e9131de57f8d12f334f5db74a96fb8061
+    SHA512 639612c72a551c98c1ca68a4dc226201592f52c98969a80a7c5c1b5f2c811f8bd3fd8c2865034901ff9467e6675580391a80045f5da99f3b6ffed45f9a0ec1bd
     HEAD_REF master
 )
 

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

diff --git a/ports/qtapplicationmanager/portfile.cmake b/ports/qtapplicationmanager/portfile.cmake
@@ -20,6 +20,13 @@ if(QT_UPDATE_VERSION)
     return()
 endif()
 
+set(opts "")
+if(VCPKG_TARGET_IS_LINUX)
+  set(opts -DINPUT_systemd_watchdog=ON)
+else()
+  set(opts -DINPUT_systemd_watchdog=OFF)
+endif()
+
 set(qt_plugindir ${QT6_DIRECTORY_PREFIX}plugins)
 set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml)
 qt_cmake_configure(${_opt} 
@@ -28,11 +35,11 @@ qt_cmake_configure(${_opt}
                         -DINPUT_libarchive='system'
                         -DINPUT_libyaml='system'
                         -DFEATURE_am_system_libyaml=ON
-                        -DINPUT_libyaml='system'
                         -DFEATURE_am_system_libarchive=ON
-                        -DINPUT_libarchive='system'
                         -DINPUT_libdbus='no'
                         -DINPUT_libbacktrace='no'
+                        -DINPUT_widgets_support=ON
+                        ${opts}
                    OPTIONS_DEBUG
                    OPTIONS_RELEASE)
 

diff --git a/ports/qtapplicationmanager/vcpkg.json b/ports/qtapplicationmanager/vcpkg.json
@@ -6,6 +6,11 @@
   "license": null,
   "dependencies": [
     "libarchive",
+    {
+      "name": "libsystemd",
+      "default-features": false,
+      "platform": "linux"
+    },
     "libyaml",
     {
       "name": "qtapplicationmanager",
@@ -14,7 +19,8 @@
     },
     {
       "name": "qtbase",
-      "default-features": false
+      "default-features": false,
+      "features" : "widget"
     },
     {
       "name": "qtdeclarative",
@@ -24,6 +30,7 @@
       "name": "qtwayland",
       "default-features": false,
       "platform": "!windows"
-    }
+    },
+    "qthttpserver"
   ]
 }