[notify] libpsl: dependency change python -> python3, new dependnecy publicsuffix-list

4 files changed, 82 insertions, 7 deletions

diff --git a/libpsl/.signature b/libpsl/.signature
index 046312065..69972da55 100644
--- a/libpsl/.signature
+++ b/libpsl/.signature
@@ -1,5 +1,7 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/cAlAryhbxa4zqrfLDGi+ziiT6sUh+dy9pxq9nVGkE+Im0sQWUsQ6T0nahCXDmhwvqikVLe+kephbtHRvgpxKgs=
-SHA256 (Pkgfile) = 9ead938f51fb2675c067fd6ba0940f84273a41258fb25f94e0ee4399c55fa6ff
+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
diff --git a/libpsl/Pkgfile b/libpsl/Pkgfile
index 8725d1d0a..210c59317 100644
--- a/libpsl/Pkgfile
+++ b/libpsl/Pkgfile
@@ -1,18 +1,33 @@
 # Description: Public Suffix List library.
 # URL: https://github.com/rockdaboot/libpsl
 # Maintainer: Danny Rawlins, crux at romster dot me
-# Depends on: libidn2 python
+# Depends on: libidn2 publicsuffix-list python3
 
 name=libpsl
 version=0.21.0
-release=1
-source=(https://github.com/rockdaboot/$name/releases/download/$name-$version/$name-$version.tar.gz)
+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)
 
 build() {
 	cd $name-$version
 
-	./configure --prefix=/usr
+	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
 
-	make
+	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
 }
diff --git a/libpsl/libpsl-0.21.0-build-fix.patch b/libpsl/libpsl-0.21.0-build-fix.patch
new file mode 100644
index 000000000..92bc6cfcc
--- /dev/null
+++ b/libpsl/libpsl-0.21.0-build-fix.patch
@@ -0,0 +1,33 @@
+From 9347024221f4a9d63f9dcafcda13362a7c8d92fe Mon Sep 17 00:00:00 2001
+From: Po-Chuan Hsieh <sunpoet@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/libpsl-gtk-doc-1.30-fix.patch b/libpsl/libpsl-gtk-doc-1.30-fix.patch
new file mode 100644
index 000000000..bcd49e750
--- /dev/null
+++ b/libpsl/libpsl-gtk-doc-1.30-fix.patch
@@ -0,0 +1,25 @@
+From 87d1add318b5e5d09977f7f374e923577b6ff3be Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@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>