recipes/json-glib: update to 1.6.2

At least, fixes build with clang 11

Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/729>

3 files changed, 2 insertions, 55 deletions

diff --git a/recipes/json-glib.recipe b/recipes/json-glib.recipe
index 1db5e1f6..374f6cbf 100644
--- a/recipes/json-glib.recipe
+++ b/recipes/json-glib.recipe
@@ -4,15 +4,13 @@ from cerbero.tools.libtool import LibtoolLibrary
 
 class Recipe(recipe.Recipe):
     name = 'json-glib'
-    version = '1.4.4'
+    version = '1.6.2'
     licenses = [License.LGPLv2_1Plus]
     btype = BuildType.MESON
     stype = SourceType.TARBALL
     url = 'gnome://'
-    tarball_checksum = '720c5f4379513dc11fd97dc75336eb0c0d3338c53128044d9fabec4374f4bc47'
+    tarball_checksum = 'a33d66c6d038bda46b910c6c6d59c4e15db014e363dc997a0414c2e07d134f24'
     deps = ['glib']
-    patches = [# https://gitlab.gnome.org/GNOME/json-glib/merge_requests/17
-               'json-glib/0001-meson-Don-t-error-with-MSVC-C4819-warning.patch']
 
     files_bins = ['json-glib-validate', 'json-glib-format']
     files_libs = ['libjson-glib-1.0']
diff --git a/recipes/json-glib/0001-Don-t-override-our-own-ACLOCAL_FLAGS-but-append-them.patch b/recipes/json-glib/0001-Don-t-override-our-own-ACLOCAL_FLAGS-but-append-them.patch
deleted file mode 100644
index 60a1e18a..00000000
--- a/recipes/json-glib/0001-Don-t-override-our-own-ACLOCAL_FLAGS-but-append-them.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From d2e2c104f9b8137842abab2709140a8ddc82c9de Mon Sep 17 00:00:00 2001
-From: Edward Hervey <bilboed@bilboed.com>
-Date: Wed, 21 Feb 2018 14:25:48 +0100
-Subject: [PATCH] Don't override our own ACLOCAL_FLAGS but append them to the
- custom ones
-
----
- Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 328b384..5f574cc 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,4 +1,4 @@
--ACLOCAL_AMFLAGS = -I build/autotools
-+ACLOCAL_AMFLAGS = -I build/autotools ${ACLOCAL_FLAGS}
- 
- EXTRA_DIST = \
- 	meson.build \
--- 
-2.14.3
-
diff --git a/recipes/json-glib/0001-meson-Don-t-error-with-MSVC-C4819-warning.patch b/recipes/json-glib/0001-meson-Don-t-error-with-MSVC-C4819-warning.patch
deleted file mode 100644
index d14c6290..00000000
--- a/recipes/json-glib/0001-meson-Don-t-error-with-MSVC-C4819-warning.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 90a659a22280e8a2dcf4a9330dfbaa182cb6f256 Mon Sep 17 00:00:00 2001
-From: Seungha Yang <seungha.yang@navercorp.com>
-Date: Thu, 14 Nov 2019 12:12:11 +0900
-Subject: [PATCH] meson: Don't error with MSVC C4819 warning
-
-The compiler warning C4819 (encoding related warning) is a trivial
-thing on non-English locale system. Instead of error out,
-explicitly specify encoding as "utf-8".
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 69c3896..f84d865 100644
---- a/meson.build
-+++ b/meson.build
-@@ -74,7 +74,7 @@ if cc.get_id() == 'msvc'
-     '-we4049', # terminating line number emission
-     '-we4053', # an expression of type void was used as an operand
-     '-we4071', # no function prototype given
--    '-we4819', # the file contains a character that cannot be represented in the current code page
-+    '/utf-8',  # Set the input and exec encoding to utf-8
-   ]
- elif cc.get_id() == 'gcc' or cc.get_id() == 'clang'
-   test_cflags = [
--- 
-2.17.1
-