From de51b03cc1aa023564aa18e3c4cf1b4dc58db27e Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Fri, 4 Aug 2023 08:45:16 +0000
Subject: [PATCH] pkgconf 2.0.0.

---
 Makefile.lite           |  2 +-
 NEWS                    | 16 ++++++++++++++++
 configure.ac            |  2 +-
 libpkgconf/libpkgconf.h |  4 ++--
 meson.build             |  2 +-
 5 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/Makefile.lite b/Makefile.lite
index bfcbdf8..ff6927f 100644
--- a/Makefile.lite
+++ b/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 "1.6.2"' >> $@
+	@echo '#define PACKAGE_VERSION "2.0.0"' >> $@
 	@echo '#define PACKAGE PACKAGE_NAME " " PACKAGE_VERSION' >> $@
 	@echo '#define HAVE_STRLCPY' >> $@
 	@echo '#define HAVE_STRLCAT' >> $@
diff --git a/NEWS b/NEWS
index 8f20c84..8c5ce0c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,22 @@
 Changes from previous version of pkgconf
 ========================================
 
+Changes from 1.9.5 to 2.0.0:
+----------------------------
+
+* When flattening the dependency graph, retain the latest seen edges
+  rather than the earliest.
+
+* Fix a long-standing bug where the dependency resolution queue was
+  evaluated in reverse.  This bug masked the aforementioned dependency
+  flattening bug in many cases.
+
+* Fix handling of --with-path, which was appending paths to the search
+  list rather than prepending them as intended.
+
+* Error when --modversion is requested with more than one package, as
+  the output is ambiguous.
+
 Changes from 1.9.4 to 1.9.5:
 ----------------------------
 
diff --git a/configure.ac b/configure.ac
index a3f28be..17e61d1 100644
--- a/configure.ac
+++ b/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],[1.9.5],[https://github.com/pkgconf/pkgconf/issues/new])
+AC_INIT([pkgconf],[2.0.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"])
diff --git a/libpkgconf/libpkgconf.h b/libpkgconf/libpkgconf.h
index 6a76caa..a4e4ca7 100644
--- a/libpkgconf/libpkgconf.h
+++ b/libpkgconf/libpkgconf.h
@@ -79,8 +79,8 @@ typedef struct pkgconf_cross_personality_ pkgconf_cross_personality_t;
 #define PKGCONF_FOREACH_LIST_ENTRY_REVERSE(tail, value) \
 	for ((value) = (tail); (value) != NULL; (value) = (value)->prev)
 
-#define LIBPKGCONF_VERSION	10905
-#define LIBPKGCONF_VERSION_STR	"1.9.5"
+#define LIBPKGCONF_VERSION	20000
+#define LIBPKGCONF_VERSION_STR	"2.0.0"
 
 struct pkgconf_fragment_ {
 	pkgconf_node_t iter;
diff --git a/meson.build b/meson.build
index 2b4abd9..ce6aa90 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('pkgconf', 'c',
-  version : '1.9.5',
+  version : '2.0.0',
   license : 'ISC',
   meson_version : '>=0.49',
   default_options : ['c_std=c99'],