All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 0/2] Update to latest libsoup2
@ 2021-05-19 21:26 Adrian Perez de Castro
  2021-05-19 21:26 ` [Buildroot] [PATCH 1/2] package/libpsl: new package Adrian Perez de Castro
                   ` (2 more replies)
  0 siblings, 3 replies; 17+ messages in thread
From: Adrian Perez de Castro @ 2021-05-19 21:26 UTC (permalink / raw)
  To: buildroot

Hello all,

While working on the WebKit package updates the last days I noticed that the
version of libsoup2 in Buildroot is a tad old, and it seemed fitting to submit
a patch set for updating it. Recent versions have a new dependency on libpsl,
so a new package for it is added as well.

Cheers,
-Adrian

Adrian Perez de Castro (2):
  package/libpsl: new package
  package/libsoup: bump to version 2.66.5

 DEVELOPERS                                    |  1 +
 package/Config.in                             |  1 +
 package/libpsl/Config.in                      |  5 ++++
 package/libpsl/libpsl.hash                    |  2 ++
 package/libpsl/libpsl.mk                      | 28 +++++++++++++++++++
 .../0001-Revert-tld-parser-use-Python-3.patch | 27 ------------------
 package/libsoup/Config.in                     |  1 +
 package/libsoup/libsoup.hash                  |  4 +--
 package/libsoup/libsoup.mk                    | 20 ++++++-------
 9 files changed, 50 insertions(+), 39 deletions(-)
 create mode 100644 package/libpsl/Config.in
 create mode 100644 package/libpsl/libpsl.hash
 create mode 100644 package/libpsl/libpsl.mk
 delete mode 100644 package/libsoup/0001-Revert-tld-parser-use-Python-3.patch

-- 
2.31.1

^ permalink raw reply	[flat|nested] 17+ messages in thread
* [Buildroot] [PATCH 1/2] package/libpsl: new package
  2021-05-19 21:26 [Buildroot] [PATCH 0/2] Update to latest libsoup2 Adrian Perez de Castro
@ 2021-05-19 21:26 ` Adrian Perez de Castro
  2021-05-20  7:11   ` Arnout Vandecappelle
  2021-05-19 21:26 ` [Buildroot] [PATCH 2/2] package/libsoup: bump to version 2.66.5 Adrian Perez de Castro
  2021-05-20 11:09 ` [Buildroot] [PATCH v2 0/2] Update to latest libsoup2 Adrian Perez de Castro
  2 siblings, 1 reply; 17+ messages in thread
From: Adrian Perez de Castro @ 2021-05-19 21:26 UTC (permalink / raw)
  To: buildroot

Package libpsl is a new non-optional dependency of libsoup.

Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
---
 DEVELOPERS                 |  1 +
 package/Config.in          |  1 +
 package/libpsl/Config.in   |  5 +++++
 package/libpsl/libpsl.hash |  2 ++
 package/libpsl/libpsl.mk   | 28 ++++++++++++++++++++++++++++
 5 files changed, 37 insertions(+)
 create mode 100644 package/libpsl/Config.in
 create mode 100644 package/libpsl/libpsl.hash
 create mode 100644 package/libpsl/libpsl.mk

diff --git a/DEVELOPERS b/DEVELOPERS
index a90ad1c354..4286ca5baf 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -35,6 +35,7 @@ F:	package/bubblewrap/
 F:	package/cage/
 F:	package/cog/
 F:	package/libepoxy/
+F:	package/libpsl/
 F:	package/libwpe/
 F:	package/webkitgtk/
 F:	package/wlroots/
diff --git a/package/Config.in b/package/Config.in
index 82b28d2835..eaa30ea161 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1788,6 +1788,7 @@ menu "Networking"
 	source "package/libpagekite/Config.in"
 	source "package/libpcap/Config.in"
 	source "package/libpjsip/Config.in"
+	source "package/libpsl/Config.in"
 	source "package/librelp/Config.in"
 	source "package/librsync/Config.in"
 	source "package/libshairplay/Config.in"
diff --git a/package/libpsl/Config.in b/package/libpsl/Config.in
new file mode 100644
index 0000000000..cecd12c983
--- /dev/null
+++ b/package/libpsl/Config.in
@@ -0,0 +1,5 @@
+config BR2_PACKAGE_LIBPSL
+	bool "libpsl"
+	depends on BR2_PACKAGE_ICU || BR2_PACKAGE_LIBIDN2 || BR2_PACKAGE_LIBIDN
+	help
+	  C library to handle the Public Suffix List of TLDs.
diff --git a/package/libpsl/libpsl.hash b/package/libpsl/libpsl.hash
new file mode 100644
index 0000000000..6c1c640e98
--- /dev/null
+++ b/package/libpsl/libpsl.hash
@@ -0,0 +1,2 @@
+# Locally generated
+sha512  a5084b9df4ff2a0b1f5074b20972efe0da846473396d27b57967c7f6aa190ab3c910b4bfc4f8f03802f08decbbad5820d850c36ad59610262ae37fe77de0c7f5  libpsl-0.21.1.tar.gz
diff --git a/package/libpsl/libpsl.mk b/package/libpsl/libpsl.mk
new file mode 100644
index 0000000000..5a1336d7ce
--- /dev/null
+++ b/package/libpsl/libpsl.mk
@@ -0,0 +1,28 @@
+################################################################################
+#
+# libpsl
+#
+################################################################################
+
+LIBPSL_VERSION = 0.21.1
+LIBPSL_SITE = https://github.com/rockdaboot/libpsl/releases/download/$(LIBPSL_VERSION)
+LIBPSL_INSTALL_STAGING = YES
+LIBPSL_DEPENDENCIES = host-pkgconf
+LIBPSL_LICENSE = MIT
+LIBPSL_LICENSE_FILES = COPYING
+LIBPSL_CONF_OPTS = -Ddocs=false
+
+ifeq ($(BR2_PACKAGE_ICU),y)
+LIBPSL_CONF_OPTS += -Druntime=libicu -Dbuiltin=libicu
+LIBPSL_DEPENDENCIES += icu
+else
+ifeq ($(BR2_PACKAGE_LIBIDN2),y)
+LIBPSL_CONF_OPTS += -Druntime=libidn2 -Dbuiltin=libidn2
+LIBPSL_DEPENDENCIES += libidn2
+else
+LIBPSL_CONF_OPTS += -Druntime=libidn -Dbuiltin=libidn
+LIBPSL_DEPENDENCIES += libidn
+endif
+endif
+
+$(eval $(meson-package))
-- 
2.31.1

