diff --git a/ports/gtk/0001-build.patch b/ports/gtk/0001-build.patch index 40e3529f031d18..68c571ed4c9c6f 100644 --- a/ports/gtk/0001-build.patch +++ b/ports/gtk/0001-build.patch @@ -1,13 +1,13 @@ diff --git a/meson.build b/meson.build -index 5efd8a9..d51af19 100644 +index 713d87a531..e2e86726a2 100644 --- a/meson.build +++ b/meson.build -@@ -857,7 +857,7 @@ subdir('po') +@@ -1008,7 +1008,7 @@ if os_unix + endif - subdir('docs/reference') -if not meson.is_cross_build() +if false gnome.post_install( glib_compile_schemas: true, - gio_querymodules: gio_module_dirs, + gtk_update_icon_cache: get_option('build-demos'), diff --git a/ports/gtk/fix_vulkan_enabled.patch b/ports/gtk/fix_vulkan_enabled.patch deleted file mode 100644 index c62095917036d3..00000000000000 --- a/ports/gtk/fix_vulkan_enabled.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/meson.build b/meson.build -index 5ade7c2..9f48161 100644 ---- a/meson.build -+++ b/meson.build -@@ -123,7 +123,6 @@ os_unix = not os_win32 - - if os_darwin - wayland_enabled = false -- vulkan_enabled = false - else - macos_enabled = false - endif diff --git a/ports/gtk/portfile.cmake b/ports/gtk/portfile.cmake index 74dc6e33629f80..57ff0a1f0d16ab 100644 --- a/ports/gtk/portfile.cmake +++ b/ports/gtk/portfile.cmake @@ -1,20 +1,19 @@ # It installs only shared libs, regardless build type. vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) -string(REGEX MATCH [[^[0-9][0-9]*\.[1-9][0-9]*]] VERSION_MAJOR_MINOR ${VERSION}) +string(REGEX MATCH [[^[0-9][0-9]*\.[1-9][0-9]*]] VERSION_MAJOR_MINOR "${VERSION}") vcpkg_download_distfile(ARCHIVE URLS "https://download.gnome.org/sources/${PORT}/${VERSION_MAJOR_MINOR}/${PORT}-${VERSION}.tar.xz" "https://www.mirrorservice.org/sites/ftp.gnome.org/pub/GNOME/sources/${PORT}/${VERSION_MAJOR_MINOR}/${PORT}-${VERSION}.tar.xz" FILENAME "GNOME-${PORT}-${VERSION}.tar.xz" - SHA512 7a6f4c48ea57c7cd1946bd33c9fdacfbb4a5ed9c02034f3cd483099539d6bcd5448144fe13f66815cdd51a693ccb317872accf1b150730404fb2d618222a78ca + SHA512 bfea8825c5cdaaaea95055bf522c384b23bb26e9b8205081d055f85dc5df5d357827139115a4b7efe4d42418714b2ac062349459f761b383bed170354ecfa7f4 ) vcpkg_extract_source_archive(SOURCE_PATH ARCHIVE "${ARCHIVE}" PATCHES 0001-build.patch - fix_vulkan_enabled.patch ) vcpkg_find_acquire_program(PKGCONFIG) diff --git a/ports/gtk/vcpkg.json b/ports/gtk/vcpkg.json index 309cb710df9068..6820c5b9b21156 100644 --- a/ports/gtk/vcpkg.json +++ b/ports/gtk/vcpkg.json @@ -1,13 +1,11 @@ { "name": "gtk", - "version": "4.16.3", - "port-version": 4, + "version": "4.22.0", "description": "Portable library for creating graphical user interfaces.", "homepage": "https://www.gtk.org/", "license": "LGPL-2.0-only", "supports": "!android & !xbox & !(arm64 & windows)", "dependencies": [ - "atk", { "name": "cairo", "default-features": false, @@ -23,6 +21,10 @@ ], "platform": "linux" }, + { + "name": "directx-headers", + "platform": "windows" + }, "gdk-pixbuf", { "name": "gettext", @@ -59,15 +61,8 @@ "features": { "introspection": { "description": "Build with introspection", - "supports": "!static", + "supports": "!static & !windows", "dependencies": [ - { - "name": "atk", - "default-features": false, - "features": [ - "introspection" - ] - }, { "name": "gdk-pixbuf", "default-features": false, diff --git a/ports/gtkmm/gtk.patch b/ports/gtkmm/gtk.patch new file mode 100644 index 00000000000000..fd8b17d0719bfb --- /dev/null +++ b/ports/gtkmm/gtk.patch @@ -0,0 +1,17 @@ +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 30fa7451fe3326..afb21efd9166f6 100644 --- a/ports/gtkmm/portfile.cmake +++ b/ports/gtkmm/portfile.cmake @@ -8,6 +8,8 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive( SOURCE_PATH ARCHIVE ${ARCHIVE} + PATCHES + gtk.patch ) vcpkg_configure_meson( diff --git a/ports/gtkmm/vcpkg.json b/ports/gtkmm/vcpkg.json index 88f39b647b5d9d..b88010dec6eba5 100644 --- a/ports/gtkmm/vcpkg.json +++ b/ports/gtkmm/vcpkg.json @@ -1,6 +1,7 @@ { "name": "gtkmm", "version": "4.14.0", + "port-version": 1, "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 556faea46b52b7..4efa6b715dbed7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3581,8 +3581,8 @@ "port-version": 2 }, "gtk": { - "baseline": "4.16.3", - "port-version": 4 + "baseline": "4.22.0", + "port-version": 0 }, "gtk3": { "baseline": "3.24.51", @@ -3590,7 +3590,7 @@ }, "gtkmm": { "baseline": "4.14.0", - "port-version": 0 + "port-version": 1 }, "gtl": { "baseline": "1.2.0", diff --git a/versions/g-/gtk.json b/versions/g-/gtk.json index f83272fcc8f1ff..c2acf4282cc8da 100644 --- a/versions/g-/gtk.json +++ b/versions/g-/gtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a00d8b7fc33fb6fa4794606fa5a83d682dc94e70", + "version": "4.22.0", + "port-version": 0 + }, { "git-tree": "3c9c787bf4bf79bce87f1aaaa434a66b12ebc430", "version": "4.16.3", diff --git a/versions/g-/gtkmm.json b/versions/g-/gtkmm.json index 6d503b221e4c1d..7e21dff34ba58f 100644 --- a/versions/g-/gtkmm.json +++ b/versions/g-/gtkmm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2b05ebe5f3e9df8f79f113375600b813f247648b", + "version": "4.14.0", + "port-version": 1 + }, { "git-tree": "89805ce5526aad3b7b6b1f1242204959c61b4ddb", "version": "4.14.0",