Skip to content

Commit

Permalink
[libui] Revise platform support (#27141)
Browse files Browse the repository at this point in the history
* Fix port issues

* Update versions

* Fix mingw

* Update versions
  • Loading branch information
dg0yt authored Oct 9, 2022
1 parent a5e5f4d commit 26a0995
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 14 deletions.
18 changes: 10 additions & 8 deletions ports/libui/portfile.cmake
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -10,18 +14,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")
20 changes: 18 additions & 2 deletions ports/libui/vcpkg.json
Original file line number Diff line number Diff line change
@@ -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
}
]
}
3 changes: 0 additions & 3 deletions scripts/ci.baseline.txt
Original file line number Diff line number Diff line change
Expand Up @@ -518,9 +518,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
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -4274,7 +4274,7 @@
},
"libui": {
"baseline": "2018-11-03",
"port-version": 2
"port-version": 3
},
"libunibreak": {
"baseline": "5.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libui.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "2eac6098c733ccc84e2c69092ac8cfd6499af3be",
"version-date": "2018-11-03",
"port-version": 3
},
{
"git-tree": "941bfc035a8cfa6020be3475769732b027249a1d",
"version-date": "2018-11-03",
Expand Down

0 comments on commit 26a0995

Please sign in to comment.