^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [Buildroot] [PATCH 2/2] package/libsoup: bump to version 2.66.5
  2021-05-19 21:26 [Buildroot] [PATCH 0/2] Update to latest libsoup2 Adrian Perez de Castro
  2021-05-19 21:26 ` [Buildroot] [PATCH 1/2] package/libpsl: new package Adrian Perez de Castro
@ 2021-05-19 21:26 ` Adrian Perez de Castro
  2021-05-20 11:09 ` [Buildroot] [PATCH v2 0/2] Update to latest libsoup2 Adrian Perez de Castro
  2 siblings, 0 replies; 17+ messages in thread
From: Adrian Perez de Castro @ 2021-05-19 21:26 UTC (permalink / raw)
  To: buildroot

Change libsoup to version 2.66.5, which introduces many fixes. This
needs adding the libpsl dependency, and switching over to Meson as the
autotools based build system is no more. The existing patch is not
needed anymore.

Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
---
 .../0001-Revert-tld-parser-use-Python-3.patch | 27 -------------------
 package/libsoup/Config.in                     |  1 +
 package/libsoup/libsoup.hash                  |  4 +--
 package/libsoup/libsoup.mk                    | 20 +++++++-------
 4 files changed, 13 insertions(+), 39 deletions(-)
 delete mode 100644 package/libsoup/0001-Revert-tld-parser-use-Python-3.patch

diff --git a/package/libsoup/0001-Revert-tld-parser-use-Python-3.patch b/package/libsoup/0001-Revert-tld-parser-use-Python-3.patch
deleted file mode 100644
index c27ee986c6..0000000000
--- a/package/libsoup/0001-Revert-tld-parser-use-Python-3.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 015926c80fa3e9704f05cbc1ad17f0a877f8de09 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-Date: Sat, 1 Sep 2018 15:39:04 +0200
-Subject: [PATCH] Revert "tld-parser: use Python 3"
-
-This reverts commit 4b924e573da307436169d5ef7e04c0ab85b36ef9. The
-script runs just fine with Python 2.x, there is no reason to enforce
-using Python 3.x.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
----
- libsoup/tld-parser.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libsoup/tld-parser.py b/libsoup/tld-parser.py
-index a743471a..5d9d2ba5 100755
---- a/libsoup/tld-parser.py
-+++ b/libsoup/tld-parser.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python3
-+#!/usr/bin/env python
- 
- # Generate tld rules
- # Copyright (C) 2012 Red Hat, Inc.
--- 
-2.14.4
-
diff --git a/package/libsoup/Config.in b/package/libsoup/Config.in
index f6f8fde968..47adfb33f2 100644
--- a/package/libsoup/Config.in
+++ b/package/libsoup/Config.in
@@ -5,6 +5,7 @@ config BR2_PACKAGE_LIBSOUP
 	depends on BR2_USE_MMU # glib2
 	select BR2_PACKAGE_LIBXML2
 	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_LIBPSL
 	select BR2_PACKAGE_SQLITE
 	help
 	  libsoup is an HTTP client/server library. It uses GObject
diff --git a/package/libsoup/libsoup.hash b/package/libsoup/libsoup.hash
index 666bbc278b..3b9009884d 100644
--- a/package/libsoup/libsoup.hash
+++ b/package/libsoup/libsoup.hash
@@ -1,4 +1,4 @@
-# From https://ftp.gnome.org/pub/GNOME/sources/libsoup/2.62/libsoup-2.62.3.sha256sum
-sha256	d312ade547495c2093ff8bda61f9b9727a98cfdae339f3263277dd39c0451172  libsoup-2.62.3.tar.xz
+# From https://ftp.gnome.org/pub/GNOME/sources/libsoup/2.66/libsoup-2.66.5.sha256sum
+sha256  ee43be1485bd95b686236b1e0043ec6edb761a538616c9c63004d7d1979bb139  libsoup-2.66.5.tar.xz
 # Locally calculated
 sha256  b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c  COPYING
diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk
index 44808225ea..1617940c8f 100644
--- a/package/libsoup/libsoup.mk
+++ b/package/libsoup/libsoup.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-LIBSOUP_VERSION_MAJOR = 2.62
-LIBSOUP_VERSION = $(LIBSOUP_VERSION_MAJOR).3
+LIBSOUP_VERSION_MAJOR = 2.66
+LIBSOUP_VERSION = $(LIBSOUP_VERSION_MAJOR).5
 LIBSOUP_SOURCE = libsoup-$(LIBSOUP_VERSION).tar.xz
 LIBSOUP_SITE = http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_VERSION_MAJOR)
 LIBSOUP_LICENSE = LGPL-2.0+
@@ -13,27 +13,27 @@ LIBSOUP_LICENSE_FILES = COPYING
 LIBSOUP_CPE_ID_VENDOR = gnome
 LIBSOUP_INSTALL_STAGING = YES
 LIBSOUP_CONF_ENV = ac_cv_path_GLIB_GENMARSHAL=$(LIBGLIB2_HOST_BINARY)
-LIBSOUP_CONF_OPTS = --disable-glibtest --enable-vala=no --with-gssapi=no
+LIBSOUP_CONF_OPTS = -Dtests=false -Dvapi=false -Dgssapi=false
 LIBSOUP_DEPENDENCIES = host-pkgconf host-libglib2 \
-	libglib2 libxml2 sqlite host-intltool
+	libglib2 libpsl libxml2 sqlite host-intltool
 
 ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
-LIBSOUP_CONF_OPTS += --with-introspection
+LIBSOUP_CONF_OPTS += -Dintrospection=true
 LIBSOUP_DEPENDENCIES += gobject-introspection
 else
-LIBSOUP_CONF_OPTS += --without-introspection
+LIBSOUP_CONF_OPTS += -Dintrospection=false
 endif
 
 ifeq ($(BR2_PACKAGE_LIBSOUP_GNOME),y)
-LIBSOUP_CONF_OPTS += --with-gnome
+LIBSOUP_CONF_OPTS += -Dgnome=true
 else
-LIBSOUP_CONF_OPTS += --without-gnome
+LIBSOUP_CONF_OPTS += -Dgnome=false
 endif
 
 ifeq ($(BR2_PACKAGE_LIBSOUP_SSL),y)
 LIBSOUP_DEPENDENCIES += glib-networking
 else
-LIBSOUP_CONF_OPTS += --disable-tls-check
+LIBSOUP_CONF_OPTS += -Dtls_check=false
 endif
 
-$(eval $(autotools-package))
+$(eval $(meson-package))
-- 
2.31.1

^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [Buildroot] [PATCH 1/2] package/libpsl: new package
  2021-05-19 21:26 ` [Buildroot] [PATCH 1/2] package/libpsl: new package Adrian Perez de Castro
@ 2021-05-20  7:11   ` Arnout Vandecappelle
  2021-05-20 10:49     ` Adrian Perez de Castro
  0 siblings, 1 reply; 17+ messages in thread
From: Arnout Vandecappelle @ 2021-05-20  7:11 UTC (permalink / raw)
  To: buildroot

 Hi Adrian,

On 19/05/2021 23:26, Adrian Perez de Castro wrote:
> Package libpsl is a new non-optional dependency of libsoup.
> 
> Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
> ---
>  DEVELOPERS                 |  1 +
>  package/Config.in          |  1 +
>  package/libpsl/Config.in   |  5 +++++
>  package/libpsl/libpsl.hash |  2 ++
>  package/libpsl/libpsl.mk   | 28 ++++++++++++++++++++++++++++
>  5 files changed, 37 insertions(+)
>  create mode 100644 package/libpsl/Config.in
>  create mode 100644 package/libpsl/libpsl.hash
>  create mode 100644 package/libpsl/libpsl.mk
> 
> diff --git a/DEVELOPERS b/DEVELOPERS
> index a90ad1c354..4286ca5baf 100644
> --- a/DEVELOPERS
> +++ b/DEVELOPERS
> @@ -35,6 +35,7 @@ F:	package/bubblewrap/
>  F:	package/cage/
>  F:	package/cog/
>  F:	package/libepoxy/
> +F:	package/libpsl/
>  F:	package/libwpe/
>  F:	package/webkitgtk/
>  F:	package/wlroots/
> diff --git a/package/Config.in b/package/Config.in
> index 82b28d2835..eaa30ea161 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -1788,6 +1788,7 @@ menu "Networking"
>  	source "package/libpagekite/Config.in"
>  	source "package/libpcap/Config.in"
>  	source "package/libpjsip/Config.in"
> +	source "package/libpsl/Config.in"
>  	source "package/librelp/Config.in"
>  	source "package/librsync/Config.in"
>  	source "package/libshairplay/Config.in"
> diff --git a/package/libpsl/Config.in b/package/libpsl/Config.in
> new file mode 100644
> index 0000000000..cecd12c983
> --- /dev/null
> +++ b/package/libpsl/Config.in
> @@ -0,0 +1,5 @@
> +config BR2_PACKAGE_LIBPSL
> +	bool "libpsl"
> +	depends on BR2_PACKAGE_ICU || BR2_PACKAGE_LIBIDN2 || BR2_PACKAGE_LIBIDN

 Since the dependency is non-obvious, we prefer select:

	select BR2_PACKAGE_LIBIDN2 if !BR2_PACKAGE_ICU && !BR2_PACKAGE_LIBIDN


> +	help
> +	  C library to handle the Public Suffix List of TLDs.

 Upstream URL is missing.

> diff --git a/package/libpsl/libpsl.hash b/package/libpsl/libpsl.hash
> new file mode 100644
> index 0000000000..6c1c640e98
> --- /dev/null
> +++ b/package/libpsl/libpsl.hash
> @@ -0,0 +1,2 @@
> +# Locally generated
> +sha512  a5084b9df4ff2a0b1f5074b20972efe0da846473396d27b57967c7f6aa190ab3c910b4bfc4f8f03802f08decbbad5820d850c36ad59610262ae37fe77de0c7f5  libpsl-0.21.1.tar.gz

 For locally generated, we normally use sha256.

 Also, hash for COPYING is missing.

> diff --git a/package/libpsl/libpsl.mk b/package/libpsl/libpsl.mk
> new file mode 100644
> index 0000000000..5a1336d7ce
> --- /dev/null
> +++ b/package/libpsl/libpsl.mk
> @@ -0,0 +1,28 @@
> +################################################################################
> +#
> +# libpsl
> +#
> +################################################################################
> +
> +LIBPSL_VERSION = 0.21.1
> +LIBPSL_SITE = https://github.com/rockdaboot/libpsl/releases/download/$(LIBPSL_VERSION)
> +LIBPSL_INSTALL_STAGING = YES
> +LIBPSL_DEPENDENCIES = host-pkgconf
> +LIBPSL_LICENSE = MIT
> +LIBPSL_LICENSE_FILES = COPYING

 From README.md:

src/psl-make-dafsa and src/lookup_string_in_fixed_set.c are licensed under the
term written in src/LICENSE.chromium.

So that should be included in LICENSE and LICENSE_FILES.

> +LIBPSL_CONF_OPTS = -Ddocs=false
> +
> +ifeq ($(BR2_PACKAGE_ICU),y)
> +LIBPSL_CONF_OPTS += -Druntime=libicu -Dbuiltin=libicu
> +LIBPSL_DEPENDENCIES += icu
> +else
> +ifeq ($(BR2_PACKAGE_LIBIDN2),y)

 With

else ifeq ($(BR2_PACKAGE_LIBIDN2),y)

you only need one endif at the end.

 Also, since it's possible that all three are selected, we need to think a bit
about the priorities. Preferring libidn2 over libidn is quite obvious, but about
ICU I'm not so sure if it should be preferred over libidn2. In the select
statement in Config.in libidn2 should clearly be preferred because it's much
smaller. If ICU is selected anyway, that doesn't matter of course. So, is there
any specific reason to prefer ICU over libidn2? I.e., does ICU offer more
features? If it makes no difference either way, I think we should prefer libidn2
over ICU to match the select in Config.in.

 Regards,
 Arnout

> +LIBPSL_CONF_OPTS += -Druntime=libidn2 -Dbuiltin=libidn2
> +LIBPSL_DEPENDENCIES += libidn2
> +else
> +LIBPSL_CONF_OPTS += -Druntime=libidn -Dbuiltin=libidn
> +LIBPSL_DEPENDENCIES += libidn
> +endif
> +endif
> +
> +$(eval $(meson-package))
> 

