diff --git a/ports/glibmm/portfile.cmake b/ports/glibmm/portfile.cmake index 2ec693e6c67f74..9168fdad9d679e 100644 --- a/ports/glibmm/portfile.cmake +++ b/ports/glibmm/portfile.cmake @@ -3,7 +3,7 @@ string(REGEX MATCH "^([0-9]*[.][0-9]*)" GLIBMM_MAJOR_MINOR "${VERSION}") vcpkg_download_distfile(GLIBMM_ARCHIVE URLS "https://ftp.gnome.org/pub/GNOME/sources/glibmm/${GLIBMM_MAJOR_MINOR}/glibmm-${VERSION}.tar.xz" FILENAME "glibmm-${VERSION}.tar.xz" - SHA512 6f9ee91212077f3712a5ba99507479b5c99d021670e6bf298afc7239fafed8a40b3b17bfae96d9a7fa7fb199c3994b81b433c8275afe89839229a1fe20ba791e + SHA512 bd628bca76570f92c3c0f7cbc878ec74ae243c4f201c205ce0c1fcf8f6778da4ccf72d1a8c712020980278b1a518307cf7c77f16aeb72e0a0816f6bc1d9f2391 ) vcpkg_extract_source_archive( diff --git a/ports/glibmm/vcpkg.json b/ports/glibmm/vcpkg.json index eacd17cf114635..73a4f8a700fde8 100644 --- a/ports/glibmm/vcpkg.json +++ b/ports/glibmm/vcpkg.json @@ -1,11 +1,10 @@ { "name": "glibmm", - "version": "2.80.1", - "port-version": 1, + "version": "2.86.0", "description": "This is glibmm, a C++ API for parts of glib that are useful for C++.", "homepage": "https://www.gtkmm.org.", "license": "LGPL-2.1-or-later", - "supports": "!uwp & !xbox", + "supports": "!uwp & !xbox & !(windows & !mingw & static)", "dependencies": [ "gettext", "glib", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 751b33f8f0ac89..734daa15af6c8b 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -236,9 +236,6 @@ glfw3:arm-neon-android=fail glfw3:arm64-android=fail glfw3:arm64-linux=fail glfw3:x64-android=fail -glibmm:arm64-windows-static-md=fail -glibmm:x64-windows-static-md=fail -glibmm:x64-windows-static=fail gmmlib:arm64-linux=fail gobject-introspection:arm-neon-android=fail # needs arm64 host gobject-introspection:arm64-android=fail diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index e08e3779f40063..7833782458c756 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -382,8 +382,6 @@ glew[egl]:arm64-osx=feature-fails glfw3:arm64-linux=fail glib[selinux]:arm64-linux=feature-fails glib-networking[openssl, gnutls]=options # You have to select exactly one ssl backend -glibmm:x64-windows-static-md=fail -glibmm:x64-windows-static=fail glpk[dl]:arm64-linux=cascade glpk[dl](!windows | uwp)=cascade glpk[mysql]:arm64-linux=cascade diff --git a/versions/baseline.json b/versions/baseline.json index 123bf8358dae25..440e009cf0285c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3449,8 +3449,8 @@ "port-version": 0 }, "glibmm": { - "baseline": "2.80.1", - "port-version": 1 + "baseline": "2.86.0", + "port-version": 0 }, "glm": { "baseline": "1.0.3", diff --git a/versions/g-/glibmm.json b/versions/g-/glibmm.json index 4147705becda72..b5f5df78a2bc15 100644 --- a/versions/g-/glibmm.json +++ b/versions/g-/glibmm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0af5315da4a63fcab340b6989a0870f9d184770a", + "version": "2.86.0", + "port-version": 0 + }, { "git-tree": "8d6c1e2f8d051288fce26c9294a15c89f3a56c3b", "version": "2.80.1",