pkgconf 2.2.0

Makefile.lite

@@ -39,7 +39,7 @@ all: pkgconf-lite
 libpkgconf/config.h:
 	@echo '#define PACKAGE_NAME "pkgconf-lite"' >> $@
 	@echo '#define PACKAGE_BUGREPORT "https://git.dereferenced.org/pkgconf/pkgconf/issues"' >> $@
-	@echo '#define PACKAGE_VERSION "2.1.1"' >> $@
+	@echo '#define PACKAGE_VERSION "2.2.0"' >> $@
 	@echo '#define PACKAGE PACKAGE_NAME " " PACKAGE_VERSION' >> $@
 	@echo '#define HAVE_STRLCPY' >> $@
 	@echo '#define HAVE_STRLCAT' >> $@

NEWS

@@ -1,6 +1,24 @@
 Changes from previous version of pkgconf
 ========================================
 
+Changes from 2.1.1 to 2.2.0:
+----------------------------
+
+* libpkgconf SOVERSION is now 5.
+
+* Significant solver rework to flatten both requires and requires.private
+  dependencies in a single pass.  Improves performance slightly and ensures
+  proper dependency order.
+  Patches by Kai Pastor.
+
+* Improve `--digraph` output to reflect more of the solver's state in the
+  rendered dependency graph.
+  Patches by Kai Pastor.
+
+* Do not reference the graph root by name when presenting error messages about
+  directly requested dependency nodes.
+  Patch by Kai Pastor.
+
 Changes from 2.1.0 to 2.1.1:
 ----------------------------
 

configure.ac

@@ -12,7 +12,7 @@ dnl implied.  In no event shall the authors be liable for any damages arising
 dnl from the use of this software.
 
 AC_PREREQ([2.71])
-AC_INIT([pkgconf],[2.1.1],[https://github.com/pkgconf/pkgconf/issues/new])
+AC_INIT([pkgconf],[2.2.0],[https://github.com/pkgconf/pkgconf/issues/new])
 AC_CONFIG_SRCDIR([cli/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 AX_CHECK_COMPILE_FLAG([-Wall], [CFLAGS="$CFLAGS -Wall"])

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	20101
-#define LIBPKGCONF_VERSION_STR	"2.1.1"
+#define LIBPKGCONF_VERSION	20200
+#define LIBPKGCONF_VERSION_STR	"2.2.0"
 
 struct pkgconf_queue_ {
 	pkgconf_node_t iter;

libpkgconf/queue.c

@@ -131,7 +131,6 @@ pkgconf_queue_collect_dependencies_main(pkgconf_client_t *client,
 
 static inline unsigned int
 pkgconf_queue_collect_dependencies_walk(pkgconf_client_t *client,
-	pkgconf_pkg_t *parent,
 	pkgconf_list_t *deplist,
 	void *data,
 	int depth)
@@ -197,7 +196,7 @@ pkgconf_queue_collect_dependencies_main(pkgconf_client_t *client,
 		/* XXX: ugly */
 		const unsigned int saved_flags = client->flags;
 		client->flags |= PKGCONF_PKG_PKGF_ITER_PKG_IS_PRIVATE;
-		eflags = pkgconf_queue_collect_dependencies_walk(client, root, &root->requires_private, data, maxdepth);
+		eflags = pkgconf_queue_collect_dependencies_walk(client, &root->requires_private, data, maxdepth);
 		client->flags = saved_flags;
 		if (eflags != PKGCONF_PKG_ERRF_OK)
 			return eflags;
@@ -205,7 +204,7 @@ pkgconf_queue_collect_dependencies_main(pkgconf_client_t *client,
 
 	PKGCONF_TRACE(client, "%s: collecting public dependencies, level %d", root->id, maxdepth);
 
-	eflags = pkgconf_queue_collect_dependencies_walk(client, root, &root->required, data, maxdepth);
+	eflags = pkgconf_queue_collect_dependencies_walk(client, &root->required, data, maxdepth);
 	if (eflags != PKGCONF_PKG_ERRF_OK)
 		return eflags;
 

meson.build

@@ -1,5 +1,5 @@
 project('pkgconf', 'c',
-  version : '2.1.1',
+  version : '2.2.0',
   license : 'ISC',
   meson_version : '>=0.49',
   default_options : ['c_std=c99'],