^ permalink raw reply	[flat|nested] 17+ messages in thread
* [Buildroot] [PATCH 1/2] package/libpsl: new package
  2021-05-20  7:11   ` Arnout Vandecappelle
@ 2021-05-20 10:49     ` Adrian Perez de Castro
  2021-05-20 11:10       ` Arnout Vandecappelle
  0 siblings, 1 reply; 17+ messages in thread
From: Adrian Perez de Castro @ 2021-05-20 10:49 UTC (permalink / raw)
  To: buildroot

Hello Arnout,

Thanks for the review, I'll send a v2 soon :)

On Thu, 20 May 2021 09:11:12 +0200 Arnout Vandecappelle <arnout@mind.be> wrote:
>  Hi Adrian,
> 
> On 19/05/2021 23:26, Adrian Perez de Castro wrote:
> > Package libpsl is a new non-optional dependency of libsoup.
> > 
> > Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
> > ---
> >  DEVELOPERS                 |  1 +
> >  package/Config.in          |  1 +
> >  package/libpsl/Config.in   |  5 +++++
> >  package/libpsl/libpsl.hash |  2 ++
> >  package/libpsl/libpsl.mk   | 28 ++++++++++++++++++++++++++++
> >  5 files changed, 37 insertions(+)
> >  create mode 100644 package/libpsl/Config.in
> >  create mode 100644 package/libpsl/libpsl.hash
> >  create mode 100644 package/libpsl/libpsl.mk
> > 
> > diff --git a/DEVELOPERS b/DEVELOPERS
> > index a90ad1c354..4286ca5baf 100644
> > --- a/DEVELOPERS
> > +++ b/DEVELOPERS
> > @@ -35,6 +35,7 @@ F:	package/bubblewrap/
> >  F:	package/cage/
> >  F:	package/cog/
> >  F:	package/libepoxy/
> > +F:	package/libpsl/
> >  F:	package/libwpe/
> >  F:	package/webkitgtk/
> >  F:	package/wlroots/
> > diff --git a/package/Config.in b/package/Config.in
> > index 82b28d2835..eaa30ea161 100644
> > --- a/package/Config.in
> > +++ b/package/Config.in
> > @@ -1788,6 +1788,7 @@ menu "Networking"
> >  	source "package/libpagekite/Config.in"
> >  	source "package/libpcap/Config.in"
> >  	source "package/libpjsip/Config.in"
> > +	source "package/libpsl/Config.in"
> >  	source "package/librelp/Config.in"
> >  	source "package/librsync/Config.in"
> >  	source "package/libshairplay/Config.in"
> > diff --git a/package/libpsl/Config.in b/package/libpsl/Config.in
> > new file mode 100644
> > index 0000000000..cecd12c983
> > --- /dev/null
> > +++ b/package/libpsl/Config.in
> > @@ -0,0 +1,5 @@
> > +config BR2_PACKAGE_LIBPSL
> > +	bool "libpsl"
> > +	depends on BR2_PACKAGE_ICU || BR2_PACKAGE_LIBIDN2 || BR2_PACKAGE_LIBIDN
> 
>  Since the dependency is non-obvious, we prefer select:
> 
> 	select BR2_PACKAGE_LIBIDN2 if !BR2_PACKAGE_ICU && !BR2_PACKAGE_LIBIDN
 
Good idea, this is definitely better.
 
> > +	help
> > +	  C library to handle the Public Suffix List of TLDs.
> 
>  Upstream URL is missing.

I'll add it.

> > diff --git a/package/libpsl/libpsl.hash b/package/libpsl/libpsl.hash
> > new file mode 100644
> > index 0000000000..6c1c640e98
> > --- /dev/null
> > +++ b/package/libpsl/libpsl.hash
> > @@ -0,0 +1,2 @@
> > +# Locally generated
> > +sha512  a5084b9df4ff2a0b1f5074b20972efe0da846473396d27b57967c7f6aa190ab3c910b4bfc4f8f03802f08decbbad5820d850c36ad59610262ae37fe77de0c7f5  libpsl-0.21.1.tar.gz
> 
>  For locally generated, we normally use sha256.
> 
>  Also, hash for COPYING is missing.

Okay, will fix.

> > diff --git a/package/libpsl/libpsl.mk b/package/libpsl/libpsl.mk
> > new file mode 100644
> > index 0000000000..5a1336d7ce
> > --- /dev/null
> > +++ b/package/libpsl/libpsl.mk
> > @@ -0,0 +1,28 @@
> > +################################################################################
> > +#
> > +# libpsl
> > +#
> > +################################################################################
> > +
> > +LIBPSL_VERSION = 0.21.1
> > +LIBPSL_SITE = https://github.com/rockdaboot/libpsl/releases/download/$(LIBPSL_VERSION)
> > +LIBPSL_INSTALL_STAGING = YES
> > +LIBPSL_DEPENDENCIES = host-pkgconf
> > +LIBPSL_LICENSE = MIT
> > +LIBPSL_LICENSE_FILES = COPYING
> 
>  From README.md:
> 
> src/psl-make-dafsa and src/lookup_string_in_fixed_set.c are licensed under the
> term written in src/LICENSE.chromium.
> 
> So that should be included in LICENSE and LICENSE_FILES.

Aye, good catch. The contents of src/LICENSE.chromium seem to be new BSD, with
some ?placeholder? text replacing things like ?the copyright holder? replaced
with ?Google Inc.? so I'll add ?BSD-3-Clause? to the LICENSE variable.

> > +LIBPSL_CONF_OPTS = -Ddocs=false
> > +
> > +ifeq ($(BR2_PACKAGE_ICU),y)
> > +LIBPSL_CONF_OPTS += -Druntime=libicu -Dbuiltin=libicu
> > +LIBPSL_DEPENDENCIES += icu
> > +else
> > +ifeq ($(BR2_PACKAGE_LIBIDN2),y)
> 
>  With
> 
> else ifeq ($(BR2_PACKAGE_LIBIDN2),y)
> 
> you only need one endif at the end.

Ah, nice, thanks for the tip.

>  Also, since it's possible that all three are selected, we need to think a bit
> about the priorities. Preferring libidn2 over libidn is quite obvious, but about
> ICU I'm not so sure if it should be preferred over libidn2. In the select
> statement in Config.in libidn2 should clearly be preferred because it's much
> smaller. If ICU is selected anyway, that doesn't matter of course. So, is there
> any specific reason to prefer ICU over libidn2? I.e., does ICU offer more
> features? If it makes no difference either way, I think we should prefer libidn2
> over ICU to match the select in Config.in.

AFAIU libidn2 has all the functionality needed by libpsl. Checking libpsl's
Meson build config file, it checks for libidn2, then ICU, then libidn, so
let's change the order so we do it in the same way.

As a related note: it is interesting that libpsl can be built against ICU
because it is possible to have a configuration that needs ICU (as a dependency
for WPE WebKit, for example) without any other package needing libidn/libidn2.
So that's neat :)

Cheers,
-Adrian

> > +LIBPSL_CONF_OPTS += -Druntime=libidn2 -Dbuiltin=libidn2
> > +LIBPSL_DEPENDENCIES += libidn2
> > +else
> > +LIBPSL_CONF_OPTS += -Druntime=libidn -Dbuiltin=libidn
> > +LIBPSL_DEPENDENCIES += libidn
> > +endif
> > +endif
> > +
> > +$(eval $(meson-package))
> > 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20210520/498de55d/attachment.asc>

^ permalink raw reply	[flat|nested] 17+ messages in thread
* [Buildroot] [PATCH v2 0/2] Update to latest libsoup2
  2021-05-19 21:26 [Buildroot] [PATCH 0/2] Update to latest libsoup2 Adrian Perez de Castro
  2021-05-19 21:26 ` [Buildroot] [PATCH 1/2] package/libpsl: new package Adrian Perez de Castro
  2021-05-19 21:26 ` [Buildroot] [PATCH 2/2] package/libsoup: bump to version 2.66.5 Adrian Perez de Castro
@ 2021-05-20 11:09 ` Adrian Perez de Castro
  2021-05-20 11:09   ` [Buildroot] [PATCH v2 1/2] package/libpsl: new package Adrian Perez de Castro
                     ` (2 more replies)
  2 siblings, 3 replies; 17+ messages in thread
From: Adrian Perez de Castro @ 2021-05-20 11:09 UTC (permalink / raw)
  To: buildroot

Hello all,

While working on the WebKit package updates the last days I noticed that the
version of libsoup2 in Buildroot is a tad old, and it seemed fitting to submit
a patch set for updating it. Recent versions have a new dependency on libpsl,
so a new package for it is added as well.

Cheers,
-Adrian

Adrian Perez de Castro (2):
  package/libpsl: new package
  package/libsoup: bump to version 2.66.5

 DEVELOPERS                                    |  1 +
 package/Config.in                             |  1 +
 package/libpsl/Config.in                      |  7 +++++
 package/libpsl/libpsl.hash                    |  6 +++++
 package/libpsl/libpsl.mk                      | 27 +++++++++++++++++++
 .../0001-Revert-tld-parser-use-Python-3.patch | 27 -------------------
 package/libsoup/Config.in                     |  1 +
 package/libsoup/libsoup.hash                  |  4 +--
 package/libsoup/libsoup.mk                    | 20 +++++++-------
 9 files changed, 55 insertions(+), 39 deletions(-)
 create mode 100644 package/libpsl/Config.in
 create mode 100644 package/libpsl/libpsl.hash
 create mode 100644 package/libpsl/libpsl.mk
 delete mode 100644 package/libsoup/0001-Revert-tld-parser-use-Python-3.patch

