From 67bdf48b4895e5e7289ad6cfa5dc568b20cae907 Mon Sep 17 00:00:00 2001
From: heitbaum <rudi@heitbaum.com>
Date: Sun, 6 Feb 2022 07:45:07 +0000
Subject: [PATCH] xorgproto: set PKGCONFIG directory to /usr/lib/pkgconfig

---
 packages/x11/proto/xorgproto/package.mk       |  3 +-
 .../patches/xorgproto-0001-pkgconfig.patch    | 48 +++++++++++++++++++
 2 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 packages/x11/proto/xorgproto/patches/xorgproto-0001-pkgconfig.patch

diff --git a/packages/x11/proto/xorgproto/package.mk b/packages/x11/proto/xorgproto/package.mk
index 686953477d..2f9ce8d041 100644
--- a/packages/x11/proto/xorgproto/package.mk
+++ b/packages/x11/proto/xorgproto/package.mk
@@ -11,4 +11,5 @@ PKG_DEPENDS_TARGET="toolchain util-macros"
 PKG_LONGDESC="combined X.Org X11 Protocol headers"
 PKG_TOOLCHAIN="meson"
 
-PKG_MESON_OPTS_TARGET="-Dlegacy=false"
+PKG_MESON_OPTS_TARGET="-Dlegacy=false \
+                       -Dpkgconfigdatadir=/usr/lib/pkgconfig"
diff --git a/packages/x11/proto/xorgproto/patches/xorgproto-0001-pkgconfig.patch b/packages/x11/proto/xorgproto/patches/xorgproto-0001-pkgconfig.patch
new file mode 100644
index 0000000000..7e86b727c9
--- /dev/null
+++ b/packages/x11/proto/xorgproto/patches/xorgproto-0001-pkgconfig.patch
@@ -0,0 +1,48 @@
+commit 989e25ecc4dc75c842f13b2b6457df9a3533ac72
+Author: heitbaum <rudi@heitbaum.com>
+Date:   Sun Feb 6 07:56:38 2022 +0000
+
+    meson: enable override of arch-independent pkg-config
+    
+    Add meson_option pkgconfigdatadir to set the directory for
+    arch-independent pkg-config files.
+    
+    Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com>
+
+diff --git a/meson.build b/meson.build
+index 5c15cc9..bb9c7c1 100644
+--- a/meson.build
++++ b/meson.build
+@@ -57,12 +57,14 @@ pc_data = configuration_data()
+ pc_data.set('prefix', get_option('prefix'))
+ # meson does not allow installing the includedir outside of the prefix
+ pc_data.set('includedir', '${prefix}/' + get_option('includedir'))
++# Dirs of external packages
++pkgconfigdatadir = get_option('pkgconfigdatadir') != '' ? get_option('pkgconfigdatadir') : get_option('datadir') / 'pkgconfig'
+ 
+ foreach pc : pcs
+     configure_file(
+         input : pc + '.pc.in',
+         output : pc + '.pc',
+-        install_dir : get_option('datadir') + '/pkgconfig',
++        install_dir : pkgconfigdatadir,
+         configuration : pc_data,
+     )
+ endforeach
+@@ -100,7 +102,7 @@ if get_option('legacy') == true
+         configure_file(
+             input : pc + '.pc.in',
+             output : pc + '.pc',
+-            install_dir : get_option('datadir') + '/pkgconfig',
++            install_dir : pkgconfigdatadir,
+             configuration : pc_data,
+         )
+     endforeach
+diff --git a/meson_options.txt b/meson_options.txt
+index 757cd72..4c80f32 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1 +1,3 @@
+ option('legacy', type: 'boolean', value: false)
++option('pkgconfigdatadir', type : 'string', value : '',
++       description : 'directory for arch-independent pkg-config files')