diff --git a/ports/gtkmm/gtk.patch b/ports/gtkmm/gtk.patch deleted file mode 100644 index fd8b17d0719bfb..00000000000000 --- a/ports/gtkmm/gtk.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/untracked/gtk/gtkmm/iconpaintable.h b/untracked/gtk/gtkmm/iconpaintable.h -index b659ed22..c4c56600 100644 ---- "a/untracked/gtk/gtkmm/iconpaintable.h" -+++ "b/untracked/gtk/gtkmm/iconpaintable.h" -@@ -29,11 +29,10 @@ - #include - #include - #include -+#include - - - #ifndef DOXYGEN_SHOULD_SKIP_THIS --using GtkIconPaintable = struct _GtkIconPaintable; --using GtkIconPaintableClass = struct _GtkIconPaintableClass; - #endif /* DOXYGEN_SHOULD_SKIP_THIS */ - - diff --git a/ports/gtkmm/portfile.cmake b/ports/gtkmm/portfile.cmake index afb21efd9166f6..6ca1cbedf9d784 100644 --- a/ports/gtkmm/portfile.cmake +++ b/ports/gtkmm/portfile.cmake @@ -2,18 +2,16 @@ string(REGEX MATCH "^([0-9]*[.][0-9]*)" GTKMM_MAJOR_MINOR "${VERSION}") vcpkg_download_distfile(ARCHIVE URLS "https://ftp.gnome.org/pub/GNOME/sources/gtkmm/${GTKMM_MAJOR_MINOR}/gtkmm-${VERSION}.tar.xz" FILENAME "gtkmm-${VERSION}.tar.xz" - SHA512 94cf1f764e539b8b1fdff101f6e134c5e2bc9379f1dae3b6daef66ab94e90f5e70a41d8eb94842fd54c0f8706c565e975fa2adf6e4c6913cecaeb3c8cf00a1cd + SHA512 c65bfa6dc0788cdd698c25e3b29861cb47aa0cd9c8bd3632005958ecd5a8d92802fc8ecaf498bcfc281a9b4035e751eeb6c05fa351f4b14c063870218127dabd ) vcpkg_extract_source_archive( SOURCE_PATH - ARCHIVE ${ARCHIVE} - PATCHES - gtk.patch + ARCHIVE "${ARCHIVE}" ) vcpkg_configure_meson( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -Dmsvc14x-parallel-installable=false # Use separate DLL and LIB filenames for Visual Studio 2017 and 2019 -Dbuild-tests=false diff --git a/ports/gtkmm/vcpkg.json b/ports/gtkmm/vcpkg.json index b88010dec6eba5..932105dce5d43e 100644 --- a/ports/gtkmm/vcpkg.json +++ b/ports/gtkmm/vcpkg.json @@ -1,7 +1,6 @@ { "name": "gtkmm", - "version": "4.14.0", - "port-version": 1, + "version": "4.20.0", "description": "gtkmm is the official C++ interface for the popular GUI library GTK+.", "homepage": "https://www.gtkmm.org/", "license": "LGPL-3.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 819ba3dd86f572..8819b9fcb71f5b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3589,8 +3589,8 @@ "port-version": 3 }, "gtkmm": { - "baseline": "4.14.0", - "port-version": 1 + "baseline": "4.20.0", + "port-version": 0 }, "gtl": { "baseline": "1.2.0", diff --git a/versions/g-/gtkmm.json b/versions/g-/gtkmm.json index 7e21dff34ba58f..b793ec4431d0e5 100644 --- a/versions/g-/gtkmm.json +++ b/versions/g-/gtkmm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5ca079b1d25e02a1ebd0390c33d3003a3d8bd172", + "version": "4.20.0", + "port-version": 0 + }, { "git-tree": "2b05ebe5f3e9df8f79f113375600b813f247648b", "version": "4.14.0",