-- 
2.31.1

^ permalink raw reply	[flat|nested] 17+ messages in thread
* [Buildroot] [PATCH v2 1/2] package/libpsl: new package
  2021-05-20 11:09 ` [Buildroot] [PATCH v2 0/2] Update to latest libsoup2 Adrian Perez de Castro
@ 2021-05-20 11:09   ` Adrian Perez de Castro
  2021-05-21 10:27     ` Adrian Perez de Castro
  2021-05-20 11:09   ` [Buildroot] [PATCH v2 2/2] package/libsoup: bump to version 2.66.5 Adrian Perez de Castro
  2021-05-21 10:37   ` [Buildroot] [PATCH v3 0/2] Update to latest libsoup2 Adrian Perez de Castro
  2 siblings, 1 reply; 17+ messages in thread
From: Adrian Perez de Castro @ 2021-05-20 11:09 UTC (permalink / raw)
  To: buildroot

Package libpsl is a new non-optional dependency of libsoup.

Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
---
Changes v1 -> v2:
  - Make sure at least libidn2 is always selected as fallback (suggested
    by Arnout).
  - Add upstream URL (suggested by Arnout).
  - Switch to sha256 hashes (suggested by Arnout).
  - Add license file hashes and add missing license (suggested by Arnout).
  - Check for libraries in the same order as libpsl's Meson build files:
    libidn2, icu, then libidn.

Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
---
 DEVELOPERS                 |  1 +
 package/Config.in          |  1 +
 package/libpsl/Config.in   |  7 +++++++
 package/libpsl/libpsl.hash |  6 ++++++
 package/libpsl/libpsl.mk   | 27 +++++++++++++++++++++++++++
 5 files changed, 42 insertions(+)
 create mode 100644 package/libpsl/Config.in
 create mode 100644 package/libpsl/libpsl.hash
 create mode 100644 package/libpsl/libpsl.mk

diff --git a/DEVELOPERS b/DEVELOPERS
index a90ad1c354..4286ca5baf 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -35,6 +35,7 @@ F:	package/bubblewrap/
 F:	package/cage/
 F:	package/cog/
 F:	package/libepoxy/
+F:	package/libpsl/
 F:	package/libwpe/
 F:	package/webkitgtk/
 F:	package/wlroots/
diff --git a/package/Config.in b/package/Config.in
index 82b28d2835..eaa30ea161 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1788,6 +1788,7 @@ menu "Networking"
 	source "package/libpagekite/Config.in"
 	source "package/libpcap/Config.in"
 	source "package/libpjsip/Config.in"
+	source "package/libpsl/Config.in"
 	source "package/librelp/Config.in"
 	source "package/librsync/Config.in"
 	source "package/libshairplay/Config.in"
diff --git a/package/libpsl/Config.in b/package/libpsl/Config.in
new file mode 100644
index 0000000000..26fcb091ed
--- /dev/null
+++ b/package/libpsl/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_LIBPSL
+	bool "libpsl"
+	select BR2_PACKAGE_LIBIDN2 if !BR2_PACKAGE_ICU && !BR2_PACKAGE_LIBIDN
+	help
+	  C library to handle the Public Suffix List of TLDs.
+
+	  https://github.com/rockdaboot/libpsl
diff --git a/package/libpsl/libpsl.hash b/package/libpsl/libpsl.hash
new file mode 100644
index 0000000000..552935e9ec
--- /dev/null
+++ b/package/libpsl/libpsl.hash
@@ -0,0 +1,6 @@
+# Locally generated
+sha256  ac6ce1e1fbd4d0254c4ddb9d37f1fa99dec83619c1253328155206b896210d4c  libpsl-0.21.1.tar.gz
+
+# Hashes for license files:
+sha256  7903413e7aa0bbcb77aa19150a3f1034edc0a760cff174f9a53efe4de6f056a4  COPYING
+sha256  1d7f52747a9169751cdf2641a8299c0098e9ecdf9429296ffd55bdb14c9ed5b3  src/LICENSE.chromium
diff --git a/package/libpsl/libpsl.mk b/package/libpsl/libpsl.mk
new file mode 100644
index 0000000000..a870cffae5
--- /dev/null
+++ b/package/libpsl/libpsl.mk
@@ -0,0 +1,27 @@
+################################################################################
+#
+# libpsl
+#
+################################################################################
+
+LIBPSL_VERSION = 0.21.1
+LIBPSL_SITE = https://github.com/rockdaboot/libpsl/releases/download/$(LIBPSL_VERSION)
+LIBPSL_INSTALL_STAGING = YES
+LIBPSL_DEPENDENCIES = host-pkgconf
+LIBPSL_LICENSE = MIT, BSD-3-Clause
+LIBPSL_LICENSE_FILES = COPYING src/LICENSE.chromium
+LIBPSL_CONF_OPTS = -Ddocs=false
+
+# The order of checks is the same as done by libpsl when configured.
+ifeq ($(BR2_PACKAGE_LIBIDN2),y)
+LIBPSL_CONF_OPTS += -Druntime=libidn2 -Dbuiltin=libidn2
+LIBPSL_DEPENDENCIES += libidn2
+else ifeq ($(BR2_PACKAGE_ICU),y)
+LIBPSL_CONF_OPTS += -Druntime=libicu -Dbuiltin=libicu
+LIBPSL_DEPENDENCIES += icu
+else
+LIBPSL_CONF_OPTS += -Druntime=libidn -Dbuiltin=libidn
+LIBPSL_DEPENDENCIES += libidn
+endif
+
+$(eval $(meson-package))
-- 
2.31.1

^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [Buildroot] [PATCH v2 2/2] package/libsoup: bump to version 2.66.5
  2021-05-20 11:09 ` [Buildroot] [PATCH v2 0/2] Update to latest libsoup2 Adrian Perez de Castro
  2021-05-20 11:09   ` [Buildroot] [PATCH v2 1/2] package/libpsl: new package Adrian Perez de Castro
@ 2021-05-20 11:09   ` Adrian Perez de Castro
  2021-05-21 10:37   ` [Buildroot] [PATCH v3 0/2] Update to latest libsoup2 Adrian Perez de Castro
  2 siblings, 0 replies; 17+ messages in thread
From: Adrian Perez de Castro @ 2021-05-20 11:09 UTC (permalink / raw)
  To: buildroot

Change libsoup to version 2.66.5, which introduces many fixes. This
needs adding the libpsl dependency, and switching over to Meson as the
autotools based build system is no more. The existing patch is not
needed anymore.

Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
---
Changes v1 -> v2:
  - None.
---
 .../0001-Revert-tld-parser-use-Python-3.patch | 27 -------------------
 package/libsoup/Config.in                     |  1 +
 package/libsoup/libsoup.hash                  |  4 +--
 package/libsoup/libsoup.mk                    | 20 +++++++-------
 4 files changed, 13 insertions(+), 39 deletions(-)
 delete mode 100644 package/libsoup/0001-Revert-tld-parser-use-Python-3.patch

diff --git a/package/libsoup/0001-Revert-tld-parser-use-Python-3.patch b/package/libsoup/0001-Revert-tld-parser-use-Python-3.patch
deleted file mode 100644
index c27ee986c6..0000000000
--- a/package/libsoup/0001-Revert-tld-parser-use-Python-3.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 015926c80fa3e9704f05cbc1ad17f0a877f8de09 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-Date: Sat, 1 Sep 2018 15:39:04 +0200
-Subject: [PATCH] Revert "tld-parser: use Python 3"
-
-This reverts commit 4b924e573da307436169d5ef7e04c0ab85b36ef9. The
-script runs just fine with Python 2.x, there is no reason to enforce
-using Python 3.x.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
----
- libsoup/tld-parser.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libsoup/tld-parser.py b/libsoup/tld-parser.py
-index a743471a..5d9d2ba5 100755
---- a/libsoup/tld-parser.py
-+++ b/libsoup/tld-parser.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python3
-+#!/usr/bin/env python
- 
- # Generate tld rules
- # Copyright (C) 2012 Red Hat, Inc.
--- 
-2.14.4
-
diff --git a/package/libsoup/Config.in b/package/libsoup/Config.in
index f6f8fde968..47adfb33f2 100644
--- a/package/libsoup/Config.in
+++ b/package/libsoup/Config.in
@@ -5,6 +5,7 @@ config BR2_PACKAGE_LIBSOUP
 	depends on BR2_USE_MMU # glib2
 	select BR2_PACKAGE_LIBXML2
 	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_LIBPSL
 	select BR2_PACKAGE_SQLITE
 	help
 	  libsoup is an HTTP client/server library. It uses GObject
diff --git a/package/libsoup/libsoup.hash b/package/libsoup/libsoup.hash
index 666bbc278b..3b9009884d 100644
--- a/package/libsoup/libsoup.hash
+++ b/package/libsoup/libsoup.hash
@@ -1,4 +1,4 @@
-# From https://ftp.gnome.org/pub/GNOME/sources/libsoup/2.62/libsoup-2.62.3.sha256sum
-sha256	d312ade547495c2093ff8bda61f9b9727a98cfdae339f3263277dd39c0451172  libsoup-2.62.3.tar.xz
+# From https://ftp.gnome.org/pub/GNOME/sources/libsoup/2.66/libsoup-2.66.5.sha256sum
+sha256  ee43be1485bd95b686236b1e0043ec6edb761a538616c9c63004d7d1979bb139  libsoup-2.66.5.tar.xz
 # Locally calculated
 sha256  b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c  COPYING
diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk
index 44808225ea..1617940c8f 100644
--- a/package/libsoup/libsoup.mk
+++ b/package/libsoup/libsoup.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-LIBSOUP_VERSION_MAJOR = 2.62
-LIBSOUP_VERSION = $(LIBSOUP_VERSION_MAJOR).3
+LIBSOUP_VERSION_MAJOR = 2.66
+LIBSOUP_VERSION = $(LIBSOUP_VERSION_MAJOR).5
 LIBSOUP_SOURCE = libsoup-$(LIBSOUP_VERSION).tar.xz
 LIBSOUP_SITE = http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_VERSION_MAJOR)
 LIBSOUP_LICENSE = LGPL-2.0+
@@ -13,27 +13,27 @@ LIBSOUP_LICENSE_FILES = COPYING
 LIBSOUP_CPE_ID_VENDOR = gnome
 LIBSOUP_INSTALL_STAGING = YES
 LIBSOUP_CONF_ENV = ac_cv_path_GLIB_GENMARSHAL=$(LIBGLIB2_HOST_BINARY)
-LIBSOUP_CONF_OPTS = --disable-glibtest --enable-vala=no --with-gssapi=no
+LIBSOUP_CONF_OPTS = -Dtests=false -Dvapi=false -Dgssapi=false
 LIBSOUP_DEPENDENCIES = host-pkgconf host-libglib2 \
-	libglib2 libxml2 sqlite host-intltool
+	libglib2 libpsl libxml2 sqlite host-intltool
 
 ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
-LIBSOUP_CONF_OPTS += --with-introspection
+LIBSOUP_CONF_OPTS += -Dintrospection=true
 LIBSOUP_DEPENDENCIES += gobject-introspection
 else
-LIBSOUP_CONF_OPTS += --without-introspection
+LIBSOUP_CONF_OPTS += -Dintrospection=false
 endif
 
 ifeq ($(BR2_PACKAGE_LIBSOUP_GNOME),y)
-LIBSOUP_CONF_OPTS += --with-gnome
+LIBSOUP_CONF_OPTS += -Dgnome=true
 else
-LIBSOUP_CONF_OPTS += --without-gnome
+LIBSOUP_CONF_OPTS += -Dgnome=false
 endif
 
 ifeq ($(BR2_PACKAGE_LIBSOUP_SSL),y)
 LIBSOUP_DEPENDENCIES += glib-networking
 else
-LIBSOUP_CONF_OPTS += --disable-tls-check
+LIBSOUP_CONF_OPTS += -Dtls_check=false
 endif
 
-$(eval $(autotools-package))
+$(eval $(meson-package))
-- 
2.31.1

^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [Buildroot] [PATCH 1/2] package/libpsl: new package
  2021-05-20 10:49     ` Adrian Perez de Castro
