Merge from bittboy/buildroot@db180c0

package/libsoup/0001-Revert-tld-parser-use-Python-3.patch

@@ -0,0 +1,27 @@
+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
+

package/libsoup/Config.in

@@ -0,0 +1,38 @@
+config BR2_PACKAGE_LIBSOUP
+	bool "libsoup"
+	depends on BR2_USE_WCHAR # glib2 and gnutls
+	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
+	depends on BR2_USE_MMU # glib2
+	select BR2_PACKAGE_LIBXML2
+	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_SQLITE
+	help
+	  libsoup is an HTTP client/server library. It uses GObject
+	  and the GLib main loop, to integrate well with GNOME
+	  applications.
+
+	  https://wiki.gnome.org/Projects/libsoup
+
+if BR2_PACKAGE_LIBSOUP
+
+config BR2_PACKAGE_LIBSOUP_GNOME
+	bool "libsoup-gnome"
+	help
+	  Build libsoup-gnome library.
+
+config BR2_PACKAGE_LIBSOUP_SSL
+	bool "https support"
+	depends on !BR2_STATIC_LIBS # glib-networking, gnutls
+	select BR2_PACKAGE_GLIB_NETWORKING
+	select BR2_PACKAGE_GNUTLS
+	help
+	  Enable HTTPS (SSL) support.
+
+comment "libsoup https support needs a toolchain w/ dynamic library"
+	depends on BR2_STATIC_LIBS
+
+endif
+
+comment "libsoup needs a toolchain w/ wchar, threads"
+	depends on BR2_USE_MMU
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS

package/libsoup/libsoup.hash

@@ -0,0 +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
+# Locally calculated
+sha256  b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c  COPYING

package/libsoup/libsoup.mk

@@ -0,0 +1,31 @@
+################################################################################
+#
+# libsoup
+#
+################################################################################
+
+LIBSOUP_VERSION_MAJOR = 2.62
+LIBSOUP_VERSION = $(LIBSOUP_VERSION_MAJOR).3
+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+
+LIBSOUP_LICENSE_FILES = COPYING
+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_DEPENDENCIES = host-pkgconf host-libglib2 \
+	libglib2 libxml2 sqlite host-intltool
+
+ifeq ($(BR2_PACKAGE_LIBSOUP_GNOME),y)
+LIBSOUP_CONF_OPTS += --with-gnome
+else
+LIBSOUP_CONF_OPTS += --without-gnome
+endif
+
+ifeq ($(BR2_PACKAGE_LIBSOUP_SSL),y)
+LIBSOUP_DEPENDENCIES += glib-networking
+else
+LIBSOUP_CONF_OPTS += --disable-tls-check
+endif
+
+$(eval $(autotools-package))