Revision: 26573
http://sourceforge.net/p/gar/code/26573
Author: dmichelsen
Date: 2019-08-16 08:43:10 +0000 (Fri, 16 Aug 2019)
Log Message:
-----------
libpsl/trunk: Update to 0.21.0
Modified Paths:
--------------
csw/mgar/pkg/libpsl/trunk/Makefile
csw/mgar/pkg/libpsl/trunk/checksums
Removed Paths:
-------------
csw/mgar/pkg/libpsl/trunk/files/0001-Remove-unconditional-setting-of-GCC-specific-flag.patch
csw/mgar/pkg/libpsl/trunk/files/0001-Use-LIBIDN2_LIBS-instead-of-hardcoding.patch
Modified: csw/mgar/pkg/libpsl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libpsl/trunk/Makefile 2019-08-16 08:33:40 UTC (rev 26572)
+++ csw/mgar/pkg/libpsl/trunk/Makefile 2019-08-16 08:43:10 UTC (rev 26573)
@@ -2,7 +2,7 @@
# TODO (release-critical prefixed with !, non release-critical with *)
#
NAME = libpsl
-VERSION = 0.19.1
+VERSION = 0.21.0
GARTYPE = v2
DESCRIPTION = Provides functions to check domains against the Mozilla Public
Suffix List
@@ -10,18 +10,13 @@
MASTER_SITES +=
https://github.com/rockdaboot/libpsl/releases/download/$(DISTNAME)/
DISTFILES += $(DISTNAME).tar.gz
-# Use patch until this is fixed:
-# https://github.com/rockdaboot/libpsl/pull/88
-PATCHFILES += 0001-Use-LIBIDN2_LIBS-instead-of-hardcoding.patch
-
-# Use patch until this is fixed:
-# https://github.com/rockdaboot/libpsl/pull/89
-PATCHFILES += 0001-Remove-unconditional-setting-of-GCC-specific-flag.patch
-
PACKAGES += CSWlibpsl5
SPKG_DESC_CSWlibpsl5 = Public Suffix List library, libpsl.so.5
PKGFILES_CSWlibpsl5 += $(call pkgfiles_lib,libpsl.so.5)
RUNTIME_DEP_PKGS_CSWlibpsl5 += CSWlibidn2-0
+RUNTIME_DEP_PKGS_CSWlibpsl5 += CSWlibintl9
+RUNTIME_DEP_PKGS_CSWlibpsl5 += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWlibpsl5 += CSWlibunistring2
RUNTIME_DEP_PKGS_CSWlibpsl5 += CSWpublic-suffix-list
CHECKPKG_OVERRIDES_CSWlibpsl5 += surplus-dependency|CSWpublic-suffix-list
@@ -38,11 +33,15 @@
PKGFILES_CSWlibpsl-util += $(bindir)/psl
RUNTIME_DEP_PKGS_CSWlibpsl-util += CSWlibpsl5
RUNTIME_DEP_PKGS_CSWlibpsl-util += CSWlibidn2-0
+RUNTIME_DEP_PKGS_CSWlibpsl-util += CSWlibintl9
+RUNTIME_DEP_PKGS_CSWlibpsl-util += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWlibpsl-util += CSWlibunistring2
BUILD64_LIBS_ONLY = 1
CONFIGURE_ARGS += $(DIRPATHS)
CONFIGURE_ARGS += --with-psl-file=$(sharedstatedir)/public_suffix_list.dat
+CONFIGURE_ARGS += --disable-dependency-tracking
# This breaks the testsuite depending indirectly on libicuuc.so
LINKER_IGNORE =
@@ -55,10 +54,6 @@
include gar/category.mk
-post-patch:
- cd $(WORKSRC) && autoreconf -fi
- @$(MAKECOOKIE)
-
post-install:
ginstall -D -m 0755 $(WORKSRC)/src/psl-make-dafsa
$(DESTDIR)$(bindir)/psl-make-dafsa
@$(MAKECOOKIE)
Modified: csw/mgar/pkg/libpsl/trunk/checksums
===================================================================
--- csw/mgar/pkg/libpsl/trunk/checksums 2019-08-16 08:33:40 UTC (rev 26572)
+++ csw/mgar/pkg/libpsl/trunk/checksums 2019-08-16 08:43:10 UTC (rev 26573)
@@ -1 +1 @@
-663de429bfa0eb96c39ba57fb0866f5b libpsl-0.19.1.tar.gz
+171e96d887709e36a57f4ee627bf82d2 libpsl-0.21.0.tar.gz
Deleted:
csw/mgar/pkg/libpsl/trunk/files/0001-Remove-unconditional-setting-of-GCC-specific-flag.patch
===================================================================
---
csw/mgar/pkg/libpsl/trunk/files/0001-Remove-unconditional-setting-of-GCC-specific-flag.patch
2019-08-16 08:33:40 UTC (rev 26572)
+++
csw/mgar/pkg/libpsl/trunk/files/0001-Remove-unconditional-setting-of-GCC-specific-flag.patch
2019-08-16 08:43:10 UTC (rev 26573)
@@ -1,22 +0,0 @@
-From c80c5fb8bbbc47e27c66809c43f7d0def7ac8772 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <d...@opencsw.org>
-Date: Tue, 16 Jan 2018 13:46:42 +0100
-Subject: [PATCH] Remove unconditional setting of GCC-specific flag
-
----
- fuzz/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/fuzz/Makefile.am b/fuzz/Makefile.am
-index fcdfe16..f98d186 100644
---- a/fuzz/Makefile.am
-+++ b/fuzz/Makefile.am
-@@ -1,4 +1,4 @@
--AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS) -Wno-unused-parameter
-+AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS)
- AM_CPPFLAGS = -I$(top_srcdir)/include -I$(srcdir) -DSRCDIR=\"$(abs_srcdir)\"
-DTEST_RUN
- #AM_LDFLAGS = -static
- AM_LDFLAGS = -no-install
---
-2.4.0
-
Deleted:
csw/mgar/pkg/libpsl/trunk/files/0001-Use-LIBIDN2_LIBS-instead-of-hardcoding.patch
===================================================================
---
csw/mgar/pkg/libpsl/trunk/files/0001-Use-LIBIDN2_LIBS-instead-of-hardcoding.patch
2019-08-16 08:33:40 UTC (rev 26572)
+++
csw/mgar/pkg/libpsl/trunk/files/0001-Use-LIBIDN2_LIBS-instead-of-hardcoding.patch
2019-08-16 08:43:10 UTC (rev 26573)
@@ -1,29 +0,0 @@
-From c8bb81364f5c02cff69b84eeb53bbb9a7bf47bca Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <d...@opencsw.org>
-Date: Tue, 16 Jan 2018 13:33:24 +0100
-Subject: [PATCH] Use LIBIDN2_LIBS instead of hardcoding
-
----
- src/Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index de0926d..9a98e61 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -14,10 +14,10 @@ if WITH_LIBICU
- libpsl_la_LDFLAGS += $(LIBICU_LIBS)
- endif
- if WITH_LIBIDN2
-- libpsl_la_LDFLAGS += -lidn2 -lunistring
-+ libpsl_la_LDFLAGS += $(LIBIDN2_LIBS)
- endif
- if WITH_LIBIDN
-- libpsl_la_LDFLAGS += -lidn -lunistring
-+ libpsl_la_LDFLAGS += $(LIBIDN_LIBS)
- endif
-
- # Build rule for suffix_dafsa.c
---
-2.4.0
-
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