@ 2021-05-20 11:10       ` Arnout Vandecappelle
  2021-05-20 11:25         ` Adrian Perez de Castro
  0 siblings, 1 reply; 17+ messages in thread
From: Arnout Vandecappelle @ 2021-05-20 11:10 UTC (permalink / raw)
  To: buildroot



On 20/05/2021 12:49, Adrian Perez de Castro wrote:
> As a related note: it is interesting that libpsl can be built against ICU
> because it is possible to have a configuration that needs ICU (as a dependency
> for WPE WebKit, for example) without any other package needing libidn/libidn2.
> So that's neat :)

 libidn2 is so tiny (or rather, ICU is so huge) that it doesn't matter much IMHO.

 Regards,
 Arnout

^ permalink raw reply	[flat|nested] 17+ messages in thread
* [Buildroot] [PATCH 1/2] package/libpsl: new package
  2021-05-20 11:10       ` Arnout Vandecappelle
@ 2021-05-20 11:25         ` Adrian Perez de Castro
  0 siblings, 0 replies; 17+ messages in thread
From: Adrian Perez de Castro @ 2021-05-20 11:25 UTC (permalink / raw)
  To: buildroot

On Thu, 20 May 2021 13:10:43 +0200 Arnout Vandecappelle <arnout@mind.be> wrote:
> 
> 
> On 20/05/2021 12:49, Adrian Perez de Castro wrote:
> > As a related note: it is interesting that libpsl can be built against ICU
> > because it is possible to have a configuration that needs ICU (as a dependency
> > for WPE WebKit, for example) without any other package needing libidn/libidn2.
> > So that's neat :)
> 
>  libidn2 is so tiny (or rather, ICU is so huge) that it doesn't matter much IMHO.

True, libidn2 is tiny in comparison. Anyway, with v2 of the patch set I
changed the order of checks to prefer libidn2 if it is selected, which
matches the preference used by the build system :)

Cheers,
-Adrian
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20210520/e3f65d12/attachment.asc>

^ permalink raw reply	[flat|nested] 17+ messages in thread
* [Buildroot] [PATCH v2 1/2] package/libpsl: new package
  2021-05-20 11:09   ` [Buildroot] [PATCH v2 1/2] package/libpsl: new package Adrian Perez de Castro
@ 2021-05-21 10:27     ` Adrian Perez de Castro
  0 siblings, 0 replies; 17+ messages in thread
From: Adrian Perez de Castro @ 2021-05-21 10:27 UTC (permalink / raw)
  To: buildroot

Hi there,

On Thu, 20 May 2021 14:09:25 +0300 Adrian Perez de Castro <aperez@igalia.com> wrote:
> Package libpsl is a new non-optional dependency of libsoup.
> 
> Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
> ---
> Changes v1 -> v2:
>   - Make sure at least libidn2 is always selected as fallback (suggested
>     by Arnout).
>   - Add upstream URL (suggested by Arnout).
>   - Switch to sha256 hashes (suggested by Arnout).
>   - Add license file hashes and add missing license (suggested by Arnout).
>   - Check for libraries in the same order as libpsl's Meson build files:
>     libidn2, icu, then libidn.
> 
> Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
> ---
>  DEVELOPERS                 |  1 +
>  package/Config.in          |  1 +
>  package/libpsl/Config.in   |  7 +++++++
>  package/libpsl/libpsl.hash |  6 ++++++
>  package/libpsl/libpsl.mk   | 27 +++++++++++++++++++++++++++
>  5 files changed, 42 insertions(+)
>  create mode 100644 package/libpsl/Config.in
>  create mode 100644 package/libpsl/libpsl.hash
>  create mode 100644 package/libpsl/libpsl.mk
> 
> diff --git a/DEVELOPERS b/DEVELOPERS
> index a90ad1c354..4286ca5baf 100644
> --- a/DEVELOPERS
> +++ b/DEVELOPERS
> @@ -35,6 +35,7 @@ F:	package/bubblewrap/
>  F:	package/cage/
>  F:	package/cog/
>  F:	package/libepoxy/
> +F:	package/libpsl/
>  F:	package/libwpe/
>  F:	package/webkitgtk/
>  F:	package/wlroots/
> diff --git a/package/Config.in b/package/Config.in
> index 82b28d2835..eaa30ea161 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -1788,6 +1788,7 @@ menu "Networking"
>  	source "package/libpagekite/Config.in"
>  	source "package/libpcap/Config.in"
>  	source "package/libpjsip/Config.in"
> +	source "package/libpsl/Config.in"
>  	source "package/librelp/Config.in"
>  	source "package/librsync/Config.in"
>  	source "package/libshairplay/Config.in"
> diff --git a/package/libpsl/Config.in b/package/libpsl/Config.in
> new file mode 100644
> index 0000000000..26fcb091ed
> --- /dev/null
> +++ b/package/libpsl/Config.in
> @@ -0,0 +1,7 @@
> +config BR2_PACKAGE_LIBPSL
> +	bool "libpsl"
> +	select BR2_PACKAGE_LIBIDN2 if !BR2_PACKAGE_ICU && !BR2_PACKAGE_LIBIDN

So it turns out that so far I had been only testing builds with ICU (because
WebnKit!) and today I had the brilliant idea of trying to make a build against
libidn2 for the sake of trying... it turns out that libunistring is *also*
needed by libpsl when building against libidn2/libidn.

I will need to add here something like this:

  select BR2_PACKAGE_LIBUNISTRING if !BR2_PACKAGE_ICU

> +	help
> +	  C library to handle the Public Suffix List of TLDs.
> +
> +	  https://github.com/rockdaboot/libpsl
> diff --git a/package/libpsl/libpsl.hash b/package/libpsl/libpsl.hash
> new file mode 100644
> index 0000000000..552935e9ec
> --- /dev/null
> +++ b/package/libpsl/libpsl.hash
> @@ -0,0 +1,6 @@
> +# Locally generated
> +sha256  ac6ce1e1fbd4d0254c4ddb9d37f1fa99dec83619c1253328155206b896210d4c  libpsl-0.21.1.tar.gz
> +
> +# Hashes for license files:
> +sha256  7903413e7aa0bbcb77aa19150a3f1034edc0a760cff174f9a53efe4de6f056a4  COPYING
> +sha256  1d7f52747a9169751cdf2641a8299c0098e9ecdf9429296ffd55bdb14c9ed5b3  src/LICENSE.chromium
> diff --git a/package/libpsl/libpsl.mk b/package/libpsl/libpsl.mk
> new file mode 100644
> index 0000000000..a870cffae5
> --- /dev/null
> +++ b/package/libpsl/libpsl.mk
> @@ -0,0 +1,27 @@
> +################################################################################
> +#
> +# libpsl
> +#
> +################################################################################
> +
> +LIBPSL_VERSION = 0.21.1
> +LIBPSL_SITE = https://github.com/rockdaboot/libpsl/releases/download/$(LIBPSL_VERSION)
> +LIBPSL_INSTALL_STAGING = YES
> +LIBPSL_DEPENDENCIES = host-pkgconf
> +LIBPSL_LICENSE = MIT, BSD-3-Clause
> +LIBPSL_LICENSE_FILES = COPYING src/LICENSE.chromium
> +LIBPSL_CONF_OPTS = -Ddocs=false
> +
> +# The order of checks is the same as done by libpsl when configured.
> +ifeq ($(BR2_PACKAGE_LIBIDN2),y)

