* [Buildroot] [PATCH] pacakge/glib-networking: bump to version 2.70.0
@ 2022-02-02 11:25 Thomas Devoogdt
2022-02-02 11:32 ` Adrian Perez de Castro
2022-02-05 17:21 ` Peter Korsgaard
0 siblings, 2 replies; 3+ messages in thread
From: Thomas Devoogdt @ 2022-02-02 11:25 UTC (permalink / raw)
To: buildroot; +Cc: Thomas Devoogdt, Fabrice Fontaine
From: Thomas Devoogdt <thomas.devoogdt@gmail.com>
PKCS#11 is required if gnutls is used:
https://gitlab.gnome.org/GNOME/glib-networking/-/commit/9b3d30e40f306f0e36e2a396d3b6df1edeea9f21
Older compilers require c_std=gnu99:
https://gitlab.gnome.org/GNOME/glib-networking/-/commit/b192086b9936602a40a14d00a6883b339b9d7955
Signed-off-by: Thomas Devoogdt <thomas.devoogdt@gmail.com>
---
.../0001-meson-change-std-to-gnu99.patch | 30 +++++++++++++++++++
package/glib-networking/Config.in | 1 +
package/glib-networking/glib-networking.hash | 4 +--
package/glib-networking/glib-networking.mk | 2 +-
4 files changed, 34 insertions(+), 3 deletions(-)
create mode 100644 package/glib-networking/0001-meson-change-std-to-gnu99.patch
diff --git a/package/glib-networking/0001-meson-change-std-to-gnu99.patch b/package/glib-networking/0001-meson-change-std-to-gnu99.patch
new file mode 100644
index 0000000000..9f266bc2c8
--- /dev/null
+++ b/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
+
diff --git a/package/glib-networking/Config.in b/package/glib-networking/Config.in
index 22331255f7..38cded5e6b 100644
--- a/package/glib-networking/Config.in
+++ b/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.
diff --git a/package/glib-networking/glib-networking.hash b/package/glib-networking/glib-networking.hash
index 976a19f25e..6a53b436b0 100644
--- a/package/glib-networking/glib-networking.hash
+++ b/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
diff --git a/package/glib-networking/glib-networking.mk b/package/glib-networking/glib-networking.mk
index 65630c7fed..53280700bc 100644
--- a/package/glib-networking/glib-networking.mk
+++ b/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
--
2.17.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Buildroot] [PATCH] pacakge/glib-networking: bump to version 2.70.0
2022-02-02 11:25 [Buildroot] [PATCH] pacakge/glib-networking: bump to version 2.70.0 Thomas Devoogdt
@ 2022-02-02 11:32 ` Adrian Perez de Castro
2022-02-05 17:21 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Adrian Perez de Castro @ 2022-02-02 11:32 UTC (permalink / raw)
To: Thomas Devoogdt; +Cc: Thomas Devoogdt, Fabrice Fontaine, buildroot
[-- Attachment #1.1: Type: text/plain, Size: 4269 bytes --]
On Wed, 02 Feb 2022 12:25:28 +0100 Thomas Devoogdt <thomas.devoogdt@gmail.com> wrote:
> From: Thomas Devoogdt <thomas.devoogdt@gmail.com>
>
> PKCS#11 is required if gnutls is used:
> https://gitlab.gnome.org/GNOME/glib-networking/-/commit/9b3d30e40f306f0e36e2a396d3b6df1edeea9f21
>
> Older compilers require c_std=gnu99:
> 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>
> ---
> .../0001-meson-change-std-to-gnu99.patch | 30 +++++++++++++++++++
> package/glib-networking/Config.in | 1 +
> package/glib-networking/glib-networking.hash | 4 +--
> package/glib-networking/glib-networking.mk | 2 +-
> 4 files changed, 34 insertions(+), 3 deletions(-)
> create mode 100644 package/glib-networking/0001-meson-change-std-to-gnu99.patch
>
> diff --git a/package/glib-networking/0001-meson-change-std-to-gnu99.patch b/package/glib-networking/0001-meson-change-std-to-gnu99.patch
> new file mode 100644
> index 0000000000..9f266bc2c8
> --- /dev/null
> +++ b/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
> +
> diff --git a/package/glib-networking/Config.in b/package/glib-networking/Config.in
> index 22331255f7..38cded5e6b 100644
> --- a/package/glib-networking/Config.in
> +++ b/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.
>
> diff --git a/package/glib-networking/glib-networking.hash b/package/glib-networking/glib-networking.hash
> index 976a19f25e..6a53b436b0 100644
> --- a/package/glib-networking/glib-networking.hash
> +++ b/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
> diff --git a/package/glib-networking/glib-networking.mk b/package/glib-networking/glib-networking.mk
> index 65630c7fed..53280700bc 100644
> --- a/package/glib-networking/glib-networking.mk
> +++ b/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
> --
> 2.17.1
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
Cheers,
—Adrián
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]
[-- Attachment #2: Type: text/plain, Size: 150 bytes --]
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [Buildroot] [PATCH] pacakge/glib-networking: bump to version 2.70.0
2022-02-02 11:25 [Buildroot] [PATCH] pacakge/glib-networking: bump to version 2.70.0 Thomas Devoogdt
2022-02-02 11:32 ` Adrian Perez de Castro
@ 2022-02-05 17:21 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2022-02-05 17:21 UTC (permalink / raw)
To: Thomas Devoogdt; +Cc: Fabrice Fontaine, buildroot
>>>>> "Thomas" == Thomas Devoogdt <thomas.devoogdt@gmail.com> writes:
> From: Thomas Devoogdt <thomas.devoogdt@gmail.com>
> PKCS#11 is required if gnutls is used:
> https://gitlab.gnome.org/GNOME/glib-networking/-/commit/9b3d30e40f306f0e36e2a396d3b6df1edeea9f21
> Older compilers require c_std=gnu99:
> https://gitlab.gnome.org/GNOME/glib-networking/-/commit/b192086b9936602a40a14d00a6883b339b9d7955
> Signed-off-by: Thomas Devoogdt <thomas.devoogdt@gmail.com>
Committed, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-02-05 17:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-02-02 11:25 [Buildroot] [PATCH] pacakge/glib-networking: bump to version 2.70.0 Thomas Devoogdt
2022-02-02 11:32 ` Adrian Perez de Castro
2022-02-05 17:21 ` Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox