[crux-commits] ports/compat-32 (3.6): [notify] libpsl-32: 0.21.0 -> 0.21.1 new dependency libidn2-32

crux at crux.nu crux at crux.nu
Sun Jul 26 08:45:13 UTC 2020


commit 82a48240ecba571c80056c1fe62f6c98ae5fd558
Author: Danny Rawlins <monster.romster at gmail.com>
Date:   Fri Jul 24 19:05:16 2020 +1000

    [notify] libpsl-32: 0.21.0 -> 0.21.1 new dependency libidn2-32

diff --git a/libpsl-32/.footprint b/libpsl-32/.footprint
index b84d271..6caf107 100644
--- a/libpsl-32/.footprint
+++ b/libpsl-32/.footprint
@@ -1,8 +1,6 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/lib32/
--rw-r--r--	root/root	usr/lib32/libpsl.a
--rwxr-xr-x	root/root	usr/lib32/libpsl.la
-lrwxrwxrwx	root/root	usr/lib32/libpsl.so -> libpsl.so.5.3.2
+lrwxrwxrwx	root/root	usr/lib32/libpsl.so -> libpsl.so.5
 lrwxrwxrwx	root/root	usr/lib32/libpsl.so.5 -> libpsl.so.5.3.2
 -rwxr-xr-x	root/root	usr/lib32/libpsl.so.5.3.2
 drwxr-xr-x	root/root	usr/lib32/pkgconfig/
diff --git a/libpsl-32/.signature b/libpsl-32/.signature
index fee1a42..ae0eb7c 100644
--- a/libpsl-32/.signature
+++ b/libpsl-32/.signature
@@ -1,7 +1,5 @@
 untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXfJ9TEpTQRD/tAVwXXLsrx4pL2vveIaiJ6iXEs+iBtusxENgUxtsmghL+vfcxlPa5+RmBJmDC5wY/xUvUE/E1Q8=
-SHA256 (Pkgfile) = 3c8d29e2751105930e4766c7738062f67844055b34209e046f3b123aa0562262
-SHA256 (.footprint) = 066f65ea41f70ed863b5d2f86e8a733f81771e66aef91a29d93839fbc40213a6
-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
+RWSwxGo/zH7eXQ1IXsPS+9RSxUfAfLHxkaHr57phsXEh6BcB1yfkfCfzca1z+o9kiDCLqD+uffbpsKAYk+lAGIizBRJf7+Vw2Q0=
+SHA256 (Pkgfile) = 2711d187f69f2ff9dd2c1256d2d69eec5a5b90d9aeb7a9324f660d766be82126
+SHA256 (.footprint) = 96510a849f61799178309f207ac4568a17fe6a3588f2b6655383e7b6772fe161
+SHA256 (libpsl-0.21.1.tar.lz) = 644375d557bb3b84c485df2dae98ee388fe1e11fb75230004e4b8623b3b833a9
diff --git a/libpsl-32/Pkgfile b/libpsl-32/Pkgfile
index 06627b9..6570ef8 100644
--- a/libpsl-32/Pkgfile
+++ b/libpsl-32/Pkgfile
@@ -1,34 +1,22 @@
 # Description: Public Suffix List library.
 # URL: https://github.com/rockdaboot/libpsl
 # Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu
-# Depends on: libpsl libunistring-32
+# Depends on: libpsl libunistring-32 libidn2-32
 
 name=libpsl-32
-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 --libdir=/usr/lib32 \
+		-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
+	ninja -j ${JOBS-1} -C build
+	DESTDIR=$PKG meson install -C build
 
-	sed -e 's|^#!/usr/bin/env python$|#!/usr/bin/env python3|' \
-		-i src/psl-make-dafsa
-
-	./configure \
-		--prefix=/usr \
-		--libdir=/usr/lib32 \
-		--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 -r $PKG/usr/{bin,include,share}
+	rm -r $PKG/usr/include
 }
diff --git a/libpsl-32/libpsl-0.21.0-build-fix.patch b/libpsl-32/libpsl-0.21.0-build-fix.patch
deleted file mode 100644
index 92bc6cf..0000000
--- a/libpsl-32/libpsl-0.21.0-build-fix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 9347024221f4a9d63f9dcafcda13362a7c8d92fe Mon Sep 17 00:00:00 2001
-From: Po-Chuan Hsieh <sunpoet at sunpoet.net>
-Date: Wed, 17 Apr 2019 13:25:48 +0000
-Subject: [PATCH] Fix build when configured with --with-psl-file
-
-The error message is as follows:
-Making all in tests
-make: don't know how to make ../list/public_suffix_list.dat. Stop
-
-make: stopped in /usr/ports/works/usr/ports/dns/libpsl/work/libpsl-libpsl-0.21.0/tests
-*** Error code 1
-
-Stop.
----
- tests/Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 480b236..9c37ce3 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -33,9 +33,9 @@ TESTS = $(PSL_TESTS)
- # dafsa.psl and dafsa_ascii.psl must be created before any test is executed
- # check-local target works in parallel to the tests, so the test suite will likely fail
- BUILT_SOURCES = psl.dafsa psl_ascii.dafsa
--psl.dafsa: $(top_srcdir)/list/public_suffix_list.dat
-+psl.dafsa: $(PSL_FILE)
- 	$(top_srcdir)/src/psl-make-dafsa --output-format=binary "$(PSL_FILE)" psl.dafsa
--psl_ascii.dafsa: $(top_srcdir)/list/public_suffix_list.dat
-+psl_ascii.dafsa: $(PSL_FILE)
- 	$(top_srcdir)/src/psl-make-dafsa --output-format=binary --encoding=ascii "$(PSL_FILE)" psl_ascii.dafsa
- 
- clean-local:
diff --git a/libpsl-32/libpsl-gtk-doc-1.30-fix.patch b/libpsl-32/libpsl-gtk-doc-1.30-fix.patch
deleted file mode 100644
index bcd49e7..0000000
--- a/libpsl-32/libpsl-gtk-doc-1.30-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 87d1add318b5e5d09977f7f374e923577b6ff3be Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin at gmail.com>
-Date: Sat, 1 Jun 2019 13:09:41 +0200
-Subject: [PATCH] gtk-doc: do not include tree_index.sgml
-
-gtk-doc 1.30 no longer generates the file if the object tree is empty.
----
- docs/libpsl/libpsl-docs.sgml | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/docs/libpsl/libpsl-docs.sgml b/docs/libpsl/libpsl-docs.sgml
-index 335d241..88c7ba8 100644
---- a/docs/libpsl/libpsl-docs.sgml
-+++ b/docs/libpsl/libpsl-docs.sgml
-@@ -22,10 +22,6 @@
-         </para>
-         <xi:include href="xml/libpsl.xml"/>
-   </chapter>
--  <chapter id="object-tree">
--    <title>Object Hierarchy</title>
--     <xi:include href="xml/tree_index.sgml"/>
--  </chapter>
-   <index id="api-index-full">
-     <title>API Index</title>
-     <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>


More information about the crux-commits mailing list