From 09fc3e34342ccb868b08ff8ed630195082c4f575 Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Sat, 8 Oct 2022 07:34:29 +0200
Subject: [PATCH 1/4] Fix port issues

---
 ports/libui/portfile.cmake | 14 ++++++--------
 ports/libui/vcpkg.json     | 20 ++++++++++++++++++--
 scripts/ci.baseline.txt    |  3 ---
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/ports/libui/portfile.cmake b/ports/libui/portfile.cmake
index d975cdfe81ab83..0366d6d8b6b216 100644
--- a/ports/libui/portfile.cmake
+++ b/ports/libui/portfile.cmake
@@ -10,18 +10,16 @@ vcpkg_from_github(
         "003-fix-system-link.patch"
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
 vcpkg_copy_pdbs()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libui TARGET_PATH share/unofficial-libui)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libui PACKAGE_NAME unofficial-libui)
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-# Handle copyright
-configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/ports/libui/vcpkg.json b/ports/libui/vcpkg.json
index 5d7ff38eb6924e..40140786a8651f 100644
--- a/ports/libui/vcpkg.json
+++ b/ports/libui/vcpkg.json
@@ -1,7 +1,23 @@
 {
   "name": "libui",
   "version-date": "2018-11-03",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Simple and portable (but not inflexible) native GUI library in C.",
-  "homepage": "https://github.com/andlabs/libui"
+  "homepage": "https://github.com/andlabs/libui",
+  "license": "MIT",
+  "supports": "!android & !emscripten & !ios & !uwp",
+  "dependencies": [
+    {
+      "name": "gtk3",
+      "platform": "!windows & !osx"
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 7ed698cdef3a13..481bdc459a3eb0 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -519,9 +519,6 @@ libtins:arm-uwp=fail
 libtins:x64-uwp=fail
 libtomcrypt:arm64-windows=fail
 libtomcrypt:arm-uwp=fail
-libui:arm-uwp=fail
-libui:x64-linux=fail
-libui:x64-uwp=fail
 libusb:arm-uwp=fail
 libusb:x64-uwp=fail
 libusb:arm64-windows=fail

From 65a57908d2fa0132d2a9cce91b6c2dbc52aa8183 Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Sat, 8 Oct 2022 07:35:32 +0200
Subject: [PATCH 2/4] Update versions

---
 versions/baseline.json | 2 +-
 versions/l-/libui.json | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/versions/baseline.json b/versions/baseline.json
index 51a2caad19845f..d5ffb9adf9a118 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4274,7 +4274,7 @@
     },
     "libui": {
       "baseline": "2018-11-03",
-      "port-version": 2
+      "port-version": 3
     },
     "libunibreak": {
       "baseline": "5.0",
diff --git a/versions/l-/libui.json b/versions/l-/libui.json
index 2c5c16298a5f3e..1b5890f7d29ae4 100644
--- a/versions/l-/libui.json
+++ b/versions/l-/libui.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3788945d32f1b36384101cd41ec1ae25c45ee195",
+      "version-date": "2018-11-03",
+      "port-version": 3
+    },
     {
       "git-tree": "941bfc035a8cfa6020be3475769732b027249a1d",
       "version-date": "2018-11-03",

From 59f4f5a433eda109b9367af529ae79c752c2c879 Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Sat, 8 Oct 2022 07:52:19 +0200
Subject: [PATCH 3/4] Fix mingw

---
 ports/libui/portfile.cmake | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/libui/portfile.cmake b/ports/libui/portfile.cmake
index 0366d6d8b6b216..56eea00cffd6b7 100644
--- a/ports/libui/portfile.cmake
+++ b/ports/libui/portfile.cmake
@@ -1,3 +1,7 @@
+if(VCPKG_TARGET_IS_MINGW)
+    vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+endif()
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO andlabs/libui

From ec4fb9df96cfe754e17631417b174adb48683a91 Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Sat, 8 Oct 2022 07:52:43 +0200
Subject: [PATCH 4/4] Update versions

---
 versions/l-/libui.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/l-/libui.json b/versions/l-/libui.json
index 1b5890f7d29ae4..15e4599ca71a8e 100644
--- a/versions/l-/libui.json
+++ b/versions/l-/libui.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "3788945d32f1b36384101cd41ec1ae25c45ee195",
+      "git-tree": "2eac6098c733ccc84e2c69092ac8cfd6499af3be",
       "version-date": "2018-11-03",
       "port-version": 3
     },