From 34a18bcebc3dd5b1620907f2d036bf56bb6c11e9 Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 12 Dec 2022 20:57:51 +0100 Subject: [PATCH] [wayland-protocols] update to 1.31 (#28290) --- ports/wayland-protocols/portfile.cmake | 10 +++++----- ports/wayland-protocols/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/w-/wayland-protocols.json | 5 +++++ 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ports/wayland-protocols/portfile.cmake b/ports/wayland-protocols/portfile.cmake index 8992e97b1b..50ae5c51ab 100644 --- a/ports/wayland-protocols/portfile.cmake +++ b/ports/wayland-protocols/portfile.cmake @@ -1,3 +1,4 @@ +vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) if(NOT X_VCPKG_FORCE_VCPKG_WAYLAND_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) @@ -9,8 +10,8 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org OUT_SOURCE_PATH SOURCE_PATH REPO wayland/wayland-protocols - REF e631010ab7b96988e7c64c24b7d90f64717eaeee - SHA512 ea10d840b89eb081f0d5e2fbc034f24a53beceb8da03aecc6faccf35f1fc78e5d5e29a5d602a823ab4774c264599d05456020f50886ccdde196af246b7c601fd + REF ${VERSION} + SHA512 cb0d38fada64832f8f7c71c1fcdd16fc3013cd81ac7146edbc4361328c9e5f02e31e0ba3b5219e85103fdc35aee49d54f9be537594d3618c5fb27de7375f84e1 HEAD_REF master ) @@ -22,8 +23,7 @@ vcpkg_configure_meson( vcpkg_install_meson() vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") # Handle copyright -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") endif() diff --git a/ports/wayland-protocols/vcpkg.json b/ports/wayland-protocols/vcpkg.json index 14c085793c..cf7483f941 100644 --- a/ports/wayland-protocols/vcpkg.json +++ b/ports/wayland-protocols/vcpkg.json @@ -1,6 +1,6 @@ { "name": "wayland-protocols", - "version": "1.27", + "version": "1.31", "description": "wayland-protocols contains Wayland protocols that add functionality not available in the Wayland core protocol.", "homepage": "https://wayland.freedesktop.org", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index ad1665d4ac..ad3e8f60a9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7961,7 +7961,7 @@ "port-version": 0 }, "wayland-protocols": { - "baseline": "1.27", + "baseline": "1.31", "port-version": 0 }, "websocketpp": { diff --git a/versions/w-/wayland-protocols.json b/versions/w-/wayland-protocols.json index 9dc51fc635..be3701c262 100644 --- a/versions/w-/wayland-protocols.json +++ b/versions/w-/wayland-protocols.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a47f6381ef380391595319d483f3e81098fce826", + "version": "1.31", + "port-version": 0 + }, { "git-tree": "9d0a9ad9c309ad60b1d8d2586ecbf269d65bd977", "version": "1.27",