And here turn this into:

  ifeq ($(BR2_PACKAGE_LIBIDN2)$(BR2_PACKAGE_LIBUNISTRING),yy)

...so expect a v3 of the patch set soon :)

Cheers,
-Adrian

> +LIBPSL_CONF_OPTS += -Druntime=libidn2 -Dbuiltin=libidn2
> +LIBPSL_DEPENDENCIES += libidn2
> +else ifeq ($(BR2_PACKAGE_ICU),y)
> +LIBPSL_CONF_OPTS += -Druntime=libicu -Dbuiltin=libicu
> +LIBPSL_DEPENDENCIES += icu
> +else
> +LIBPSL_CONF_OPTS += -Druntime=libidn -Dbuiltin=libidn
> +LIBPSL_DEPENDENCIES += libidn
> +endif
> +
> +$(eval $(meson-package))
> -- 
> 2.31.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20210521/2a943843/attachment.asc>

^ permalink raw reply	[flat|nested] 17+ messages in thread
* [Buildroot] [PATCH v3 0/2] Update to latest libsoup2
  2021-05-20 11:09 ` [Buildroot] [PATCH v2 0/2] Update to latest libsoup2 Adrian Perez de Castro
  2021-05-20 11:09   ` [Buildroot] [PATCH v2 1/2] package/libpsl: new package Adrian Perez de Castro
  2021-05-20 11:09   ` [Buildroot] [PATCH v2 2/2] package/libsoup: bump to version 2.66.5 Adrian Perez de Castro
@ 2021-05-21 10:37   ` Adrian Perez de Castro
  2021-05-21 10:37     ` [Buildroot] [PATCH v3 1/2] package/libpsl: new package Adrian Perez de Castro
                       ` (2 more replies)
  2 siblings, 3 replies; 17+ messages in thread
From: Adrian Perez de Castro @ 2021-05-21 10:37 UTC (permalink / raw)
  To: buildroot

Hello all,

While working on the WebKit package updates the last days I noticed that the
version of libsoup2 in Buildroot is a tad old, and it seemed fitting to submit
a patch set for updating it. Recent versions have a new dependency on libpsl,
so a new package for it is added as well.

Cheers,
-Adrian

Adrian Perez de Castro (2):
  package/libpsl: new package
  package/libsoup: bump to version 2.66.5

 DEVELOPERS                                    |  1 +
 package/Config.in                             |  1 +
 package/libpsl/Config.in                      |  8 ++++++
 package/libpsl/libpsl.hash                    |  6 +++++
 package/libpsl/libpsl.mk                      | 27 +++++++++++++++++++
 .../0001-Revert-tld-parser-use-Python-3.patch | 27 -------------------
 package/libsoup/Config.in                     |  1 +
 package/libsoup/libsoup.hash                  |  4 +--
 package/libsoup/libsoup.mk                    | 20 +++++++-------
 9 files changed, 56 insertions(+), 39 deletions(-)
 create mode 100644 package/libpsl/Config.in
 create mode 100644 package/libpsl/libpsl.hash
 create mode 100644 package/libpsl/libpsl.mk
 delete mode 100644 package/libsoup/0001-Revert-tld-parser-use-Python-3.patch

-- 
2.31.1

