Update 2 packages

mingw-w64-i686-pkgconf (1~2.2.0-1 -> 1~2.3.0-1) mingw-w64-x86_64-pkgconf (1~2.2.0-1 -> 1~2.3.0-1) Signed-off-by: Git for Windows Build Agent <[email protected]>
git-for-windows · Aug 10, 2024 · aba4b1c · aba4b1c
1 parent 87c8505
commit aba4b1c
Show file tree

Hide file tree

Showing 45 changed files with 51 additions and 23 deletions.
diff --git a/mingw32/bin/i686-w64-mingw32-pkg-config.exe b/mingw32/bin/i686-w64-mingw32-pkg-config.exe
diff --git a/mingw32/bin/i686-w64-mingw32-pkgconf.exe b/mingw32/bin/i686-w64-mingw32-pkgconf.exe
diff --git a/mingw32/bin/libpkgconf-5.dll b/mingw32/bin/libpkgconf-5.dll
diff --git a/mingw32/bin/pkg-config.exe b/mingw32/bin/pkg-config.exe
diff --git a/mingw32/bin/pkgconf.exe b/mingw32/bin/pkgconf.exe
diff --git a/mingw32/include/pkgconf/libpkgconf/libpkgconf.h b/mingw32/include/pkgconf/libpkgconf/libpkgconf.h
@@ -81,8 +81,8 @@ typedef struct pkgconf_queue_ pkgconf_queue_t;
 #define PKGCONF_FOREACH_LIST_ENTRY_REVERSE(tail, value) \
 	for ((value) = (tail); (value) != NULL; (value) = (value)->prev)
 
