From 1dc9bd49ab4263e768a8b2ddefa19a1e18981c61 Mon Sep 17 00:00:00 2001
From: Butta <repo@butta.fastem.com>
Date: Thu, 3 Sep 2020 01:21:12 +0530
Subject: [PATCH] Revert json-glib update and bump kakoune and mbedtls on CI

---
 packages/json-glib/build.sh | 11 +++++++++--
 packages/kakoune/build.sh   |  2 +-
 packages/mbedtls/build.sh   |  2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/packages/json-glib/build.sh b/packages/json-glib/build.sh
index 6e49f7d22..b15301d58 100644
--- a/packages/json-glib/build.sh
+++ b/packages/json-glib/build.sh
@@ -1,9 +1,10 @@
 TERMUX_PKG_HOMEPAGE=https://wiki.gnome.org/Projects/JsonGlib
 TERMUX_PKG_DESCRIPTION="GLib JSON manipulation library"
 TERMUX_PKG_LICENSE="GPL-2.0"
-TERMUX_PKG_VERSION=1.5.2
+TERMUX_PKG_VERSION=1.4.4
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://download.gnome.org/sources/json-glib/${TERMUX_PKG_VERSION:0:3}/json-glib-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=ad08438327b6106dc040c0581477bdf1cd3daaa5d285920cc768b8627f746666
+TERMUX_PKG_SHA256=720c5f4379513dc11fd97dc75336eb0c0d3338c53128044d9fabec4374f4bc47
 TERMUX_PKG_DEPENDS="glib"
 TERMUX_PKG_BREAKS="json-glib-dev"
 TERMUX_PKG_REPLACES="json-glib-dev"
@@ -13,3 +14,9 @@ share/installed-tests
 libexec/installed-tests
 bin/
 "
+
+termux_step_pre_configure() {
+	# Remove configure wrapper around meson build which prevents
+	# meson setup in termux_step_configure.
+	rm configure
+}
diff --git a/packages/kakoune/build.sh b/packages/kakoune/build.sh
index 013ae328b..0e22d076d 100644
--- a/packages/kakoune/build.sh
+++ b/packages/kakoune/build.sh
@@ -6,7 +6,7 @@ TERMUX_PKG_SRCURL=https://github.com/mawww/kakoune/releases/download/v$TERMUX_PK
 TERMUX_PKG_SHA256=861a89c56b5d0ae39628cb706c37a8b55bc289bfbe3c72466ad0e2757ccf0175
 TERMUX_PKG_DEPENDS="libc++, ncurses"
 TERMUX_PKG_BUILD_IN_SRC=true
-TERMUX_PKG_EXTRA_MAKE_ARGS=" -C src debug=no"
+TERMUX_PKG_EXTRA_MAKE_ARGS=" -C src debug=no "
 
 termux_step_create_debscripts() {
 	cat <<- EOF > ./postinst
diff --git a/packages/mbedtls/build.sh b/packages/mbedtls/build.sh
index 80e1eb925..260e902d2 100644
--- a/packages/mbedtls/build.sh
+++ b/packages/mbedtls/build.sh
@@ -12,4 +12,4 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DUSE_SHARED_MBEDTLS_LIBRARY=ON
 -DENABLE_TESTING=OFF
 -DENABLE_PROGRAMS=OFF
-"
+ "