From bdc09af8affbf273ce41def577f756cb751b54b1 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 9 Jul 2025 12:00:01 +0200 Subject: [PATCH] [pkgconf] Update to 2.5.1 (#45942) --- ports/pkgconf/portfile.cmake | 18 +++++------------- ports/pkgconf/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/p-/pkgconf.json | 5 +++++ 4 files changed, 13 insertions(+), 17 deletions(-) diff --git a/ports/pkgconf/portfile.cmake b/ports/pkgconf/portfile.cmake index 1ba02e3f15..9199f1cac9 100644 --- a/ports/pkgconf/portfile.cmake +++ b/ports/pkgconf/portfile.cmake @@ -1,24 +1,16 @@ -vcpkg_download_distfile( - ADD_MISSING_DEFINE_PATCH - URLS https://github.com/pkgconf/pkgconf/commit/664b53d5c4920e66e4a57c7515ccfd1bd1477bac.patch?full_index=1 - FILENAME pkgconf-add-missing-define-664b53d5c4920e66e4a57c7515ccfd1bd1477bac.patch - SHA512 1e5dc8b6ac9547157694c1674660c0f207876ed2916a053217c9299eb352c05d1f03a1ba8afddaf994b7c22474590407c627846cd68000bf53bd7229d9009895 -) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pkgconf/pkgconf REF "pkgconf-${VERSION}" - SHA512 8c73b8f9c3dd3c72e6b0acf139a68054d631484af4618f46c30c3c13947294986d809bbac0648af9e974739fd42e1730a4e22323884d7cf72f0843a972991a99 + SHA512 53244f372ea21125a1d97c5b89a84299740b55a66165782e807ed23adab3a07408a1547f1f40156e3060359660d07f49846c8b4893beef10ac9440ab7e8611cc HEAD_REF master - PATCHES - "${ADD_MISSING_DEFINE_PATCH}" ) vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" NO_PKG_CONFIG - OPTIONS -Dtests=disabled + OPTIONS + -Dtests=disabled ) set(systemsuffix "") @@ -85,6 +77,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 pkgconf AUTO_CLEAN) +vcpkg_copy_tools(TOOL_NAMES bomtool pkgconf AUTO_CLEAN) -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/pkgconf/vcpkg.json b/ports/pkgconf/vcpkg.json index 0b3237ab97..8ba7886f2f 100644 --- a/ports/pkgconf/vcpkg.json +++ b/ports/pkgconf/vcpkg.json @@ -1,7 +1,6 @@ { "name": "pkgconf", - "version": "2.4.3", - "port-version": 1, + "version": "2.5.1", "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, diff --git a/versions/baseline.json b/versions/baseline.json index 718146ddca..f239ffd2c7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7329,8 +7329,8 @@ "port-version": 0 }, "pkgconf": { - "baseline": "2.4.3", - "port-version": 1 + "baseline": "2.5.1", + "port-version": 0 }, "plasma-wayland-protocols": { "baseline": "1.14.0", diff --git a/versions/p-/pkgconf.json b/versions/p-/pkgconf.json index 3b2dfd1865..ca2d95e104 100644 --- a/versions/p-/pkgconf.json +++ b/versions/p-/pkgconf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "39d1d31a02b57fa9e187f182ec32639984cc59cb", + "version": "2.5.1", + "port-version": 0 + }, { "git-tree": "ee86667e248e39cfb0ac994ac4e0bd00ce5b0836", "version": "2.4.3",