From 5251d2d3ecb9c76bbd3ce9815646451b89c53ec9 Mon Sep 17 00:00:00 2001
From: Butta <repo@butta.fastem.com>
Date: Fri, 11 Sep 2020 22:16:57 +0530
Subject: [PATCH] Fix glib meson.build and bump exiftool and geth on CI

---
 packages/exiftool/build.sh      | 2 +-
 packages/geth/build.sh          | 2 +-
 packages/glib/meson.build.patch | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/exiftool/build.sh b/packages/exiftool/build.sh
index 71639f45f..8012697eb 100644
--- a/packages/exiftool/build.sh
+++ b/packages/exiftool/build.sh
@@ -12,7 +12,7 @@ termux_step_make_install() {
 
 	install -Dm700 "$TERMUX_PKG_SRCDIR"/exiftool "$TERMUX_PREFIX"/bin/exiftool
 	find "$TERMUX_PKG_SRCDIR"/lib -name "*.pod" -delete
-	mkdir -p "$TERMUX_PREFIX/lib/perl5/site_perl/${current_perl_version}"
+	mkdir -p "$TERMUX_PREFIX/lib/perl5/site_perl/$current_perl_version"
 	rm -rf "$TERMUX_PREFIX/lib/perl5/site_perl/${current_perl_version}"/{Image,File}
 	cp -a "$TERMUX_PKG_SRCDIR"/lib/{Image,File} "$TERMUX_PREFIX/lib/perl5/site_perl/${current_perl_version}/"
 }
diff --git a/packages/geth/build.sh b/packages/geth/build.sh
index cebc70b71..ee8fba4b3 100644
--- a/packages/geth/build.sh
+++ b/packages/geth/build.sh
@@ -10,7 +10,7 @@ termux_step_make() {
 	termux_setup_golang
 
 	export GOPATH=$TERMUX_PKG_BUILDDIR
-	mkdir -p "$GOPATH"/src/github.com/ethereum
+	mkdir -p "${GOPATH}"/src/github.com/ethereum
 	ln -sf "$TERMUX_PKG_SRCDIR" "$GOPATH"/src/github.com/ethereum/go-ethereum
 
 	cd "$GOPATH"/src/github.com/ethereum/go-ethereum
diff --git a/packages/glib/meson.build.patch b/packages/glib/meson.build.patch
index 87ea237d1..4a07cb51a 100644
--- a/packages/glib/meson.build.patch
+++ b/packages/glib/meson.build.patch
@@ -19,7 +19,7 @@ diff -u -r ../glib-2.60.2/meson.build ./meson.build
 -  have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset')
 -else
 +have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset')
-+if False
++if host_system != 'android'
    # First just find the bare library.
    libintl = cc.find_library('intl', required : false)
    # The bare library probably won't link without help if it's static.