^ permalink raw reply	[flat|nested] 17+ messages in thread
* [Buildroot] [PATCH v3 1/2] package/libpsl: new package
  2021-05-21 10:37   ` [Buildroot] [PATCH v3 0/2] Update to latest libsoup2 Adrian Perez de Castro
@ 2021-05-21 10:37     ` Adrian Perez de Castro
  2021-05-24 13:26       ` Yann E. MORIN
  2021-05-21 10:37     ` [Buildroot] [PATCH v3 2/2] package/libsoup: bump to version 2.66.5 Adrian Perez de Castro
  2021-05-24 13:23     ` [Buildroot] [PATCH v3 0/2] Update to latest libsoup2 Yann E. MORIN
  2 siblings, 1 reply; 17+ messages in thread
From: Adrian Perez de Castro @ 2021-05-21 10:37 UTC (permalink / raw)
  To: buildroot

Package libpsl is a new non-optional dependency of libsoup.

Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
---
Changes v2 -> v3:
  - Also select libunistring if ICU is not selected, as it is needed as
    well when building against libidn/libidn2.
---
Changes v1 -> v2:
  - Make sure at least libidn2 is always selected as fallback (suggested
    by Arnout).
  - Add upstream URL (suggested by Arnout).
  - Switch to sha256 hashes (suggested by Arnout).
  - Add license file hashes and add missing license (suggested by Arnout).
  - Check for libraries in the same order as libpsl's Meson build files:
    libidn2, icu, then libidn.

fixup! package/libpsl: new package

Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
---
 DEVELOPERS                 |  1 +
 package/Config.in          |  1 +
 package/libpsl/Config.in   |  8 ++++++++
 package/libpsl/libpsl.hash |  6 ++++++
 package/libpsl/libpsl.mk   | 27 +++++++++++++++++++++++++++
 5 files changed, 43 insertions(+)
 create mode 100644 package/libpsl/Config.in
 create mode 100644 package/libpsl/libpsl.hash
 create mode 100644 package/libpsl/libpsl.mk

diff --git a/DEVELOPERS b/DEVELOPERS
index a90ad1c354..4286ca5baf 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -35,6 +35,7 @@ F:	package/bubblewrap/
 F:	package/cage/
 F:	package/cog/
 F:	package/libepoxy/
+F:	package/libpsl/
 F:	package/libwpe/
 F:	package/webkitgtk/
 F:	package/wlroots/
diff --git a/package/Config.in b/package/Config.in
index 82b28d2835..eaa30ea161 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1788,6 +1788,7 @@ menu "Networking"
 	source "package/libpagekite/Config.in"
 	source "package/libpcap/Config.in"
 	source "package/libpjsip/Config.in"
+	source "package/libpsl/Config.in"
 	source "package/librelp/Config.in"
 	source "package/librsync/Config.in"
 	source "package/libshairplay/Config.in"
diff --git a/package/libpsl/Config.in b/package/libpsl/Config.in
new file mode 100644
index 0000000000..dd484799e7
--- /dev/null
+++ b/package/libpsl/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_LIBPSL
+	bool "libpsl"
+	select BR2_PACKAGE_LIBIDN2 if !BR2_PACKAGE_ICU && !BR2_PACKAGE_LIBIDN
+	select BR2_PACKAGE_LIBUNISTRING if !BR2_PACKAGE_ICU
+	help
+	  C library to handle the Public Suffix List of TLDs.
+
+	  https://github.com/rockdaboot/libpsl
diff --git a/package/libpsl/libpsl.hash b/package/libpsl/libpsl.hash
new file mode 100644
index 0000000000..552935e9ec
--- /dev/null
+++ b/package/libpsl/libpsl.hash
@@ -0,0 +1,6 @@
+# Locally generated
+sha256  ac6ce1e1fbd4d0254c4ddb9d37f1fa99dec83619c1253328155206b896210d4c  libpsl-0.21.1.tar.gz
+
+# Hashes for license files:
+sha256  7903413e7aa0bbcb77aa19150a3f1034edc0a760cff174f9a53efe4de6f056a4  COPYING
+sha256  1d7f52747a9169751cdf2641a8299c0098e9ecdf9429296ffd55bdb14c9ed5b3  src/LICENSE.chromium
diff --git a/package/libpsl/libpsl.mk b/package/libpsl/libpsl.mk
new file mode 100644
index 0000000000..1abdc6b208
--- /dev/null
+++ b/package/libpsl/libpsl.mk
@@ -0,0 +1,27 @@
+################################################################################
+#
+# libpsl
+#
+################################################################################
+
+LIBPSL_VERSION = 0.21.1
+LIBPSL_SITE = https://github.com/rockdaboot/libpsl/releases/download/$(LIBPSL_VERSION)
+LIBPSL_INSTALL_STAGING = YES
+LIBPSL_DEPENDENCIES = host-pkgconf
+LIBPSL_LICENSE = MIT, BSD-3-Clause
+LIBPSL_LICENSE_FILES = COPYING src/LICENSE.chromium
+LIBPSL_CONF_OPTS = -Ddocs=false
+
+# The order of checks is the same as done by libpsl when configured.
+ifeq ($(BR2_PACKAGE_LIBIDN2)$(BR2_PACKAGE_LIBUNISTRING),yy)
+LIBPSL_CONF_OPTS += -Druntime=libidn2 -Dbuiltin=libidn2
+LIBPSL_DEPENDENCIES += libidn2 libunistring
+else ifeq ($(BR2_PACKAGE_ICU),y)
+LIBPSL_CONF_OPTS += -Druntime=libicu -Dbuiltin=libicu
+LIBPSL_DEPENDENCIES += icu
+else
+LIBPSL_CONF_OPTS += -Druntime=libidn -Dbuiltin=libidn
+LIBPSL_DEPENDENCIES += libidn libunistring
+endif
+
+$(eval $(meson-package))
-- 
2.31.1

^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [Buildroot] [PATCH v3 2/2] package/libsoup: bump to version 2.66.5
  2021-05-21 10:37   ` [Buildroot] [PATCH v3 0/2] Update to latest libsoup2 Adrian Perez de Castro
  2021-05-21 10:37     ` [Buildroot] [PATCH v3 1/2] package/libpsl: new package Adrian Perez de Castro
@ 2021-05-21 10:37     ` Adrian Perez de Castro
  2021-05-24 13:23     ` [Buildroot] [PATCH v3 0/2] Update to latest libsoup2 Yann E. MORIN
  2 siblings, 0 replies; 17+ messages in thread
From: Adrian Perez de Castro @ 2021-05-21 10:37 UTC (permalink / raw)
  To: buildroot

Change libsoup to version 2.66.5, which introduces many fixes. This
needs adding the libpsl dependency, and switching over to Meson as the
autotools based build system is no more. The existing patch is not
needed anymore.

Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
---
Changes v1 -> v2 -> v3:
  - None.
---
 .../0001-Revert-tld-parser-use-Python-3.patch | 27 -------------------
 package/libsoup/Config.in                     |  1 +
 package/libsoup/libsoup.hash                  |  4 +--
 package/libsoup/libsoup.mk                    | 20 +++++++-------
 4 files changed, 13 insertions(+), 39 deletions(-)
 delete mode 100644 package/libsoup/0001-Revert-tld-parser-use-Python-3.patch

diff --git a/package/libsoup/0001-Revert-tld-parser-use-Python-3.patch b/package/libsoup/0001-Revert-tld-parser-use-Python-3.patch
deleted file mode 100644
index c27ee986c6..0000000000
--- a/package/libsoup/0001-Revert-tld-parser-use-Python-3.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 015926c80fa3e9704f05cbc1ad17f0a877f8de09 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-Date: Sat, 1 Sep 2018 15:39:04 +0200
-Subject: [PATCH] Revert "tld-parser: use Python 3"
-
-This reverts commit 4b924e573da307436169d5ef7e04c0ab85b36ef9. The
-script runs just fine with Python 2.x, there is no reason to enforce
-using Python 3.x.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
----
- libsoup/tld-parser.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libsoup/tld-parser.py b/libsoup/tld-parser.py
-index a743471a..5d9d2ba5 100755
---- a/libsoup/tld-parser.py
-+++ b/libsoup/tld-parser.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python3
-+#!/usr/bin/env python
- 
- # Generate tld rules
- # Copyright (C) 2012 Red Hat, Inc.
--- 
-2.14.4
-
diff --git a/package/libsoup/Config.in b/package/libsoup/Config.in
index f6f8fde968..47adfb33f2 100644
--- a/package/libsoup/Config.in
+++ b/package/libsoup/Config.in
@@ -5,6 +5,7 @@ config BR2_PACKAGE_LIBSOUP
 	depends on BR2_USE_MMU # glib2
 	select BR2_PACKAGE_LIBXML2
 	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_LIBPSL
 	select BR2_PACKAGE_SQLITE
 	help
 	  libsoup is an HTTP client/server library. It uses GObject
diff --git a/package/libsoup/libsoup.hash b/package/libsoup/libsoup.hash
index 666bbc278b..3b9009884d 100644
--- a/package/libsoup/libsoup.hash
+++ b/package/libsoup/libsoup.hash
@@ -1,4 +1,4 @@
-# From https://ftp.gnome.org/pub/GNOME/sources/libsoup/2.62/libsoup-2.62.3.sha256sum
-sha256	d312ade547495c2093ff8bda61f9b9727a98cfdae339f3263277dd39c0451172  libsoup-2.62.3.tar.xz
+# From https://ftp.gnome.org/pub/GNOME/sources/libsoup/2.66/libsoup-2.66.5.sha256sum
+sha256  ee43be1485bd95b686236b1e0043ec6edb761a538616c9c63004d7d1979bb139  libsoup-2.66.5.tar.xz
 # Locally calculated
 sha256  b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c  COPYING
diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk
index 44808225ea..1617940c8f 100644
--- a/package/libsoup/libsoup.mk
+++ b/package/libsoup/libsoup.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-LIBSOUP_VERSION_MAJOR = 2.62
-LIBSOUP_VERSION = $(LIBSOUP_VERSION_MAJOR).3
+LIBSOUP_VERSION_MAJOR = 2.66
+LIBSOUP_VERSION = $(LIBSOUP_VERSION_MAJOR).5
 LIBSOUP_SOURCE = libsoup-$(LIBSOUP_VERSION).tar.xz
 LIBSOUP_SITE = http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_VERSION_MAJOR)
 LIBSOUP_LICENSE = LGPL-2.0+
@@ -13,27 +13,27 @@ LIBSOUP_LICENSE_FILES = COPYING
 LIBSOUP_CPE_ID_VENDOR = gnome
 LIBSOUP_INSTALL_STAGING = YES
 LIBSOUP_CONF_ENV = ac_cv_path_GLIB_GENMARSHAL=$(LIBGLIB2_HOST_BINARY)
-LIBSOUP_CONF_OPTS = --disable-glibtest --enable-vala=no --with-gssapi=no
+LIBSOUP_CONF_OPTS = -Dtests=false -Dvapi=false -Dgssapi=false
 LIBSOUP_DEPENDENCIES = host-pkgconf host-libglib2 \
-	libglib2 libxml2 sqlite host-intltool
+	libglib2 libpsl libxml2 sqlite host-intltool
 
 ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
-LIBSOUP_CONF_OPTS += --with-introspection
+LIBSOUP_CONF_OPTS += -Dintrospection=true
 LIBSOUP_DEPENDENCIES += gobject-introspection
 else
-LIBSOUP_CONF_OPTS += --without-introspection
+LIBSOUP_CONF_OPTS += -Dintrospection=false
 endif
 
 ifeq ($(BR2_PACKAGE_LIBSOUP_GNOME),y)
-LIBSOUP_CONF_OPTS += --with-gnome
+LIBSOUP_CONF_OPTS += -Dgnome=true
 else
-LIBSOUP_CONF_OPTS += --without-gnome
+LIBSOUP_CONF_OPTS += -Dgnome=false
 endif
 
 ifeq ($(BR2_PACKAGE_LIBSOUP_SSL),y)
 LIBSOUP_DEPENDENCIES += glib-networking
 else
-LIBSOUP_CONF_OPTS += --disable-tls-check
+LIBSOUP_CONF_OPTS += -Dtls_check=false
 endif
 
-$(eval $(autotools-package))
+$(eval $(meson-package))
-- 
2.31.1

^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [Buildroot] [PATCH v3 0/2] Update to latest libsoup2
  2021-05-21 10:37   ` [Buildroot] [PATCH v3 0/2] Update to latest libsoup2 Adrian Perez de Castro
  2021-05-21 10:37     ` [Buildroot] [PATCH v3 1/2] package/libpsl: new package Adrian Perez de Castro
  2021-05-21 10:37     ` [Buildroot] [PATCH v3 2/2] package/libsoup: bump to version 2.66.5 Adrian Perez de Castro
@ 2021-05-24 13:23     ` Yann E. MORIN
  2 siblings, 0 replies; 17+ messages in thread
From: Yann E. MORIN @ 2021-05-24 13:23 UTC (permalink / raw)
  To: buildroot

Adrian, All,

On 2021-05-21 13:37 +0300, Adrian Perez de Castro spake thusly:
> Hello all,
> 
> While working on the WebKit package updates the last days I noticed that the
> version of libsoup2 in Buildroot is a tad old, and it seemed fitting to submit
> a patch set for updating it. Recent versions have a new dependency on libpsl,
> so a new package for it is added as well.
> 
> Cheers,
> -Adrian
> 
> Adrian Perez de Castro (2):
>   package/libpsl: new package
>   package/libsoup: bump to version 2.66.5

Series of two applied to next, thanks.

Regards,
Yann E. MORIN.

>  DEVELOPERS                                    |  1 +
>  package/Config.in                             |  1 +
>  package/libpsl/Config.in                      |  8 ++++++
>  package/libpsl/libpsl.hash                    |  6 +++++
>  package/libpsl/libpsl.mk                      | 27 +++++++++++++++++++
>  .../0001-Revert-tld-parser-use-Python-3.patch | 27 -------------------
>  package/libsoup/Config.in                     |  1 +
>  package/libsoup/libsoup.hash                  |  4 +--
>  package/libsoup/libsoup.mk                    | 20 +++++++-------
>  9 files changed, 56 insertions(+), 39 deletions(-)
>  create mode 100644 package/libpsl/Config.in
>  create mode 100644 package/libpsl/libpsl.hash
>  create mode 100644 package/libpsl/libpsl.mk
>  delete mode 100644 package/libsoup/0001-Revert-tld-parser-use-Python-3.patch
> 
> -- 
> 2.31.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

^ permalink raw reply	[flat|nested] 17+ messages in thread
* [Buildroot] [PATCH v3 1/2] package/libpsl: new package
  2021-05-21 10:37     ` [Buildroot] [PATCH v3 1/2] package/libpsl: new package Adrian Perez de Castro
@ 2021-05-24 13:26       ` Yann E. MORIN
  2021-05-24 14:17         ` Adrian Perez de Castro
  0 siblings, 1 reply; 17+ messages in thread
