From 0859f71733df451c54f5f437bfa0b41700a8af5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Tue, 17 Aug 2021 17:02:18 -0300 Subject: [PATCH] pkgconf: update to 1.8.0, split -devel and libpkgconf. We used to ship a static library in the main package, which was accidental. We now ship it in pkgconf-devel package. --- common/shlibs | 1 + srcpkgs/libpkgconf | 1 + srcpkgs/pkgconf-devel | 1 + srcpkgs/pkgconf/template | 25 ++++++++++++++++++++----- 4 files changed, 23 insertions(+), 5 deletions(-) create mode 120000 srcpkgs/libpkgconf create mode 120000 srcpkgs/pkgconf-devel diff --git a/common/shlibs b/common/shlibs index befa6484dfee..47ea002f4fd6 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3563,6 +3563,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.3 libpkgconf-1.8.0_1 libkodiplatform.so.19.0 kodi-platform-20180302_1 libQuotient.so.0.6 libQuotient-0.6.6_1 libipset.so.13 libipset-7.9_1 diff --git a/srcpkgs/libpkgconf b/srcpkgs/libpkgconf new file mode 120000 index 000000000000..243cd47f2e6f --- /dev/null +++ b/srcpkgs/libpkgconf @@ -0,0 +1 @@ +pkgconf \ No newline at end of file diff --git a/srcpkgs/pkgconf-devel b/srcpkgs/pkgconf-devel new file mode 120000 index 000000000000..243cd47f2e6f --- /dev/null +++ b/srcpkgs/pkgconf-devel @@ -0,0 +1 @@ +pkgconf \ No newline at end of file diff --git a/srcpkgs/pkgconf/template b/srcpkgs/pkgconf/template index e8acc8b1b9e4..dc020f562003 100644 --- a/srcpkgs/pkgconf/template +++ b/srcpkgs/pkgconf/template @@ -1,10 +1,9 @@ # Template file for 'pkgconf' pkgname=pkgconf -version=1.7.4 +version=1.8.0 revision=1 bootstrap=yes build_style=gnu-configure # cmake and meson also available -configure_args="--disable-shared --disable-static" checkdepends="kyua" short_desc="Provides compiler and linker configuration" maintainer="Enno Boland " @@ -12,7 +11,7 @@ license="MIT" homepage="http://pkgconf.org/" changelog="https://raw.githubusercontent.com/pkgconf/pkgconf/master/NEWS" distfiles="https://distfiles.dereferenced.org/pkgconf/pkgconf-${version}.tar.xz" -checksum=d73f32c248a4591139a6b17777c80d4deab6b414ec2b3d21d0a24be348c476ab +checksum=ef9c7e61822b7cb8356e6e9e1dca58d9556f3200d78acab35e4347e9d4c2bbaf alternatives=" pkg-config:pkg-config:/usr/bin/pkgconf @@ -22,8 +21,24 @@ alternatives=" post_install() { vlicense COPYING - rm -rf $DESTDIR/usr/include - # Suffix file that conflicts with pkg-config mv ${DESTDIR}/usr/share/aclocal/pkg.m4{,.pkgconf} } + +libpkgconf_package() { + short_desc+=" - runtime library" + pkg_install() { + vmove "usr/lib/*.so.*" + } +} + +pkgconf-devel_package() { + depends="libpkgconf>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" + } +}