diff --git a/ports/gtk3/portfile.cmake b/ports/gtk3/portfile.cmake index ad418ebe8d..52f7e8e245 100644 --- a/ports/gtk3/portfile.cmake +++ b/ports/gtk3/portfile.cmake @@ -38,8 +38,13 @@ else() list(APPEND OPTIONS_RELEASE -Dintrospection=false) endif() +set(BINARIES "") + if("wayland" IN_LIST FEATURES) list(APPEND OPTIONS -Dwayland_backend=true) + if(X_VCPKG_FORCE_VCPKG_WAYLAND_LIBRARIES) + list(APPEND BINARIES "wayland-scanner='${CURRENT_HOST_INSTALLED_DIR}/tools/wayland/wayland-scanner${VCPKG_HOST_EXECUTABLE_SUFFIX}'") + endif() else() list(APPEND OPTIONS -Dwayland_backend=false) endif() @@ -70,6 +75,7 @@ vcpkg_configure_meson( "glib-compile-schemas='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-schemas${VCPKG_HOST_EXECUTABLE_SUFFIX}'" "g-ir-compiler='${GIR_COMPILER}'" "g-ir-scanner='${GIR_SCANNER}'" + ${BINARIES} ) # Reduce command line lengths, in particular for static windows builds. diff --git a/ports/gtk3/vcpkg.json b/ports/gtk3/vcpkg.json index d075580567..107438eaea 100644 --- a/ports/gtk3/vcpkg.json +++ b/ports/gtk3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gtk3", "version": "3.24.52", - "port-version": 1, + "port-version": 2, "description": "Portable library for creating graphical user interfaces.", "homepage": "https://www.gtk.org/", "license": null, @@ -94,6 +94,7 @@ "description": "Build with Wayland support", "supports": "linux | freebsd | openbsd", "dependencies": [ + "libxkbcommon", "wayland", "wayland-protocols" ] diff --git a/versions/baseline.json b/versions/baseline.json index b51914f772..0974d1998b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3606,7 +3606,7 @@ }, "gtk3": { "baseline": "3.24.52", - "port-version": 1 + "port-version": 2 }, "gtkmm": { "baseline": "4.22.0", diff --git a/versions/g-/gtk3.json b/versions/g-/gtk3.json index baf4b7c4cc..d9f734650a 100644 --- a/versions/g-/gtk3.json +++ b/versions/g-/gtk3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fdaacc5cc7324e2e33d4d5453cae2bdf4358b326", + "version": "3.24.52", + "port-version": 2 + }, { "git-tree": "afdd4189312de678e0fe7da05ffa6277847205a2", "version": "3.24.52",