diff --git a/srcpkgs/hwids/patches/pkgconfig-sysrootdir.patch b/srcpkgs/hwids/patches/pkgconfig-sysrootdir.patch new file mode 100644 index 00000000000..6af35847b88 --- /dev/null +++ b/srcpkgs/hwids/patches/pkgconfig-sysrootdir.patch @@ -0,0 +1,25 @@ +From d3325fd72bd45ba74e709b4083521104193b224e Mon Sep 17 00:00:00 2001 +From: Markus Volk +Date: Wed, 9 Nov 2022 18:37:41 +0100 +Subject: [PATCH] hwdata.pc.in: use sysroot prefix for pkgdatadir variable + +The pc_sysroot is automatically added to cflags and libs but not +to 'pkg-config --variable'. This matches what wayland-protocols does. + +Signed-off-by: Markus Volk +--- + hwdata.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/hwdata.pc.in b/hwdata.pc.in +index 8dd73b6..c5791d3 100644 +--- a/hwdata.pc.in ++++ b/hwdata.pc.in +@@ -1,6 +1,6 @@ + prefix=@prefix@ + datadir=@datadir@ +-pkgdatadir=@pkgdatadir@ ++pkgdatadir=${pc_sysrootdir}@pkgdatadir@ + + Name: @NAME@ + Description: Hardware identification and configuration data diff --git a/srcpkgs/hwids/template b/srcpkgs/hwids/template index aa52f74824d..57619713fc3 100644 --- a/srcpkgs/hwids/template +++ b/srcpkgs/hwids/template @@ -1,18 +1,28 @@ # Template file for 'hwids' pkgname=hwids reverts="20201207_1 20210613_1 20200813.1_1 20200813.1_2 20200306_1 20200204_1 20191025_1 20190818_1 20190316_1 20180917_1 20180518_1 20180315_1 20171003_1 20170715_1 20170328_1 20161103_1 20160801_1 20160421_1 20160306_1 20150717_1 20150421_1 20150129_1 20150118_1" -version=0.361 +version=0.364 revision=1 short_desc="Hardware Identification Databases" maintainer="John " license="GPL-2.0-or-later" homepage="https://github.com/vcrhonek/hwdata" distfiles="https://github.com/vcrhonek/hwdata/archive/refs/tags/v${version}.tar.gz" -checksum=d16c4be2a0476be039dce114401e7e8417f704eb89d9e5add7b3538dd58a2462 +checksum=e79ee7e0251c94273ac8ffa7f68892152d3cfc243a471bc61771d8ab53da3331 do_install() { vmkdir usr/share/hwdata for i in *.ids; do vinstall $i 644 usr/share/hwdata done + + vmkdir usr/share/pkgconfig + vinstall hwdata.pc.in 644 usr/share/pkgconfig hwdata.pc + vsed -i \ + -e 's|@prefix@|/usr|g' \ + -e 's|@datadir@|/usr/share|g' \ + -e 's|@pkgdatadir@|${datadir}/hwdata|g' \ + -e "s|@VERSION@|${version}|g" \ + -e "s|@NAME@|hwdata|g" \ + ${DESTDIR}/usr/share/pkgconfig/hwdata.pc }