glib-networking: bump to version 2.42.1

Add hash file and drop libgcrypt tweak since it's no longer required.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/glib-networking/glib-networking.hash b/package/glib-networking/glib-networking.hash
new file mode 100644 (file)
index 0000000..0d85782
--- /dev/null
+++ b/package/glib-networking/glib-networking.hash
@@ -0,0 +1,2 @@
+# From http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.42/glib-networking-2.42.1.sha256sum
+sha256 c06bf76da3353695fcc791b7b02e5d60c01c379e554f7841dc6cbca32f65f3a0        glib-networking-2.42.1.tar.xz

diff --git a/package/glib-networking/glib-networking.mk b/package/glib-networking/glib-networking.mk
index 2da78585a061b5eb316149eec0ac45efc18f4927..43536d94af1aa8e9d3b85a2b618f1926c6ea7bb5 100644 (file)
--- a/package/glib-networking/glib-networking.mk
+++ b/package/glib-networking/glib-networking.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-GLIB_NETWORKING_VERSION_MAJOR = 2.36
-GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_VERSION_MAJOR).2
+GLIB_NETWORKING_VERSION_MAJOR = 2.42
+GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_VERSION_MAJOR).1
 GLIB_NETWORKING_SITE = http://ftp.gnome.org/pub/gnome/sources/glib-networking/$(GLIB_NETWORKING_VERSION_MAJOR)
 GLIB_NETWORKING_SOURCE = glib-networking-$(GLIB_NETWORKING_VERSION).tar.xz
 GLIB_NETWORKING_INSTALL_STAGING = YES
@@ -24,11 +24,4 @@ else
 GLIB_NETWORKING_CONF_OPTS += --without-gnutls
 endif
 
-# gnutls 3.x+ doesn't use libgcrypt, it uses nettle/hogweed
-define GLIB_NETWORKING_NO_LIBGCRYPT
-       $(SED) 's:#include <gcrypt.h>::' $(@D)/tls/gnutls/gtlsbackend-gnutls.c
-endef
-
-GLIB_NETWORKING_POST_EXTRACT_HOOKS += GLIB_NETWORKING_NO_LIBGCRYPT
-
 $(eval $(autotools-package))