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

[Maxime Gauduin]

    Date: Tuesday, September 1, 2020 @ 14:57:04
  Author: alucryd
Revision: 695575

upgpkg: lib32-libpsl 0.21.1-1

Modified:
  lib32-libpsl/trunk/PKGBUILD

----------+
 PKGBUILD |   46 ++++++++++++++++++++++------------------------
 1 file changed, 22 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-09-01 14:55:46 UTC (rev 695574)
+++ PKGBUILD	2020-09-01 14:57:04 UTC (rev 695575)
@@ -2,7 +2,7 @@
 # Maintainer: Maxime Gauduin <alucryd at archlinux.org>
 
 pkgname=lib32-libpsl
-pkgver=0.21.0
+pkgver=0.21.1
 pkgrel=1
 pkgdesc='Public Suffix List library (32-bit)'
 url='https://github.com/rockdaboot/libpsl'
@@ -9,47 +9,45 @@
 arch=('x86_64')
 license=('MIT')
 depends=('libpsl' 'lib32-glibc' 'lib32-libidn2' 'lib32-libunistring')
-makedepends=('libxslt' 'python' 'publicsuffix-list')
+makedepends=('git' 'libxslt' 'meson' 'ninja' 'python' 'publicsuffix-list')
 provides=('libpsl.so')
-source=(https://github.com/rockdaboot/libpsl/releases/download/libpsl-${pkgver}/libpsl-${pkgver}.tar.gz
-        libpsl-0.21.0-build-fix.patch::https://github.com/rockdaboot/libpsl/commit/9347024221f4a9d63f9dcafcda13362a7c8d92fe.patch)
-sha512sums=('165c4f0b0640a813d512bd916e1532e32e43c8c81a5efd048f3a5b07b1b3c9129b4c4b5008b8b11a7c1b3914caea17564321389cd350bf1d687d53a97f2afa4d'
-            '692d6dd6f64653f6e355df0b6cfe519a5c202d966deab066123e814591692a28a805fe794dc57dd6f9ab357b4e0dd8dfdf842239ec39f303fc33d98019e7f24e')
+_tag=a5e6f26cce82898c54a0caa6dda0ab924b806daf
+source=(git+https://github.com/rockdaboot/libpsl.git#tag=${_tag})
+sha512sums=('SKIP')
 
+pkgver() {
+  cd libpsl
+
+  git describe --tags | sed 's/^V//'
+}
+
 prepare() {
-  cd libpsl-${pkgver}
+  cd libpsl
+
   rm -frv list
-  patch -Np1 < ../libpsl-0.21.0-build-fix.patch
-  autoreconf -fiv
 }
 
 build() {
-  cd libpsl-${pkgver}
-
   export CC='gcc -m32'
   export CXX='g++ -m32'
   export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
 
-  ./configure \
-    --prefix=/usr \
+  arch-meson libpsl build \
     --libdir=/usr/lib32 \
-    --disable-static \
-    --disable-dependency-tracking \
-    --enable-{builtin,runtime}=libidn2 \
-    --with-psl-file=/usr/share/publicsuffix/effective_tld_names.dat \
-    --with-psl-testfile=/usr/share/publicsuffix/test_psl.txt
-  LC_CTYPE=en_US.UTF-8 make
+    -Dbuiltin=libidn2 \
+    -Druntime=libidn2 \
+    -Dpsl_file=/usr/share/publicsuffix/effective_tld_names.dat \
+    -Dpsl_distfile=/usr/share/publicsuffix/public_suffix_list.dat \
+    -Dpsl_testfile=/usr/share/publicsuffix/test_psl.txt
+  ninja -C build
 }
 
 check() {
-  cd libpsl-${pkgver}
-  make check
+  ninja -C build test
 }
 
 package() {
-  cd libpsl-${pkgver}
-
-  make DESTDIR="${pkgdir}" install
+  DESTDIR="${pkgdir}" ninja -C build install
   rm -rf "${pkgdir}"/usr/{bin,include,share}
 
   install -dm 755 "${pkgdir}"/usr/share/licenses