Merge pull request #4087 from lazka/pkgconf-revert

pkgconf: revert commit causing wrong PKG_CONFIG_PATH order

pkgconf/384ade5f316367f15da9dbf09853e06fe29bf2bf.patch

@@ -0,0 +1,23 @@
+From 384ade5f316367f15da9dbf09853e06fe29bf2bf Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Fri, 4 Aug 2023 08:24:32 +0000
+Subject: [PATCH] path: prepend paths rather than append paths when processing
+ --with-path arguments
+
+---
+ libpkgconf/path.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libpkgconf/path.c b/libpkgconf/path.c
+index e591298d..a48a226e 100644
+--- a/libpkgconf/path.c
++++ b/libpkgconf/path.c
+@@ -112,7 +112,7 @@ pkgconf_path_add(const char *text, pkgconf_list_t *dirlist, bool filter)
+ 	}
+ #endif
+ 
+-	pkgconf_node_insert_tail(&node->lnode, node, dirlist);
++	pkgconf_node_insert(&node->lnode, node, dirlist);
+ }
+ 
+ /*

pkgconf/PKGBUILD

@@ -2,7 +2,7 @@
 
 pkgname=pkgconf
 pkgver=2.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc='pkg-config compatible utility which does not depend on glib'
 url='https://github.com/pkgconf/pkgconf'
 arch=('i686' 'x86_64')
@@ -13,13 +13,17 @@ makedepends=('meson'
 conflicts=('pkg-config')
 provides=('pkg-config')
 replaces=('pkg-config')
-source=(https://github.com/pkgconf/pkgconf/archive/refs/tags/$pkgname-$pkgver.tar.gz)
-sha256sums=('663e74fe84d18c7f010705a618690064296833598d647ecd96b63d0d78155d6c')
+source=(https://github.com/pkgconf/pkgconf/archive/refs/tags/$pkgname-$pkgver.tar.gz
+        384ade5f316367f15da9dbf09853e06fe29bf2bf.patch)
+sha256sums=('663e74fe84d18c7f010705a618690064296833598d647ecd96b63d0d78155d6c'
+            '537b58772815bc04a4d2f51648f4e008e5172c9513ae2c684416eba744df725c')
 
 prepare() {
   mv "${pkgname}-${pkgname}-${pkgver}" "${pkgname}-${pkgver}"
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  # https://github.com/pkgconf/pkgconf/issues/326
+  patch -R -p1 -i ${srcdir}/384ade5f316367f15da9dbf09853e06fe29bf2bf.patch
 }
 
 build() {