commit b60852e79be75f9b6eba3e29b5cb744c6ca3d993 Author: Tim Biermann <tbier@posteo.de> Date: Sat Jan 8 13:46:39 2022 +0100 libpsl: updated meson syntax diff --git a/libpsl/.signature b/libpsl/.signature index 235162a07..43a8db1be 100644 --- a/libpsl/.signature +++ b/libpsl/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/VYusdTC6vSa+75a7xLy/POwgviakdkXPBFyOF9mzZH4MvF7tWXUGMrjg8zjFfrxxuZfifrHtPq5akN6yqiFVQ0= -SHA256 (Pkgfile) = db8ed50c28f9b6323e61764752729488905be1d439d162806a2dccfb3cb7d098 +RWSE3ohX2g5d/f3/W/U5/w0yvGJL3/t+2Hq6N8pJuMezKgFqZpa01n8isH9fI6rXFBzQX9LP3tApT9PNcI3cIWBSndqwlLdQnAU= +SHA256 (Pkgfile) = 9d33eeeb88b9c84664a4161618d001d3bf17039a1ef0d0656264e1dc0483170d SHA256 (.footprint) = 3c4e7bc57f0901cd1df254123670998a2c68eda01f04d18a48bd6fffd8c97fd9 SHA256 (libpsl-0.21.1.tar.lz) = 644375d557bb3b84c485df2dae98ee388fe1e11fb75230004e4b8623b3b833a9 diff --git a/libpsl/Pkgfile b/libpsl/Pkgfile index b4fe261a7..e699bea2d 100644 --- a/libpsl/Pkgfile +++ b/libpsl/Pkgfile @@ -1,7 +1,7 @@ # Description: Public Suffix List library. # URL: https://github.com/rockdaboot/libpsl # Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: libidn2 meson ninja publicsuffix-list +# Depends on: libidn2 publicsuffix-list name=libpsl version=0.21.1 @@ -9,7 +9,12 @@ release=1 source=(https://github.com/rockdaboot/$name/releases/download/$version/$name-$versio...) build() { - meson setup build $name-$version --prefix=/usr \ + meson setup build $name-$version \ + --prefix=/usr \ + --buildtype=plain \ + --wrap-mode nodownload \ + -D b_lto=true \ + -D b_pie=true \ -D runtime=libidn2 \ -D builtin=libidn2 \ -D psl_file=/usr/share/publicsuffix/effective_tld_names.dat \ diff --git a/libpsl/libpsl-0.21.0-build-fix.patch b/libpsl/libpsl-0.21.0-build-fix.patch deleted file mode 100644 index 92bc6cfcc..000000000 --- a/libpsl/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@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 deleted file mode 100644 index bcd49e750..000000000 --- a/libpsl/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@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>