Date: Monday, April 9, 2018 @ 19:42:32 Author: heftig Revision: 315478
1.0.2-1 Modified: lib32-fribidi/trunk/PKGBUILD ----------+ PKGBUILD | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-04-09 19:33:56 UTC (rev 315477) +++ PKGBUILD 2018-04-09 19:42:32 UTC (rev 315478) @@ -4,16 +4,15 @@ _pkgbasename=fribidi pkgname=lib32-$_pkgbasename -pkgver=1.0.1+8+gdf7252b +pkgver=1.0.2 pkgrel=1 pkgdesc="A Free Implementation of the Unicode Bidirectional Algorithm (32-bit)" arch=('x86_64') license=('LGPL') url="https://github.com/fribidi/fribidi/" -makedepends=(git lib32-glib2) depends=('lib32-glibc' $_pkgbasename) -options=('!makeflags') -_commit=df7252be3fd94ceae8141a09ee86421fdd8b3b7e # master +makedepends=('git' 'meson') +_commit=f2c9d50722cb60d0cdec3b1bafba9029770e86b4 # tags/v1.0.2^0 source=("git+https://github.com/fribidi/fribidi#commit=$_commit") md5sums=('SKIP') @@ -22,10 +21,8 @@ git describe --tags | sed -e 's/-/+/g' -e 's/^v//' } - prepare() { cd $_pkgbasename - NOCONFIGURE=1 ./autogen.sh } build() { @@ -33,20 +30,16 @@ export CXX="g++ -m32" export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - cd "${srcdir}/$_pkgbasename" - ./configure --prefix=/usr --libdir=/usr/lib32 - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - make + arch-meson $_pkgbasename build -D docs=false --libdir=/usr/lib32 + ninja -C build } +check() { + cd build + meson test +} + package() { - cd "${srcdir}/$_pkgbasename" - - make DESTDIR="${pkgdir}" install + DESTDIR="$pkgdir" ninja -C build install rm -rf "$pkgdir"/usr/{include,share,bin} } - -check() { - cd "${srcdir}/$_pkgbasename" - make check -}