Browse Source

package/glib-networking: bump to version 2.70.0

PKCS#11 is required if gnutls is used:
https://gitlab.gnome.org/GNOME/glib-networking/-/commit/9b3d30e40f306f0e36e2a396d3b6df1edeea9f21

Add an upstream patch to fix compilation with older compilers:
https://gitlab.gnome.org/GNOME/glib-networking/-/commit/b192086b9936602a40a14d00a6883b339b9d7955

Signed-off-by: Thomas Devoogdt <thomas.devoogdt@gmail.com>
Reviewed-by: Adrian Perez de Castro <aperez@igalia.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Thomas Devoogdt 3 years ago
parent
commit
53fa10f4c9

+ 30 - 0
package/glib-networking/0001-meson-change-std-to-gnu99.patch

@@ -0,0 +1,30 @@
+From cdfa726bae1d82b7bd3735475fc2b2c6a31c1d2f Mon Sep 17 00:00:00 2001
+From: Ignacio Casal Quinteiro <qignacio@amazon.com>
+Date: Fri, 12 Nov 2021 11:51:33 +0100
+Subject: [PATCH] meson: change std to gnu99
+
+This is the same as glib and should fix issues with old
+compilers
+
+(cherry picked from commit b192086b9936602a40a14d00a6883b339b9d7955)
+Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index b018ca7b..130a2bf0 100644
+--- a/meson.build
++++ b/meson.build
+@@ -3,7 +3,7 @@ project(
+   version: '2.70.0',
+   license: 'LGPL2.1+',
+   meson_version: '>= 0.50.0',
+-  default_options: ['c_std=c99']
++  default_options: ['c_std=gnu99']
+ )
+ 
+ prefix = get_option('prefix')
+-- 
+2.17.1
+

+ 1 - 0
package/glib-networking/Config.in

@@ -6,6 +6,7 @@ config BR2_PACKAGE_GLIB_NETWORKING
 	depends on !BR2_STATIC_LIBS
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_GNUTLS
+	select BR2_PACKAGE_P11_KIT if BR2_PACKAGE_GNUTLS
 	help
 	  Network-related GIO modules for glib.
 

+ 2 - 2
package/glib-networking/glib-networking.hash

@@ -1,3 +1,3 @@
-# From http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.66/glib-networking-2.66.0.sha256sum
-sha256  c5d7be2437fdd196eebfb70c4517b96d3ba7ec13bd496318b8f02dea383e0099  glib-networking-2.66.0.tar.xz
+# From http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.70/glib-networking-2.70.0.sha256sum
+sha256  66b408e7afa86c582fe38963db56133869ab4b57d34e48ec56aba621940d6f35  glib-networking-2.70.0.tar.xz
 sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING

+ 1 - 1
package/glib-networking/glib-networking.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GLIB_NETWORKING_VERSION_MAJOR = 2.66
+GLIB_NETWORKING_VERSION_MAJOR = 2.70
 GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_VERSION_MAJOR).0
 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