Merge pull request #7091 from HiassofT/le11-xkb

Remove unnecessary and incorrect pkgconfig changes

packages/sysutils/systemd/package.mk

@@ -100,7 +100,6 @@ PKG_MESON_OPTS_TARGET="--libdir=/usr/lib \
                        -Dmount-path=/usr/bin/mount \
                        -Dumount-path=/usr/bin/umount \
                        -Ddebug-tty=${DEBUG_TTY} \
-                       -Dpkgconfigdatadir=/usr/lib/pkgconfig \
                        -Dversion-tag=${PKG_VERSION}"
 
 pre_configure_target() {

packages/x11/lib/xtrans/package.mk

@@ -13,11 +13,6 @@ PKG_LONGDESC="Abstract network code for X."
 
 PKG_CONFIGURE_OPTS_TARGET="--without-xmlto"
 
-pre_configure_target() {
-  sed -i 's|^pkgconfigdir = .*|pkgconfigdir = /usr/lib/pkgconfig|' ${PKG_BUILD}/Makefile.am
-  sed -i 's|^pkgconfigdir = .*|pkgconfigdir = /usr/lib/pkgconfig|' ${PKG_BUILD}/Makefile.in
-}
-
 post_makeinstall_target() {
   mkdir -p ${SYSROOT_PREFIX}/usr/lib/pkgconfig
     cp xtrans.pc ${SYSROOT_PREFIX}/usr/lib/pkgconfig

packages/x11/proto/xorgproto/package.mk

@@ -10,5 +10,4 @@ PKG_URL="https://xorg.freedesktop.org/archive/individual/proto/${PKG_NAME}-${PKG
 PKG_DEPENDS_TARGET="toolchain util-macros"
 PKG_LONGDESC="combined X.Org X11 Protocol headers"
 
-PKG_MESON_OPTS_TARGET="-Dlegacy=false \
-                       -Dpkgconfigdatadir=/usr/lib/pkgconfig"
+PKG_MESON_OPTS_TARGET="-Dlegacy=false"

packages/x11/proto/xorgproto/patches/xorgproto-0001-pkgconfig.patch

@@ -1,48 +0,0 @@
-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')

packages/x11/util/util-macros/package.mk

@@ -10,11 +10,6 @@ PKG_URL="http://xorg.freedesktop.org/archive/individual/util/${PKG_NAME}-${PKG_V
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="X.org autoconf utilities such as M4 macros."
 
-pre_configure_target() {
-  sed -i 's|^pkgconfigdir = .*|pkgconfigdir = /usr/lib/pkgconfig|' ${PKG_BUILD}/Makefile.am
-  sed -i 's|^pkgconfigdir = .*|pkgconfigdir = /usr/lib/pkgconfig|' ${PKG_BUILD}/Makefile.in
-}
-
 post_makeinstall_target() {
   rm -rf ${INSTALL}/usr
 }