From ec90ebc20c644861399297ac7f97fa1495ed0a60 Mon Sep 17 00:00:00 2001
From: Mario Limonciello <mario.limonciello@amd.com>
Date: Thu, 16 Dec 2021 11:44:46 -0600
Subject: [PATCH] snap: use newer json-glib (Fixes: #4099)

---
 snap/snapcraft.yaml | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 7459ee4e6..b28b24caf 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -74,7 +74,7 @@ parts:
     after: [nettle]
   meson:
     plugin: python
-    source: https://github.com/mesonbuild/meson/releases/download/0.54.0/meson-0.54.0.tar.gz
+    source: https://github.com/mesonbuild/meson/releases/download/0.60.2/meson-0.60.2.tar.gz
     build-packages:
       - ninja-build
       - python3-distutils-extra
@@ -128,6 +128,21 @@ parts:
       - -lib/systemd
       - -lib/udev
       - -lib/girepository-1.0
+  json-glib:
+    plugin: meson
+    source: https://gitlab.gnome.org/GNOME/json-glib.git
+    source-tag: 1.6.6
+    after: [meson]
+    meson-parameters: [--prefix=/,
+                       -Dgtk_doc=disabled,
+                       -Dintrospection=disabled,
+                       -Dman=false,
+                       -Dtests=false]
+    prime:
+      - -include
+      - -bin
+      - -lib/*/pkgconfig
+      - -share
   libqmi:
     plugin: autotools
     source: https://gitlab.freedesktop.org/mobile-broadband/libqmi.git
@@ -205,7 +220,6 @@ parts:
       - libgcab-dev
       - libglib2.0-dev
       - libgpgme11-dev
-      - libjson-glib-dev
       - liblzma-dev
       - libpango1.0-dev
       - libpci-dev
@@ -230,7 +244,6 @@ parts:
       - libusb-1.0-0
       - libgudev-1.0-0
       - libgpgme11
-      - libjson-glib-1.0-0
       - libpolkit-gobject-1-0
       - libsmbios-c2
       - glib-networking
@@ -272,7 +285,7 @@ parts:
       - -usr/lib/*/pkgconfig
       # we don't want system gnutls leaking in
       - -usr/lib/*/libgnutls*
-    after: [meson, build-introspection, modemmanager, libmbim, libqmi, tpm2-tss, gnutls, curl]
+    after: [meson, build-introspection, modemmanager, libmbim, libqmi, tpm2-tss, gnutls, curl, json-glib]
   fix-bash-completion:
     plugin: make
     source: contrib/snap/fix-bash-completion