diff --git a/ports/gtk/portfile.cmake b/ports/gtk/portfile.cmake index 57ff0a1f0d16ab..e176edaf8145ef 100644 --- a/ports/gtk/portfile.cmake +++ b/ports/gtk/portfile.cmake @@ -21,11 +21,12 @@ get_filename_component(PKGCONFIG_DIR "${PKGCONFIG}" DIRECTORY ) vcpkg_add_to_path("${PKGCONFIG_DIR}") # Post install script runs pkg-config so it needs to be on PATH vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/glib/") +set(wayland false) set(x11 false) set(win32 false) set(osx false) if(VCPKG_TARGET_IS_LINUX) - set(OPTIONS -Dwayland-backend=false) # CI missing at least wayland-protocols + set(wayland true) set(x11 true) # Enable the wayland gdk backend (only when building on Unix except for macOS) elseif(VCPKG_TARGET_IS_WINDOWS) @@ -34,6 +35,7 @@ elseif(VCPKG_TARGET_IS_OSX) set(osx true) endif() +list(APPEND OPTIONS -Dwayland-backend=${wayland}) #Enable the Wayland gdk backend (only when building on Unix) list(APPEND OPTIONS -Dx11-backend=${x11}) #Enable the X11 gdk backend (only when building on Unix) list(APPEND OPTIONS -Dbroadway-backend=false) #Enable the broadway (HTML5) gdk backend list(APPEND OPTIONS -Dwin32-backend=${win32}) #Enable the Windows gdk backend (only when building on Windows) diff --git a/ports/gtk/vcpkg.json b/ports/gtk/vcpkg.json index 6820c5b9b21156..68854da1c26dd1 100644 --- a/ports/gtk/vcpkg.json +++ b/ports/gtk/vcpkg.json @@ -56,6 +56,10 @@ { "name": "vcpkg-tool-meson", "host": true + }, + { + "name": "wayland-protocols", + "platform": "linux" } ], "features": { diff --git a/versions/g-/gtk.json b/versions/g-/gtk.json index c2acf4282cc8da..2d7db71f9132a9 100644 --- a/versions/g-/gtk.json +++ b/versions/g-/gtk.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "a00d8b7fc33fb6fa4794606fa5a83d682dc94e70", + "git-tree": "adfa7f2296204fe8e67abcc0a1ce8ea44215c15e", "version": "4.22.0", "port-version": 0 },