-#define LIBPKGCONF_VERSION	20200
-#define LIBPKGCONF_VERSION_STR	"2.2.0"
+#define LIBPKGCONF_VERSION	20300
+#define LIBPKGCONF_VERSION_STR	"2.3.0"
 
 struct pkgconf_queue_ {
 	pkgconf_node_t iter;
@@ -283,6 +283,7 @@ PKGCONF_API void pkgconf_cross_personality_deinit(pkgconf_cross_personality_t *p
 
 #define PKGCONF_PKG_DEPF_INTERNAL		0x1
 #define PKGCONF_PKG_DEPF_PRIVATE		0x2
+#define PKGCONF_PKG_DEPF_QUERY			0x4
 
 #define PKGCONF_PKG_ERRF_OK			0x0
 #define PKGCONF_PKG_ERRF_PACKAGE_NOT_FOUND	0x1
@@ -366,6 +367,7 @@ typedef struct pkgconf_fragment_render_ops_ {
 
 typedef bool (*pkgconf_fragment_filter_func_t)(const pkgconf_client_t *client, const pkgconf_fragment_t *frag, void *data);
 PKGCONF_API bool pkgconf_fragment_parse(const pkgconf_client_t *client, pkgconf_list_t *list, pkgconf_list_t *vars, const char *value, unsigned int flags);
+PKGCONF_API void pkgconf_fragment_insert(const pkgconf_client_t *client, pkgconf_list_t *list, char type, const char *data, bool tail);
 PKGCONF_API void pkgconf_fragment_add(const pkgconf_client_t *client, pkgconf_list_t *list, const char *string, unsigned int flags);
 PKGCONF_API void pkgconf_fragment_copy(const pkgconf_client_t *client, pkgconf_list_t *list, const pkgconf_fragment_t *base, bool is_private);
 PKGCONF_API void pkgconf_fragment_copy_list(const pkgconf_client_t *client, pkgconf_list_t *list, const pkgconf_list_t *base);

diff --git a/mingw32/lib/libpkgconf.dll.a b/mingw32/lib/libpkgconf.dll.a
diff --git a/mingw32/lib/pkgconfig/libpkgconf.pc b/mingw32/lib/pkgconfig/libpkgconf.pc
@@ -5,6 +5,6 @@ libdir=${prefix}/lib
 Name: libpkgconf
 Description: a library for accessing and manipulating development framework configuration
 URL: http://github.com/pkgconf/pkgconf
-Version: 2.2.0
+Version: 2.3.0
 Libs: -L${libdir} -lpkgconf
 Cflags: -I${includedir}/pkgconf -DPKGCONFIG_IS_NOT_STATIC
diff --git a/mingw32/share/aclocal/pkg.m4 b/mingw32/share/aclocal/pkg.m4
@@ -46,15 +46,21 @@ m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
     [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
 ])dnl PKG_PREREQ
 
-dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
-dnl ----------------------------------
+dnl PKG_PROG_PKG_CONFIG([MIN-VERSION], [ACTION-IF-NOT-FOUND])
+dnl ---------------------------------------------------------
 dnl Since: 0.16
 dnl
 dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
 dnl first found in the path. Checks that the version of pkg-config found
 dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
 dnl used since that's the first version where most current features of
 dnl pkg-config existed.
+dnl
+dnl If pkg-config is not found or older than specified, it will result
+dnl in an empty PKG_CONFIG variable. To avoid widespread issues with
+dnl scripts not checking it, ACTION-IF-NOT-FOUND defaults to aborting.
+dnl You can specify [PKG_CONFIG=false] as an action instead, which would
+dnl result in pkg-config tests failing, but no bogus error messages.
 AC_DEFUN([PKG_PROG_PKG_CONFIG],
 [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
 m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
@@ -75,6 +81,9 @@ if test -n "$PKG_CONFIG"; then
 		AC_MSG_RESULT([no])
 		PKG_CONFIG=""
 	fi
+fi
+if test -z "$PKG_CONFIG"; then
+	m4_default([$2], [AC_MSG_ERROR([pkg-config not found])])
 fi[]dnl
 ])dnl PKG_PROG_PKG_CONFIG
 

diff --git a/mingw32/share/doc/pkgconf/README.md b/mingw32/share/doc/pkgconf/README.md
@@ -116,7 +116,7 @@ flags like so:
 
 
 pkgconf is compiled using [Meson](https://mesonbuild.com) on Windows. In theory, you could also use
-Meson to build on UNIX, but this is not recommended at this time as it pkgconf is typically built
+Meson to build on UNIX, but this is not recommended at this time as pkgconf is typically built
 much earlier than Meson.
 
     $ meson setup build -Dtests=disabled

diff --git a/mingw32/share/man/man5/pc.5.gz b/mingw32/share/man/man5/pc.5.gz
diff --git a/mingw64/bin/libpkgconf-5.dll b/mingw64/bin/libpkgconf-5.dll
diff --git a/mingw64/bin/pkg-config.exe b/mingw64/bin/pkg-config.exe
diff --git a/mingw64/bin/pkgconf.exe b/mingw64/bin/pkgconf.exe
diff --git a/mingw64/bin/x86_64-w64-mingw32-pkg-config.exe b/mingw64/bin/x86_64-w64-mingw32-pkg-config.exe
diff --git a/mingw64/bin/x86_64-w64-mingw32-pkgconf.exe b/mingw64/bin/x86_64-w64-mingw32-pkgconf.exe
diff --git a/mingw64/include/pkgconf/libpkgconf/libpkgconf.h b/mingw64/include/pkgconf/libpkgconf/libpkgconf.h
@@ -81,8 +81,8 @@ typedef struct pkgconf_queue_ pkgconf_queue_t;
 #define PKGCONF_FOREACH_LIST_ENTRY_REVERSE(tail, value) \
 	for ((value) = (tail); (value) != NULL; (value) = (value)->prev)
 
-#define LIBPKGCONF_VERSION	20200
-#define LIBPKGCONF_VERSION_STR	"2.2.0"
+#define LIBPKGCONF_VERSION	20300
+#define LIBPKGCONF_VERSION_STR	"2.3.0"
 
 struct pkgconf_queue_ {
 	pkgconf_node_t iter;
@@ -283,6 +283,7 @@ PKGCONF_API void pkgconf_cross_personality_deinit(pkgconf_cross_personality_t *p
 
 #define PKGCONF_PKG_DEPF_INTERNAL		0x1
 #define PKGCONF_PKG_DEPF_PRIVATE		0x2
+#define PKGCONF_PKG_DEPF_QUERY			0x4
 
 #define PKGCONF_PKG_ERRF_OK			0x0
 #define PKGCONF_PKG_ERRF_PACKAGE_NOT_FOUND	0x1
@@ -366,6 +367,7 @@ typedef struct pkgconf_fragment_render_ops_ {
 
 typedef bool (*pkgconf_fragment_filter_func_t)(const pkgconf_client_t *client, const pkgconf_fragment_t *frag, void *data);
 PKGCONF_API bool pkgconf_fragment_parse(const pkgconf_client_t *client, pkgconf_list_t *list, pkgconf_list_t *vars, const char *value, unsigned int flags);
+PKGCONF_API void pkgconf_fragment_insert(const pkgconf_client_t *client, pkgconf_list_t *list, char type, const char *data, bool tail);
 PKGCONF_API void pkgconf_fragment_add(const pkgconf_client_t *client, pkgconf_list_t *list, const char *string, unsigned int flags);
 PKGCONF_API void pkgconf_fragment_copy(const pkgconf_client_t *client, pkgconf_list_t *list, const pkgconf_fragment_t *base, bool is_private);
 PKGCONF_API void pkgconf_fragment_copy_list(const pkgconf_client_t *client, pkgconf_list_t *list, const pkgconf_list_t *base);

diff --git a/mingw64/lib/libpkgconf.dll.a b/mingw64/lib/libpkgconf.dll.a
diff --git a/mingw64/lib/pkgconfig/libpkgconf.pc b/mingw64/lib/pkgconfig/libpkgconf.pc
@@ -5,6 +5,6 @@ libdir=${prefix}/lib
 Name: libpkgconf
 Description: a library for accessing and manipulating development framework configuration
 URL: http://github.com/pkgconf/pkgconf
-Version: 2.2.0
+Version: 2.3.0
 Libs: -L${libdir} -lpkgconf
 Cflags: -I${includedir}/pkgconf -DPKGCONFIG_IS_NOT_STATIC
diff --git a/mingw64/share/aclocal/pkg.m4 b/mingw64/share/aclocal/pkg.m4
@@ -46,15 +46,21 @@ m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
     [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
 ])dnl PKG_PREREQ
 
-dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
-dnl ----------------------------------
+dnl PKG_PROG_PKG_CONFIG([MIN-VERSION], [ACTION-IF-NOT-FOUND])
+dnl ---------------------------------------------------------
 dnl Since: 0.16
 dnl
 dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
 dnl first found in the path. Checks that the version of pkg-config found
 dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
 dnl used since that's the first version where most current features of
 dnl pkg-config existed.
+dnl
+dnl If pkg-config is not found or older than specified, it will result
+dnl in an empty PKG_CONFIG variable. To avoid widespread issues with
+dnl scripts not checking it, ACTION-IF-NOT-FOUND defaults to aborting.
+dnl You can specify [PKG_CONFIG=false] as an action instead, which would
+dnl result in pkg-config tests failing, but no bogus error messages.
 AC_DEFUN([PKG_PROG_PKG_CONFIG],
 [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
 m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
@@ -75,6 +81,9 @@ if test -n "$PKG_CONFIG"; then
 		AC_MSG_RESULT([no])
 		PKG_CONFIG=""
 	fi
+fi
+if test -z "$PKG_CONFIG"; then
+	m4_default([$2], [AC_MSG_ERROR([pkg-config not found])])
 fi[]dnl
 ])dnl PKG_PROG_PKG_CONFIG
 

diff --git a/mingw64/share/doc/pkgconf/README.md b/mingw64/share/doc/pkgconf/README.md
@@ -116,7 +116,7 @@ flags like so:
 
 
 pkgconf is compiled using [Meson](https://mesonbuild.com) on Windows. In theory, you could also use
-Meson to build on UNIX, but this is not recommended at this time as it pkgconf is typically built
+Meson to build on UNIX, but this is not recommended at this time as pkgconf is typically built
 much earlier than Meson.
 
     $ meson setup build -Dtests=disabled

diff --git a/mingw64/share/man/man5/pc.5.gz b/mingw64/share/man/man5/pc.5.gz
diff --git a/var/lib/pacman/local/mingw-w64-i686-pkgconf-1~2.2.0-1/mtree b/var/lib/pacman/local/mingw-w64-i686-pkgconf-1~2.2.0-1/mtree
diff --git a/...cal/mingw-w64-i686-pkgconf-1~2.2.0-1/desc → ...cal/mingw-w64-i686-pkgconf-1~2.3.0-1/desc b/...cal/mingw-w64-i686-pkgconf-1~2.2.0-1/desc → ...cal/mingw-w64-i686-pkgconf-1~2.3.0-1/desc
@@ -2,7 +2,7 @@
 mingw-w64-i686-pkgconf
 
 %VERSION%
-1~2.2.0-1
+1~2.3.0-1
 
 %BASE%
 mingw-w64-pkgconf
@@ -17,16 +17,16 @@ https://github.com/pkgconf/pkgconf
 any
 
 %BUILDDATE%
-1711638252
+1723162002
 
 %INSTALLDATE%
-1711681178
+1723258768
 
 %PACKAGER%
-CI (msys2/msys2-autobuild/3e617554/8469314959)
+CI (msys2/msys2-autobuild/67d510ec/10311276017)
 
 %SIZE%
-554143
+568196
 
 %GROUPS%
 mingw-w64-i686-toolchain
@@ -47,3 +47,6 @@ mingw-w64-i686-pkg-config
 %PROVIDES%
 mingw-w64-i686-pkg-config
 
+%XDATA%
+pkgtype=pkg
+
diff --git a/...al/mingw-w64-i686-pkgconf-1~2.2.0-1/files → ...al/mingw-w64-i686-pkgconf-1~2.3.0-1/files b/...al/mingw-w64-i686-pkgconf-1~2.2.0-1/files → ...al/mingw-w64-i686-pkgconf-1~2.3.0-1/files
diff --git a/var/lib/pacman/local/mingw-w64-i686-pkgconf-1~2.3.0-1/mtree b/var/lib/pacman/local/mingw-w64-i686-pkgconf-1~2.3.0-1/mtree
diff --git a/var/lib/pacman/local/mingw-w64-x86_64-git-extra-1.1.641.031e03baf-1/desc b/var/lib/pacman/local/mingw-w64-x86_64-git-extra-1.1.641.031e03baf-1/desc
@@ -20,7 +20,7 @@ any
 1718204260
 
 %INSTALLDATE%
-1723172381
+1723258771
 
 %PACKAGER%
 Johannes Schindelin <[email protected]>

diff --git a/var/lib/pacman/local/mingw-w64-x86_64-pkgconf-1~2.2.0-1/mtree b/var/lib/pacman/local/mingw-w64-x86_64-pkgconf-1~2.2.0-1/mtree
diff --git a/...l/mingw-w64-x86_64-pkgconf-1~2.2.0-1/desc → ...l/mingw-w64-x86_64-pkgconf-1~2.3.0-1/desc b/...l/mingw-w64-x86_64-pkgconf-1~2.2.0-1/desc → ...l/mingw-w64-x86_64-pkgconf-1~2.3.0-1/desc
@@ -2,7 +2,7 @@
 mingw-w64-x86_64-pkgconf
 
 %VERSION%
-1~2.2.0-1
+1~2.3.0-1
 
 %BASE%
 mingw-w64-pkgconf
@@ -17,16 +17,16 @@ https://github.com/pkgconf/pkgconf
 any
 
 %BUILDDATE%
-1711638251
+1723162026
 
 %INSTALLDATE%
-1711681178
+1723258768
 
 %PACKAGER%
-CI (msys2/msys2-autobuild/3e617554/8469314959)
+CI (msys2/msys2-autobuild/67d510ec/10311276017)
 
 %SIZE%
-523445
+537426
 
 %GROUPS%
 mingw-w64-x86_64-toolchain
@@ -47,3 +47,6 @@ mingw-w64-x86_64-pkg-config
 %PROVIDES%
 mingw-w64-x86_64-pkg-config
 
+%XDATA%
+pkgtype=pkg
+
diff --git a/.../mingw-w64-x86_64-pkgconf-1~2.2.0-1/files → .../mingw-w64-x86_64-pkgconf-1~2.3.0-1/files b/.../mingw-w64-x86_64-pkgconf-1~2.2.0-1/files → .../mingw-w64-x86_64-pkgconf-1~2.3.0-1/files
diff --git a/var/lib/pacman/local/mingw-w64-x86_64-pkgconf-1~2.3.0-1/mtree b/var/lib/pacman/local/mingw-w64-x86_64-pkgconf-1~2.3.0-1/mtree
diff --git a/var/lib/pacman/sync/clang32.db b/var/lib/pacman/sync/clang32.db
diff --git a/var/lib/pacman/sync/clang32.db.sig b/var/lib/pacman/sync/clang32.db.sig
diff --git a/var/lib/pacman/sync/clang64.db b/var/lib/pacman/sync/clang64.db
diff --git a/var/lib/pacman/sync/clang64.db.sig b/var/lib/pacman/sync/clang64.db.sig
diff --git a/var/lib/pacman/sync/clangarm64.db b/var/lib/pacman/sync/clangarm64.db
diff --git a/var/lib/pacman/sync/clangarm64.db.sig b/var/lib/pacman/sync/clangarm64.db.sig
diff --git a/var/lib/pacman/sync/mingw32.db b/var/lib/pacman/sync/mingw32.db
diff --git a/var/lib/pacman/sync/mingw32.db.sig b/var/lib/pacman/sync/mingw32.db.sig
diff --git a/var/lib/pacman/sync/mingw64.db b/var/lib/pacman/sync/mingw64.db
diff --git a/var/lib/pacman/sync/mingw64.db.sig b/var/lib/pacman/sync/mingw64.db.sig
diff --git a/var/lib/pacman/sync/msys.db b/var/lib/pacman/sync/msys.db
diff --git a/var/lib/pacman/sync/msys.db.sig b/var/lib/pacman/sync/msys.db.sig
diff --git a/var/lib/pacman/sync/ucrt64.db b/var/lib/pacman/sync/ucrt64.db
diff --git a/var/lib/pacman/sync/ucrt64.db.sig b/var/lib/pacman/sync/ucrt64.db.sig