libsoup: version bump 2.62.2 -> 2.66.2

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

4 files changed, 43 insertions, 21 deletions

diff --git a/patches/libsoup-2.66.2/0001-meson-allow-enabling-gir-when-cross-compiling.patch b/patches/libsoup-2.66.2/0001-meson-allow-enabling-gir-when-cross-compiling.patch
new file mode 100644
index 000000000..5acb5bab9
--- /dev/null
+++ b/patches/libsoup-2.66.2/0001-meson-allow-enabling-gir-when-cross-compiling.patch
@@ -0,0 +1,22 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Thu, 8 Aug 2019 14:56:33 +0200
+Subject: [PATCH] meson: allow enabling gir when cross-compiling
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 89837c1553c6..759821019b29 100644
+--- a/meson.build
++++ b/meson.build
+@@ -290,7 +290,7 @@ enable_gnome = get_option('gnome') and host_machine.system() != 'windows'
+ # FIXME: once we start to require meson 0.49.0+ and gnome-introspection 1.58.1+
+ # the we can enable the introspection even for the static build. See
+ # https://github.com/mesonbuild/meson/pull/4478.
+-enable_introspection = get_option('introspection') and find_program('g-ir-scanner', required: false).found() and not meson.is_cross_build() and not is_static_library
++enable_introspection = get_option('introspection') and find_program('g-ir-scanner', required: false).found() and not is_static_library
+ 
+ ############
+ # Vala API #
diff --git a/patches/libsoup-2.66.2/series b/patches/libsoup-2.66.2/series
new file mode 100644
index 000000000..305ed6fe0
--- /dev/null
+++ b/patches/libsoup-2.66.2/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-meson-allow-enabling-gir-when-cross-compiling.patch
+# b5e8cd63bf616136df653d409ae9e0f9  - git-ptx-patches magic
diff --git a/rules/libsoup.in b/rules/libsoup.in
index 4bf71d532..afc8543e3 100644
--- a/rules/libsoup.in
+++ b/rules/libsoup.in
@@ -2,8 +2,10 @@
 
 config LIBSOUP
 	tristate
+	select HOST_MESON
 	select GLIB
 	select SQLITE
+	select LIBPSL
 	select LIBXML2
 	select LIBXML2_OUTPUT
 	select LIBXML2_SAX1
diff --git a/rules/libsoup.make b/rules/libsoup.make
index bd9b22ac7..a40ad7f58 100644
--- a/rules/libsoup.make
+++ b/rules/libsoup.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBSOUP) += libsoup
 #
 # Paths and names
 #
-LIBSOUP_VERSION	:= 2.62.2
-LIBSOUP_MD5	:= eaf99b04ac8968ed2b26f2509ba75584
+LIBSOUP_VERSION	:= 2.66.2
+LIBSOUP_MD5	:= 66c2ae89d6031b01337d78a2c57c75d5
 LIBSOUP		:= libsoup-$(LIBSOUP_VERSION)
 LIBSOUP_SUFFIX	:= tar.xz
 LIBSOUP_URL	:= http://ftp.gnome.org/pub/GNOME/sources/libsoup/$(basename $(LIBSOUP_VERSION))/$(LIBSOUP).$(LIBSOUP_SUFFIX)
@@ -28,27 +28,21 @@ LIBSOUP_LICENSE	:= LGPL-2.1-only
 # ----------------------------------------------------------------------------
 
 #
-# autoconf
+# meson
 #
-LIBSOUP_CONF_TOOL := autoconf
+LIBSOUP_CONF_TOOL := meson
 LIBSOUP_CONF_OPT := \
-	$(CROSS_AUTOCONF_USR) \
-	--enable-debug=minimum \
-	--disable-glibtest \
-	--disable-installed-tests \
-	--disable-always-build-tests \
-	--disable-nls \
-	--disable-gtk-doc \
-	--disable-gtk-doc-html \
-	--disable-gtk-doc-pdf \
-	--$(call ptx/endis, PTXCONF_LIBSOUP_INTROSPECTION)-introspection \
-	--disable-vala \
-	--disable-tls-check \
-	--disable-code-coverage \
-	--enable-more-warnings \
-	--without-gnome \
-	--without-apache-httpd \
-	--without-gssapi
+	$(CROSS_MESON_USR) \
+	-Dgssapi=false \
+	-Ddoc=false \
+	-Dgnome=true \
+	-Dvapi=false \
+	-Dintrospection=$(call ptx/truefalse, PTXCONF_LIBSOUP_INTROSPECTION) \
+	-Dkrb5_config= \
+	-Dntlm=false \
+	-Dntlm_auth=ntlm_auth \
+	-Dtests=false \
+	-Dtls_check=false
 
 # ----------------------------------------------------------------------------
 # Target-Install