diff --git a/ports/at-spi2-atk/portfile.cmake b/ports/at-spi2-atk/portfile.cmake index 9b7ba9134b..a0972148cb 100644 --- a/ports/at-spi2-atk/portfile.cmake +++ b/ports/at-spi2-atk/portfile.cmake @@ -1,7 +1,3 @@ -if(VCPKG_TARGET_IS_LINUX) - message(STATUS "${PORT} currently requires the following libraries from the system package manager:\n libdbus-1\n\nThese can be installed on Ubuntu systems via apt-get install libdbus-1-dev") -endif() - vcpkg_from_gitlab( OUT_SOURCE_PATH SOURCE_PATH GITLAB_URL https://gitlab.gnome.org @@ -22,7 +18,7 @@ vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") diff --git a/ports/at-spi2-atk/vcpkg.json b/ports/at-spi2-atk/vcpkg.json index 27c85cbdd9..232abaf70b 100644 --- a/ports/at-spi2-atk/vcpkg.json +++ b/ports/at-spi2-atk/vcpkg.json @@ -1,6 +1,7 @@ { "name": "at-spi2-atk", "version": "2.38.0", + "port-version": 1, "description": "Implementation of the ATK interfaces in terms of the libatspi2 API.", "homepage": "https://www.gtk.org/", "license": null, @@ -8,6 +9,10 @@ "dependencies": [ "at-spi2-core", "atk", + { + "name": "dbus", + "platform": "linux" + }, "libxml2", { "name": "vcpkg-tool-meson", diff --git a/ports/at-spi2-core/portfile.cmake b/ports/at-spi2-core/portfile.cmake index fcb6841604..3084f71f36 100644 --- a/ports/at-spi2-core/portfile.cmake +++ b/ports/at-spi2-core/portfile.cmake @@ -1,5 +1,5 @@ if(VCPKG_TARGET_IS_LINUX) - message(STATUS "${PORT} currently requires the following libraries from the system package manager:\n libdbus-1-dev\n libxi-dev\n libxtst-dev\n\nThese can be installed on Ubuntu systems via apt-get install libdbus-1-dev libxi-dev libxtst-dev") + message(STATUS "${PORT} currently requires the following libraries from the system package manager:\n libxi-dev\n libxtst-dev\n\nThese can be installed on Ubuntu systems via apt-get install libxi-dev libxtst-dev") endif() vcpkg_from_gitlab( @@ -36,7 +36,7 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") ) endif() -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/share/defaults") diff --git a/ports/at-spi2-core/vcpkg.json b/ports/at-spi2-core/vcpkg.json index 9985253c0b..b82464a6c9 100644 --- a/ports/at-spi2-core/vcpkg.json +++ b/ports/at-spi2-core/vcpkg.json @@ -1,12 +1,16 @@ { "name": "at-spi2-core", "version": "2.44.1", - "port-version": 2, + "port-version": 3, "description": "Base DBus XML interfaces for accessibility, the accessibility registry daemon, and atspi library.", "homepage": "https://www.gtk.org/", "license": null, "supports": "linux", "dependencies": [ + { + "name": "dbus", + "platform": "linux" + }, "glib", { "name": "glib", diff --git a/versions/a-/at-spi2-atk.json b/versions/a-/at-spi2-atk.json index a97e2158fa..69e2bf28d1 100644 --- a/versions/a-/at-spi2-atk.json +++ b/versions/a-/at-spi2-atk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "97535464d9f15ce3bcadaf78ad8031fa3df5eda5", + "version": "2.38.0", + "port-version": 1 + }, { "git-tree": "ebb28a9cdbd06d3185ba2e0cfc1945be23a0a608", "version": "2.38.0", diff --git a/versions/a-/at-spi2-core.json b/versions/a-/at-spi2-core.json index 07921b889b..b3509184cd 100644 --- a/versions/a-/at-spi2-core.json +++ b/versions/a-/at-spi2-core.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5143414003b96ead1ffe40c57c9bf764bf64b0c0", + "version": "2.44.1", + "port-version": 3 + }, { "git-tree": "897df7693a8a1addc3a5ab84efabef89e4cef1d8", "version": "2.44.1", diff --git a/versions/baseline.json b/versions/baseline.json index 12a437e8d6..47e0111362 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -286,11 +286,11 @@ }, "at-spi2-atk": { "baseline": "2.38.0", - "port-version": 0 + "port-version": 1 }, "at-spi2-core": { "baseline": "2.44.1", - "port-version": 2 + "port-version": 3 }, "atk": { "baseline": "2.38.0",