From b26dbc167178da8898135db07bc7201f238109cb Mon Sep 17 00:00:00 2001 From: Javier Matos Denizac Date: Wed, 10 Jul 2024 16:43:47 -0400 Subject: [PATCH] [CI][GTK] Fix vulkan_enabled bug in GTK (#39788) Co-authored-by: Javier Matos --- ports/gtk/fix_vulkan_enabled.patch | 12 ++++++++++++ ports/gtk/portfile.cmake | 1 + ports/gtk/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/g-/gtk.json | 5 +++++ 5 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 ports/gtk/fix_vulkan_enabled.patch diff --git a/ports/gtk/fix_vulkan_enabled.patch b/ports/gtk/fix_vulkan_enabled.patch new file mode 100644 index 00000000000000..c62095917036d3 --- /dev/null +++ b/ports/gtk/fix_vulkan_enabled.patch @@ -0,0 +1,12 @@ +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 7d5ddcce6dab92..198ce56aba2b6e 100644 --- a/ports/gtk/portfile.cmake +++ b/ports/gtk/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_from_gitlab( HEAD_REF master # branch name 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 1ba37139911551..fcb9d6f1ff6989 100644 --- a/ports/gtk/vcpkg.json +++ b/ports/gtk/vcpkg.json @@ -1,6 +1,7 @@ { "name": "gtk", "version": "4.14.0", + "port-version": 1, "description": "Portable library for creating graphical user interfaces.", "homepage": "https://www.gtk.org/", "license": "LGPL-2.0-only", diff --git a/versions/baseline.json b/versions/baseline.json index a6b7826fff2d0a..84320b3d24d9d1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3254,7 +3254,7 @@ }, "gtk": { "baseline": "4.14.0", - "port-version": 0 + "port-version": 1 }, "gtk3": { "baseline": "3.24.38", diff --git a/versions/g-/gtk.json b/versions/g-/gtk.json index 4db62f51947f6d..e09efb0894156f 100644 --- a/versions/g-/gtk.json +++ b/versions/g-/gtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4a2c53b5715720e68051e3d26bfa56a83b6c8de0", + "version": "4.14.0", + "port-version": 1 + }, { "git-tree": "d5ba4a94cd8433f563ba1519395f202d29bd8790", "version": "4.14.0",