diff --git a/VCPKG_BASELINE b/VCPKG_BASELINE index 7b562fde9..fd5a78569 100644 --- a/VCPKG_BASELINE +++ b/VCPKG_BASELINE @@ -1 +1 @@ -a78b96b07eb590c59bde5db0f4b260bda45ba92d \ No newline at end of file +b4097dd14b05a86289e1eaa20387e09d16c7bb36 \ No newline at end of file diff --git a/vcpkg.json b/vcpkg.json index f95cc2391..dcd923f93 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -84,13 +84,7 @@ }, { "name": "qtbase", - "default-features": false, - "features": [ - { - "name": "wayland", - "platform": "linux" - } - ] + "default-features": false }, "qtconnectivity", "qtdeclarative", @@ -129,7 +123,7 @@ "default-features": false } ], - "builtin-baseline": "a78b96b07eb590c59bde5db0f4b260bda45ba92d", + "builtin-baseline": "b4097dd14b05a86289e1eaa20387e09d16c7bb36", "overrides": [ { "$comment": "Required for QCA to work properly", diff --git a/vcpkg/ports/README.md b/vcpkg/ports/README.md index 57a033688..0e99233d4 100644 --- a/vcpkg/ports/README.md +++ b/vcpkg/ports/README.md @@ -6,3 +6,4 @@ - qgis - no official port in vcpkg - qtdeclarative - optimization to decrease package size - qtpositioning - Android service fix & iOS orthometric position hack +- libsecret - Build with -Dbash_completion=disabled to avoid PermissionError: [Errno 13] Permission denied: '/usr/share/bash-completion/completions/secret-tool' diff --git a/vcpkg/ports/libsecret/portfile.cmake b/vcpkg/ports/libsecret/portfile.cmake new file mode 100644 index 000000000..b06c0f11a --- /dev/null +++ b/vcpkg/ports/libsecret/portfile.cmake @@ -0,0 +1,39 @@ +string( + REGEX MATCH + [[^[0-9][0-9]*\.[1-9][0-9]*]] + VERSION_MAJOR_MINOR + ${VERSION} +) +vcpkg_download_distfile( + ARCHIVE + URLS + "https://download.gnome.org/sources/${PORT}/${VERSION_MAJOR_MINOR}/${PORT}-${VERSION}.tar.xz" + "https://www.mirrorservice.org/sites/ftp.gnome.org/pub/GNOME/sources/${PORT}/${VERSION_MAJOR_MINOR}/${PORT}-${VERSION}.tar.xz" + FILENAME + "GNOME-${PORT}-${VERSION}.tar.xz" + SHA512 + f5ee1244338ba324ae403096ddd7357899f55fa9f961d2473515ac924164fe9b33f87e39eea2a30b99fc32f2300c0e626d20c98509dbbcadb2c99628a1caa0e4 +) + +vcpkg_extract_source_archive(SOURCE_PATH ARCHIVE "${ARCHIVE}") + +vcpkg_configure_meson( + SOURCE_PATH + "${SOURCE_PATH}" + OPTIONS + -Dintrospection=false + -Dgtk_doc=false + -Dmanpage=false + -Dvapi=false + -Dbash_completion=disabled + ADDITIONAL_BINARIES + gdbus-codegen='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/gdbus-codegen' + glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' +) +vcpkg_install_meson() +vcpkg_fixup_pkgconfig() +vcpkg_copy_tools(TOOL_NAMES secret-tool AUTO_CLEAN) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/vcpkg/ports/libsecret/vcpkg.json b/vcpkg/ports/libsecret/vcpkg.json new file mode 100644 index 000000000..46773fd4b --- /dev/null +++ b/vcpkg/ports/libsecret/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "libsecret", + "version": "0.21.7", + "description": "libsecret is a GObject-based library for accessing the Secret Service API of the freedesktop.org project, a cross-desktop effort to access passwords, tokens and other types of secrets. libsecret provides a convenient wrapper for these methods so consumers do not have to call the low-level DBus methods.", + "homepage": "https://gitlab.gnome.org/GNOME/libsecret/", + "license": "LGPL-2.1-or-later", + "supports": "!android & !ios & !osx & !windows", + "dependencies": [ + "glib", + { + "name": "glib", + "host": true + }, + "libgcrypt", + { + "name": "vcpkg-tool-meson", + "host": true + } + ] +}