[pkgconf] Update to 3.0.3 (#50216)

This commit is contained in:
Kai Pastor 2026-07-16 14:17:48 +02:00 committed by GitHub
parent 5b698638c9
commit 6c4c85578e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 108 additions and 158 deletions

View File

@ -1,50 +0,0 @@
diff --git a/cli/main.c b/cli/main.c
index a1cf90e..3ab2092 100644
--- a/cli/main.c
+++ b/cli/main.c
@@ -1055,7 +1055,7 @@ unveil_search_paths(const pkgconf_client_t *client, const pkgconf_cross_personal
{
pkgconf_path_t *pn = n->data;
- if (pkgconf_unveil(pn->path, "r") == -1)
+ if (pkgconf_unveil(pn->path, "r") == -1 && errno != ENOENT)
return false;
}
@@ -1063,7 +1063,7 @@ unveil_search_paths(const pkgconf_client_t *client, const pkgconf_cross_personal
{
pkgconf_path_t *pn = n->data;
- if (pkgconf_unveil(pn->path, "r") == -1)
+ if (pkgconf_unveil(pn->path, "r") == -1 && errno != ENOENT)
return false;
}
@@ -1276,13 +1276,6 @@ main(int argc, char *argv[])
/* now, bring up the client. settings are preserved since the client is prealloced */
pkgconf_client_init(&pkg_client, error_handler, NULL, personality);
- /* unveil the entire search path now that we have loaded the personality data. */
- if (!unveil_search_paths(&pkg_client, personality))
- {
- fprintf(stderr, "pkgconf: unveil failed: %s\n", strerror(errno));
- return EXIT_FAILURE;
- }
-
#ifndef PKGCONF_LITE
if ((want_flags & PKG_MSVC_SYNTAX) == PKG_MSVC_SYNTAX || getenv("PKG_CONFIG_MSVC_SYNTAX") != NULL)
want_render_ops = msvc_renderer_get();
@@ -1452,6 +1445,13 @@ main(int argc, char *argv[])
/* at this point, want_client_flags should be set, so build the dir list */
pkgconf_client_dir_list_build(&pkg_client, personality);
+ /* unveil the entire search path now that we have loaded the personality data. */
+ if (!unveil_search_paths(&pkg_client, personality))
+ {
+ fprintf(stderr, "pkgconf: unveil failed: %s\n", strerror(errno));
+ return EXIT_FAILURE;
+ }
+
/* preload any files in PKG_CONFIG_PRELOADED_FILES */
pkgconf_client_preload_from_environ(&pkg_client, "PKG_CONFIG_PRELOADED_FILES");

View File

@ -1,18 +1,14 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO pkgconf/pkgconf
REF "pkgconf-${VERSION}"
SHA512 53244f372ea21125a1d97c5b89a84299740b55a66165782e807ed23adab3a07408a1547f1f40156e3060359660d07f49846c8b4893beef10ac9440ab7e8611cc
REF pkgconf-${VERSION}
SHA512 4e49bb7b10c6fdebfa1175b4c33138b8aeca2582e49adb5c7ba66d08e8614771ef060b0c2673bd098c1aed821c8ade1a6dd276c1f4ac6e29bd7efcb8f4c0402e
HEAD_REF master
PATCHES
001-unveil-fixes.patch # https://github.com/pkgconf/pkgconf/pull/430
)
vcpkg_configure_meson(
SOURCE_PATH "${SOURCE_PATH}"
NO_PKG_CONFIG
OPTIONS
-Dtests=disabled
)
set(systemsuffix "")
@ -88,7 +84,7 @@ if(EXISTS "${pkgconfig_file}")
endif()
vcpkg_install_meson()
vcpkg_fixup_pkgconfig(SKIP_CHECK)
vcpkg_fixup_pkgconfig()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
@ -99,6 +95,6 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/pkgconf/libpkgconf/libpkgconf-api.h" "#if defined(PKGCONFIG_IS_STATIC)" "#if 1")
endif()
vcpkg_copy_tools(TOOL_NAMES bomtool pkgconf AUTO_CLEAN)
vcpkg_copy_tools(TOOL_NAMES bomtool pkgconf pccritic spdxtool AUTO_CLEAN)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")

View File

@ -1,7 +1,6 @@
{
"name": "pkgconf",
"version": "2.5.1",
"port-version": 4,
"version": "3.0.3",
"description": "pkgconf is a program which helps to configure compiler and linker flags for development libraries. It is similar to pkg-config from freedesktop.org.",
"homepage": "https://github.com/pkgconf/pkgconf",
"license": null,

View File

@ -7825,8 +7825,8 @@
"port-version": 1
},
"pkgconf": {
"baseline": "2.5.1",
"port-version": 4
"baseline": "3.0.3",
"port-version": 0
},
"plasma-wayland-protocols": {
"baseline": "1.21.0",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "767be39a6f55d757c60a42e0ef801c687e02e382",
"version": "3.0.3",
"port-version": 0
},
{
"git-tree": "0e3bcce12697924fae59f8567477d1a4cc2de04f",
"version": "2.5.1",