[crux-commits] ports/opt (3.5): libpsl: 0.21.0 -> 0.21.1

crux at crux.nu crux at crux.nu
Tue Jul 21 12:16:29 UTC 2020


commit 1337015ff7981d18cd3c6a155ab03c3c78e319f3
Author: Danny Rawlins <monster.romster at gmail.com>
Date:   Tue Jul 21 22:14:09 2020 +1000

    libpsl: 0.21.0 -> 0.21.1

diff --git a/libpsl/.footprint b/libpsl/.footprint
index 55283d3bf..6701c92cc 100644
--- a/libpsl/.footprint
+++ b/libpsl/.footprint
@@ -1,18 +1,9 @@
 drwxr-xr-x	root/root	usr/
-drwxr-xr-x	root/root	usr/bin/
--rwxr-xr-x	root/root	usr/bin/psl
 drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/libpsl.h
 drwxr-xr-x	root/root	usr/lib/
--rw-r--r--	root/root	usr/lib/libpsl.a
--rwxr-xr-x	root/root	usr/lib/libpsl.la
-lrwxrwxrwx	root/root	usr/lib/libpsl.so -> libpsl.so.5.3.2
+lrwxrwxrwx	root/root	usr/lib/libpsl.so -> libpsl.so.5
 lrwxrwxrwx	root/root	usr/lib/libpsl.so.5 -> libpsl.so.5.3.2
 -rwxr-xr-x	root/root	usr/lib/libpsl.so.5.3.2
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libpsl.pc
-drwxr-xr-x	root/root	usr/share/
-drwxr-xr-x	root/root	usr/share/man/
-drwxr-xr-x	root/root	usr/share/man/man1/
--rw-r--r--	root/root	usr/share/man/man1/psl-make-dafsa.1.gz
--rw-r--r--	root/root	usr/share/man/man1/psl.1.gz
diff --git a/libpsl/.signature b/libpsl/.signature
index 69972da55..235162a07 100644
--- a/libpsl/.signature
+++ b/libpsl/.signature
@@ -1,7 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/Yf5GbN9k0Ndx2vPHneVCfzEbGhpixd2c6KY+hMTY/7CPYNvh2NHG5GKvAy3Fv+v09hqJ7jND+wUzn/3GRRJCQQ=
-SHA256 (Pkgfile) = 8f6fdc7a24495dbc3d0f19d8d163afc41581a12939b8a5372cb21b3e8050fb7d
-SHA256 (.footprint) = a0b01464bc0286c89f4532dbbcc58a955bc47d71a6f6117face2cd6855359be6
-SHA256 (libpsl-0.21.0.tar.gz) = 41bd1c75a375b85c337b59783f5deb93dbb443fb0a52d257f403df7bd653ee12
-SHA256 (libpsl-gtk-doc-1.30-fix.patch) = 289663403b4bd511ef7361ad4ac7e5654edfbd83ee80fbd0f35b0977a7c926ca
-SHA256 (libpsl-0.21.0-build-fix.patch) = a50c2c510a6543e79767af75b909bf7abc15e6b057b0253a036da66b27a590f1
+RWSE3ohX2g5d/VYusdTC6vSa+75a7xLy/POwgviakdkXPBFyOF9mzZH4MvF7tWXUGMrjg8zjFfrxxuZfifrHtPq5akN6yqiFVQ0=
+SHA256 (Pkgfile) = db8ed50c28f9b6323e61764752729488905be1d439d162806a2dccfb3cb7d098
+SHA256 (.footprint) = 3c4e7bc57f0901cd1df254123670998a2c68eda01f04d18a48bd6fffd8c97fd9
+SHA256 (libpsl-0.21.1.tar.lz) = 644375d557bb3b84c485df2dae98ee388fe1e11fb75230004e4b8623b3b833a9
diff --git a/libpsl/Pkgfile b/libpsl/Pkgfile
index 210c59317..b4fe261a7 100644
--- a/libpsl/Pkgfile
+++ b/libpsl/Pkgfile
@@ -1,33 +1,20 @@
 # Description: Public Suffix List library.
 # URL: https://github.com/rockdaboot/libpsl
 # Maintainer: Danny Rawlins, crux at romster dot me
-# Depends on: libidn2 publicsuffix-list python3
+# Depends on: libidn2 meson ninja publicsuffix-list
 
 name=libpsl
-version=0.21.0
-release=2
-source=(https://github.com/rockdaboot/$name/releases/download/$name-$version/$name-$version.tar.gz
-	libpsl-gtk-doc-1.30-fix.patch
-	libpsl-0.21.0-build-fix.patch)
+version=0.21.1
+release=1
+source=(https://github.com/rockdaboot/$name/releases/download/$version/$name-$version.tar.lz)
 
 build() {
-	cd $name-$version
+	meson setup build $name-$version --prefix=/usr \
+		-D runtime=libidn2 \
+		-D builtin=libidn2 \
+		-D psl_file=/usr/share/publicsuffix/effective_tld_names.dat \
+		-D psl_testfile=/usr/share/publicsuffix/test_psl.txt
 
-	patch -p1 -i $SRC/libpsl-gtk-doc-1.30-fix.patch
-	patch -p1 -i $SRC/libpsl-0.21.0-build-fix.patch
-	rm -frv list
-	autoreconf -fiv
-
-	sed -e 's|^#!/usr/bin/env python$|#!/usr/bin/env python3|' \
-		-i src/psl-make-dafsa
-
-	./configure \
-		--prefix=/usr \
-		--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
-	make DESTDIR=$PKG install
-
-	rm -rf $PKG/usr/share/gtk-doc
+	ninja -j ${JOBS-1} -C build
+	DESTDIR=$PKG meson install -C build
 }


More information about the crux-commits mailing list