[pkgconf] Update to 1.8 (and a few extras; world rebuild) (#20243)

* [vcpkg/script/meson] add option NO_PKG_CONFIG to skip pkg-config setup

* [vcpkg/script/pkgconfig] move vcpkg_find_acquire_program(PKGCONFIG) into the check section where it is used

* [pkgconf] Update to 1.8.0

* version stuff

* remove unused patch.

* (CR) quote string

* version update.

3 files changed, 12 insertions, 62 deletions

diff --git a/ports/pkgconf/fix-static-builds.patch b/ports/pkgconf/fix-static-builds.patch
deleted file mode 100644
index 88a0b375c..000000000
--- a/ports/pkgconf/fix-static-builds.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/libpkgconf.pc.in b/libpkgconf.pc.in
-index d278136e3..ef0c7db5f 100644
---- a/libpkgconf.pc.in
-+++ b/libpkgconf.pc.in
-@@ -8,4 +8,4 @@ Description: a library for accessing and manipulating development framework conf
- URL: http://github.com/pkgconf/pkgconf
- Version: @PACKAGE_VERSION@
- CFlags: -I${includedir}/pkgconf
--Libs: -L${libdir} -lpkgconf
-+Libs: -L${libdir} -lpkgconf @build_static@
-diff --git a/meson.build b/meson.build
-index e7822b8da..8f7aa0075 100644
---- a/meson.build
-+++ b/meson.build
-@@ -45,6 +45,13 @@ cdata.set('abs_top_builddir', meson.build_root())
- 
- subdir('libpkgconf')
- 
-+libtype = get_option('default_library')
-+if libtype == 'static'
-+  build_static = '-DPKGCONFIG_IS_STATIC'
-+else
-+  build_static = ''
-+endif
-+
- libpkgconf = library('pkgconf',
-   'libpkgconf/argvsplit.c',
-   'libpkgconf/audit.c',
-@@ -60,7 +67,7 @@ libpkgconf = library('pkgconf',
-   'libpkgconf/pkg.c',
-   'libpkgconf/queue.c',
-   'libpkgconf/tuple.c',
--  c_args: '-DLIBPKGCONF_EXPORT',
-+  c_args: ['-DLIBPKGCONF_EXPORT', build_static],
-   install : true,
-   version : '3.0.0',
-   soversion : '3',
-@@ -73,13 +80,16 @@ pkg.generate(libpkgconf,
-   url: 'http://github.com/pkgconf/pkgconf',
-   filebase : 'libpkgconf',
-   subdirs: ['pkgconf'],
-+  extra_cflags : build_static
- )
- 
-+
- pkgconf_exe = executable('pkgconf',
-   'cli/main.c',
-   'cli/getopt_long.c',
-   'cli/renderer-msvc.c',
-   link_with : libpkgconf,
-+  c_args: build_static,
-   install : true)
- 
- if get_option('tests')
diff --git a/ports/pkgconf/portfile.cmake b/ports/pkgconf/portfile.cmake
index 5daa05b65..1d8dda8dd 100644
--- a/ports/pkgconf/portfile.cmake
+++ b/ports/pkgconf/portfile.cmake
@@ -1,23 +1,27 @@
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO pkgconf/pkgconf

-    REF 458101e787a47378d2fc74c64f649fd3a5f75e55 

-    SHA512 36a68c7f452752ddfa7f4740f77277bcea0c1c2c70d36d48e74ac3f77d082771253eb9b78fcd097f55cac425cecabab163123103452ddf16bff7280254c6a715

+    REF cef30268e1a3f79efd607c26abcf556aa314c9c4 

+    SHA512 ea03b81d01521201bdc471a39cdc8b13f9452f7cc78706d5c57056595f3e4e8a3562c022ebb72ce6444f2c7a8dfc778114814ef5064eaef770a70cc294c7f7ee

     HEAD_REF master

-    PATCHES fix-static-builds.patch

 )

 

 vcpkg_configure_meson(

     SOURCE_PATH "${SOURCE_PATH}"

+    NO_PKG_CONFIG

     OPTIONS -Dtests=false

     )

 vcpkg_install_meson()

-vcpkg_fixup_pkgconfig()

+vcpkg_fixup_pkgconfig(SKIP_CHECK)

 

-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)

+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

+

+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)

 

 # Handle copyright

-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

diff --git a/ports/pkgconf/vcpkg.json b/ports/pkgconf/vcpkg.json
index 247c50300..8d544f102 100644
--- a/ports/pkgconf/vcpkg.json
+++ b/ports/pkgconf/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "pkgconf",
-  "version": "1.7.4",
+  "version": "1.8.0",
   "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",
   "supports": "!uwp"