From: Yann E. MORIN @ 2021-05-24 13:26 UTC (permalink / raw)
  To: buildroot

Adrian, All,

On 2021-05-21 13:37 +0300, Adrian Perez de Castro spake thusly:
> Package libpsl is a new non-optional dependency of libsoup.
> 
> Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
> ---
> fixup! package/libpsl: new package

I like 'fixup!' too. :-)

> Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
> ---
[--SNIP--]
> diff --git a/package/libpsl/libpsl.hash b/package/libpsl/libpsl.hash
> new file mode 100644
> index 0000000000..552935e9ec
> --- /dev/null
> +++ b/package/libpsl/libpsl.hash
> @@ -0,0 +1,6 @@
> +# Locally generated
> +sha256  ac6ce1e1fbd4d0254c4ddb9d37f1fa99dec83619c1253328155206b896210d4c  libpsl-0.21.1.tar.gz
> +
> +# Hashes for license files:
> +sha256  7903413e7aa0bbcb77aa19150a3f1034edc0a760cff174f9a53efe4de6f056a4  COPYING
> +sha256  1d7f52747a9169751cdf2641a8299c0098e9ecdf9429296ffd55bdb14c9ed5b3  src/LICENSE.chromium
> diff --git a/package/libpsl/libpsl.mk b/package/libpsl/libpsl.mk
> new file mode 100644
> index 0000000000..1abdc6b208
> --- /dev/null
> +++ b/package/libpsl/libpsl.mk
> @@ -0,0 +1,27 @@
> +################################################################################
> +#
> +# libpsl
> +#
> +################################################################################
> +
> +LIBPSL_VERSION = 0.21.1
> +LIBPSL_SITE = https://github.com/rockdaboot/libpsl/releases/download/$(LIBPSL_VERSION)
> +LIBPSL_INSTALL_STAGING = YES
> +LIBPSL_DEPENDENCIES = host-pkgconf
> +LIBPSL_LICENSE = MIT, BSD-3-Clause
> +LIBPSL_LICENSE_FILES = COPYING src/LICENSE.chromium

Pet-peeve of mine: try and be consistent in variable ordering. ;-)

so I've done a bit of reordering, and Applied to next, thanks.

Regards,
Yann E. MORIN.

> +LIBPSL_CONF_OPTS = -Ddocs=false
> +
> +# The order of checks is the same as done by libpsl when configured.
> +ifeq ($(BR2_PACKAGE_LIBIDN2)$(BR2_PACKAGE_LIBUNISTRING),yy)
> +LIBPSL_CONF_OPTS += -Druntime=libidn2 -Dbuiltin=libidn2
> +LIBPSL_DEPENDENCIES += libidn2 libunistring
> +else ifeq ($(BR2_PACKAGE_ICU),y)
> +LIBPSL_CONF_OPTS += -Druntime=libicu -Dbuiltin=libicu
> +LIBPSL_DEPENDENCIES += icu
> +else
> +LIBPSL_CONF_OPTS += -Druntime=libidn -Dbuiltin=libidn
> +LIBPSL_DEPENDENCIES += libidn libunistring
> +endif
> +
> +$(eval $(meson-package))
> -- 
> 2.31.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

^ permalink raw reply	[flat|nested] 17+ messages in thread
* [Buildroot] [PATCH v3 1/2] package/libpsl: new package
  2021-05-24 13:26       ` Yann E. MORIN
@ 2021-05-24 14:17         ` Adrian Perez de Castro
  0 siblings, 0 replies; 17+ messages in thread
From: Adrian Perez de Castro @ 2021-05-24 14:17 UTC (permalink / raw)
  To: buildroot

On Mon, 24 May 2021 15:26:28 +0200 "Yann E. MORIN" <yann.morin.1998@free.fr> wrote:
> Adrian, All,
> 
> On 2021-05-21 13:37 +0300, Adrian Perez de Castro spake thusly:
> > Package libpsl is a new non-optional dependency of libsoup.
> > 
> > Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
> > ---
> > fixup! package/libpsl: new package
> 
> I like 'fixup!' too. :-)

Heh, a bit of a rebase slipped in the commit log. Sometimes it happens.
?\_(?)_/? 
 
> > Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
> > ---
> [--SNIP--]
> > diff --git a/package/libpsl/libpsl.hash b/package/libpsl/libpsl.hash
> > new file mode 100644
> > index 0000000000..552935e9ec
> > --- /dev/null
> > +++ b/package/libpsl/libpsl.hash
> > @@ -0,0 +1,6 @@
> > +# Locally generated
> > +sha256  ac6ce1e1fbd4d0254c4ddb9d37f1fa99dec83619c1253328155206b896210d4c  libpsl-0.21.1.tar.gz
> > +
> > +# Hashes for license files:
> > +sha256  7903413e7aa0bbcb77aa19150a3f1034edc0a760cff174f9a53efe4de6f056a4  COPYING
> > +sha256  1d7f52747a9169751cdf2641a8299c0098e9ecdf9429296ffd55bdb14c9ed5b3  src/LICENSE.chromium
> > diff --git a/package/libpsl/libpsl.mk b/package/libpsl/libpsl.mk
> > new file mode 100644
> > index 0000000000..1abdc6b208
> > --- /dev/null
> > +++ b/package/libpsl/libpsl.mk
> > @@ -0,0 +1,27 @@
> > +################################################################################
> > +#
> > +# libpsl
> > +#
> > +################################################################################
> > +
> > +LIBPSL_VERSION = 0.21.1
> > +LIBPSL_SITE = https://github.com/rockdaboot/libpsl/releases/download/$(LIBPSL_VERSION)
> > +LIBPSL_INSTALL_STAGING = YES
> > +LIBPSL_DEPENDENCIES = host-pkgconf
> > +LIBPSL_LICENSE = MIT, BSD-3-Clause
> > +LIBPSL_LICENSE_FILES = COPYING src/LICENSE.chromium
> 
> Pet-peeve of mine: try and be consistent in variable ordering. ;-)
> 
> so I've done a bit of reordering, and Applied to next, thanks.

Great, thank you!

Looking forward to the next release with an up-to-date libsoup.
-Adrian

> Regards,
> Yann E. MORIN.
> 
> > +LIBPSL_CONF_OPTS = -Ddocs=false
> > +
> > +# The order of checks is the same as done by libpsl when configured.
> > +ifeq ($(BR2_PACKAGE_LIBIDN2)$(BR2_PACKAGE_LIBUNISTRING),yy)
> > +LIBPSL_CONF_OPTS += -Druntime=libidn2 -Dbuiltin=libidn2
> > +LIBPSL_DEPENDENCIES += libidn2 libunistring
> > +else ifeq ($(BR2_PACKAGE_ICU),y)
> > +LIBPSL_CONF_OPTS += -Druntime=libicu -Dbuiltin=libicu
> > +LIBPSL_DEPENDENCIES += icu
> > +else
> > +LIBPSL_CONF_OPTS += -Druntime=libidn -Dbuiltin=libidn
> > +LIBPSL_DEPENDENCIES += libidn libunistring
> > +endif
> > +
> > +$(eval $(meson-package))
> > -- 
> > 2.31.1
> > 
> > _______________________________________________
> > buildroot mailing list
> > buildroot at busybox.net
> > http://lists.busybox.net/mailman/listinfo/buildroot
> 
> -- 
> .-----------------.--------------------.------------------.--------------------.
> |  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
> | +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
> | +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
> '------------------------------^-------^------------------^--------------------'
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20210524/e6a64957/attachment.asc>

^ permalink raw reply	[flat|nested] 17+ messages in thread
end of thread, other threads:[~2021-05-24 14:17 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-19 21:26 [Buildroot] [PATCH 0/2] Update to latest libsoup2 Adrian Perez de Castro
2021-05-19 21:26 ` [Buildroot] [PATCH 1/2] package/libpsl: new package Adrian Perez de Castro
2021-05-20  7:11   ` Arnout Vandecappelle
2021-05-20 10:49     ` Adrian Perez de Castro
2021-05-20 11:10       ` Arnout Vandecappelle
2021-05-20 11:25         ` Adrian Perez de Castro
2021-05-19 21:26 ` [Buildroot] [PATCH 2/2] package/libsoup: bump to version 2.66.5 Adrian Perez de Castro
2021-05-20 11:09 ` [Buildroot] [PATCH v2 0/2] Update to latest libsoup2 Adrian Perez de Castro
2021-05-20 11:09   ` [Buildroot] [PATCH v2 1/2] package/libpsl: new package Adrian Perez de Castro
2021-05-21 10:27     ` Adrian Perez de Castro
2021-05-20 11:09   ` [Buildroot] [PATCH v2 2/2] package/libsoup: bump to version 2.66.5 Adrian Perez de Castro
2021-05-21 10:37   ` [Buildroot] [PATCH v3 0/2] Update to latest libsoup2 Adrian Perez de Castro
2021-05-21 10:37     ` [Buildroot] [PATCH v3 1/2] package/libpsl: new package Adrian Perez de Castro
2021-05-24 13:26       ` Yann E. MORIN
2021-05-24 14:17         ` Adrian Perez de Castro
2021-05-21 10:37     ` [Buildroot] [PATCH v3 2/2] package/libsoup: bump to version 2.66.5 Adrian Perez de Castro
2021-05-24 13:23     ` [Buildroot] [PATCH v3 0/2] Update to latest libsoup2 Yann E. MORIN

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.