[arch-commits] Commit in pkgconf/trunk (PKGBUILD)

[Jan Steffens]

    Date: Thursday, September 9, 2021 @ 11:53:35
  Author: heftig
Revision: 423666

1.8.0-1

Modified:
  pkgconf/trunk/PKGBUILD

----------+
 PKGBUILD |   39 ++++++++++++++++-----------------------
 1 file changed, 16 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-09-09 11:18:38 UTC (rev 423665)
+++ PKGBUILD	2021-09-09 11:53:35 UTC (rev 423666)
@@ -1,4 +1,4 @@
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
 # Contributor: Johannes Löthberg <johannes at kyriasis.com>
 # Contributor: Piotr Gorski <lucjan.lucjanov at gmail.com>
 # Contributor: Lucy <lucy at luz.lu>
@@ -5,20 +5,20 @@
 # Contributor: Bartlomiej Piotrowski <nospam at bpiotrowski.pl>
 
 pkgname=pkgconf
-pkgver=1.7.3
+pkgver=1.8.0
 pkgrel=1
 pkgdesc="Package compiler and linker metadata toolkit"
-url="https://git.sr.ht/~kaniini/pkgconf"
+url="https://github.com/pkgconf/pkgconf"
 license=(custom:ISC)
 arch=(x86_64)
 depends=(glibc sh)
-makedepends=(git)
-provides=(pkg-config pkgconfig)
+makedepends=(git meson)
+provides=(pkg-config pkgconfig libpkgconf.so)
 conflicts=(pkg-config)
 replaces=(pkg-config)
 groups=(base-devel)
-_commit=aca0674837cb6df1b29faddb8afe6b2f39733f6b  # tags/pkgconf-1.7.3
-source=("git+https://git.sr.ht/~kaniini/pkgconf#commit=$_commit"
+_commit=cef30268e1a3f79efd607c26abcf556aa314c9c4  # tags/pkgconf-1.8.0
+source=("git+$url#commit=$_commit"
         i686-pc-linux-gnu.personality
         x86_64-pc-linux-gnu.personality)
 sha256sums=('SKIP'
@@ -25,10 +25,6 @@
             '6697c6db7deaae269ea75624a70e80949241f2cf59a537f31ecfcac726d90bc1'
             'c8297817ba0b57d003878db247ff34b4c47a7594c9f67dcfe8ff8d6567956cd5')
 
-_pcdirs=/usr/lib/pkgconfig:/usr/share/pkgconfig
-_libdir=/usr/lib
-_includedir=/usr/include
-
 pkgver() {
   cd $pkgname
   git describe --tags | sed 's/^pkgconf-//;s/-/+/g'
@@ -35,34 +31,31 @@
 }
 
 prepare() {
-  mkdir build
   cd $pkgname
-  ./autogen.sh
 }
 
 build() {
-  cd build
-  ../$pkgname/configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --with-pkg-config-dir="$_pcdirs" \
-    --with-system-libdir="$_libdir" \
-    --with-system-includedir="$_includedir" \
-    --disable-static
-  make
+  arch-meson $pkgname build -D tests=false
+  meson compile -C build
 }
 
+check() {
+  meson test -C build --print-errorlogs
+}
+
 package() {
-  DESTDIR="$pkgdir" make -C build install
+  meson install -C build --destdir "$pkgdir"
 
   install -Dt "$pkgdir/usr/share/pkgconfig/personality.d" -m644 \
     i686-pc-linux-gnu.personality \
     x86_64-pc-linux-gnu.personality
+
   ln -s pkgconf "$pkgdir/usr/bin/i686-pc-linux-gnu-pkg-config"
   ln -s pkgconf "$pkgdir/usr/bin/x86_64-pc-linux-gnu-pkg-config"
   ln -s pkgconf "$pkgdir/usr/bin/pkg-config"
 
   ln -s pkgconf.1 "$pkgdir/usr/share/man/man1/pkg-config.1"
+
   install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 $pkgname/COPYING
 }