From 223dff4158493d1f29ac7352bdb022bf4b4708ef Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 16 Apr 2026 17:30:54 +0200
Subject: [PATCH 1/3] pkgconf: update to 2.5.1.

---
 common/shlibs            | 2 +-
 srcpkgs/pkgconf/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 4898a78da1003e..4d05fa39489732 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3681,7 +3681,7 @@ libgaminggear.so.0 libgaminggear-0.15.1_1
 libgaminggearfx.so.0 libgaminggear-0.15.1_1
 libgaminggearwidget.so.0 libgaminggear-0.15.1_1
 libopkg.so.1 libopkg-0.4.4_2
-libpkgconf.so.4 libpkgconf-1.9.3_1
+libpkgconf.so.7 libpkgconf-2.5.1_1
 libkodiplatform.so.19.0 kodi-platform-20180302_1
 libQuotient.so.0.9 libQuotient-0.9.1_1
 libQuotientQt6.so.0.9 libQuotient-0.9.1_1
diff --git a/srcpkgs/pkgconf/template b/srcpkgs/pkgconf/template
index 63474c398aeebd..d5d08677e4b447 100644
--- a/srcpkgs/pkgconf/template
+++ b/srcpkgs/pkgconf/template
@@ -1,6 +1,6 @@
 # Template file for 'pkgconf'
 pkgname=pkgconf
-version=2.1.0
+version=2.5.1
 revision=1
 bootstrap=yes
 build_style=gnu-configure # cmake and meson also available
@@ -11,7 +11,7 @@ license="MIT"
 homepage="http://pkgconf.org/"
 changelog="https://raw.githubusercontent.com/pkgconf/pkgconf/master/NEWS"
 distfiles="https://distfiles.ariadne.space/pkgconf/pkgconf-${version}.tar.xz"
-checksum=266d5861ee51c52bc710293a1d36622ae16d048d71ec56034a02eb9cf9677761
+checksum=cd05c9589b9f86ecf044c10a2269822bc9eb001eced2582cfffd658b0a50c243
 
 alternatives="
  pkg-config:pkg-config:/usr/bin/pkgconf

From 50547ef27987a4885411087b613b0b74446d4078 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 16 Apr 2026 17:31:30 +0200
Subject: [PATCH 2/3] muon: rebuild for pkgconf-2.5.1_1

---
 srcpkgs/muon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/muon/template b/srcpkgs/muon/template
index 46b99a02592b37..7a044cf928f431 100644
--- a/srcpkgs/muon/template
+++ b/srcpkgs/muon/template
@@ -1,7 +1,7 @@
 # Template file for 'muon'
 pkgname=muon
 version=0.5.0
-revision=1
+revision=2
 build_style=meson
 build_helper="qemu"
 configure_args="

From 4a5b7cbb8bcf63541dc024d221929783bf8081fc Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 16 Apr 2026 17:49:14 +0200
Subject: [PATCH 3/3] xbps-src: add hosts /usr/share/pkgconfig to cross build
 PKG_CONFIG_PATH

Those are supposed to be architecture independent as far as I know.
Without that change xorg-util-macros would be required in hostmakedepends
and makedepends.
---
 common/hooks/pre-configure/02-script-wrapper.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/hooks/pre-configure/02-script-wrapper.sh b/common/hooks/pre-configure/02-script-wrapper.sh
index baf409c5d50b65..248ddbafedab37 100644
--- a/common/hooks/pre-configure/02-script-wrapper.sh
+++ b/common/hooks/pre-configure/02-script-wrapper.sh
@@ -101,7 +101,7 @@ pkgconfig_wrapper() {
 #!/bin/sh
 
 export PKG_CONFIG_SYSROOT_DIR="$XBPS_CROSS_BASE"
-export PKG_CONFIG_PATH="$XBPS_CROSS_BASE/usr/lib/pkgconfig:$XBPS_CROSS_BASE/usr/share/pkgconfig\${PKG_CONFIG_PATH:+:\${PKG_CONFIG_PATH}}"
+export PKG_CONFIG_PATH="$XBPS_CROSS_BASE/usr/lib/pkgconfig:$XBPS_CROSS_BASE/usr/share/pkgconfig:/usr/share/pkgconfig\${PKG_CONFIG_PATH:+:\${PKG_CONFIG_PATH}}"
 export PKG_CONFIG_LIBDIR="$XBPS_CROSS_BASE/usr/lib/pkgconfig\${PKG_CONFIG_LIBDIR:+:\${PKG_CONFIG_LIBDIR}}"
 exec /usr/bin/pkg-config "\$@"
 _EOF