From 9ff5f5d50eade8f1004f6351770827e92e93a0f9 Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Thu, 23 Apr 2020 15:27:03 +0300
Subject: [PATCH] glib: bundle json-glib

---
 extra/glib/build     | 21 +++++++++++++++++++++
 extra/glib/checksums |  1 +
 extra/glib/sources   |  1 +
 extra/glib/version   |  2 +-
 4 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/extra/glib/build b/extra/glib/build
index 990391b7..889fa801 100755
--- a/extra/glib/build
+++ b/extra/glib/build
@@ -22,5 +22,26 @@ meson \
 ninja -C build
 ninja -C build install
 
+
+# json-glib is a separate package which we build alongside
+# glib (as if they were one and the same). The upstream for
+# json-glib is effectively dead (only translation work) so
+# this makes my life a little easier..
+{
+    cd json-glib
+
+    meson \
+        --prefix=/usr \
+        --sysconfdir=/etc \
+        --mandir=/usr/share/man \
+        -Ddocs=false \
+        -Dintrospection=false \
+        . output
+
+    ninja -C output
+    ninja -C output install
+}
+
+
 # Purge gdbus.
 rm -rf "$1/usr/bin/gdbus"
diff --git a/extra/glib/checksums b/extra/glib/checksums
index 05b39e72..ff3a8d38 100644
--- a/extra/glib/checksums
+++ b/extra/glib/checksums
@@ -1 +1,2 @@
 9a2f21ed8f13b9303399de13a0252b7cbcede593d26971378ec6cb90e87f2277  glib-2.64.2.tar.xz
+720c5f4379513dc11fd97dc75336eb0c0d3338c53128044d9fabec4374f4bc47  json-glib-1.4.4.tar.xz
diff --git a/extra/glib/sources b/extra/glib/sources
index 22d3503d..24b51c45 100644
--- a/extra/glib/sources
+++ b/extra/glib/sources
@@ -1 +1,2 @@
 https://download.gnome.org/sources/glib/2.64/glib-2.64.2.tar.xz
+https://download.gnome.org/sources/json-glib/1.4/json-glib-1.4.4.tar.xz json-glib
diff --git a/extra/glib/version b/extra/glib/version
index f627c204..55102255 100644
--- a/extra/glib/version
+++ b/extra/glib/version
@@ -1 +1 @@
-2.64.2 1
+2.64.2 2