diff --git a/ports/ois/0002-fix-cmake4.patch b/ports/ois/0002-fix-cmake4.patch index 55c65890ea..f4276ed4cf 100644 --- a/ports/ois/0002-fix-cmake4.patch +++ b/ports/ois/0002-fix-cmake4.patch @@ -1,12 +1,11 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index f65b86000d..c06b1dd64d 100644 +index e7f8716..45ef818 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -188,8 +188,7 @@ endif() +@@ -218,7 +218,7 @@ endif() if(UNIX) if (NOT APPLE) -- add_dependencies(OIS X11) - target_link_libraries(OIS X11) + target_link_libraries(OIS X11::X11) endif() diff --git a/ports/ois/portfile.cmake b/ports/ois/portfile.cmake index 7213bbd7e7..98bbd4d01a 100644 --- a/ports/ois/portfile.cmake +++ b/ports/ois/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wgois/OIS - REF v1.5.1 - SHA512 20598aef999a70900cb7f75ffaf62059acf8e811822971cb21986b5d25d28dacb79e4b4cf4770c70e00d3c55cdd01ef3e68a77c2dd148677784fc4df38891340 + REF v${VERSION} + SHA512 f9145d632d4cb0f23199be803aa0847d7d339c739e4a0c8f733e121c51a28e72254285416810271bf164b3447097a26ca55a05e1547b30078d19669c7e84445f HEAD_REF master PATCHES 0001_install_pkgconfig_win32.patch diff --git a/ports/ois/vcpkg.json b/ports/ois/vcpkg.json index 64715bfbf9..322ec06f7d 100644 --- a/ports/ois/vcpkg.json +++ b/ports/ois/vcpkg.json @@ -1,7 +1,6 @@ { "name": "ois", - "version": "1.5.1", - "port-version": 2, + "version": "1.6.0", "description": "Cross Platform Object Oriented Input Lib System. Meant to be very robust and compatible with many systems and operating systems.", "homepage": "https://wgois.github.io/OIS/", "license": "Zlib", diff --git a/versions/baseline.json b/versions/baseline.json index b6f9815bc3..871eae40be 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7109,8 +7109,8 @@ "port-version": 0 }, "ois": { - "baseline": "1.5.1", - "port-version": 2 + "baseline": "1.6.0", + "port-version": 0 }, "omniorb": { "baseline": "4.3.0", diff --git a/versions/o-/ois.json b/versions/o-/ois.json index c6f739ba4d..f346c8b148 100644 --- a/versions/o-/ois.json +++ b/versions/o-/ois.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5d5612f7bfb9c47ed5adf08387addab7434b7652", + "version": "1.6.0", + "port-version": 0 + }, { "git-tree": "09bdf5d45cb89f22668fab20acd5156a3d016bc3", "version": "1.5.1",