From 71d2e0642909edeaf566c12302d2824361a81316 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 16 Jul 2017 18:42:11 +0200
Subject: [PATCH] angband: Update from 4.0.5 to 4.1.0

---
 packages/angband/build.sh         |  9 +++++----
 packages/angband/src-main.c.patch | 25 +++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 packages/angband/src-main.c.patch

diff --git a/packages/angband/build.sh b/packages/angband/build.sh
index 8fd3038b9..cef060a2a 100644
--- a/packages/angband/build.sh
+++ b/packages/angband/build.sh
@@ -1,12 +1,13 @@
 TERMUX_PKG_HOMEPAGE=http://rephial.org/
 TERMUX_PKG_DESCRIPTION="Dungeon exploration adventure game"
-TERMUX_PKG_VERSION=4.0.5
-TERMUX_PKG_SRCURL=http://rephial.org/downloads/4.0/angband-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=0d769a0f349842b0c78cbcd1804a9e08f064e75ca26b957710e4c2a3eb14f852
-TERMUX_PKG_DEPENDS="libandroid-support, ncurses"
+TERMUX_PKG_VERSION=4.1.0
+TERMUX_PKG_SRCURL=http://rephial.org/downloads/4.1/angband-${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SHA256=ea52266e52b66d6bf2ab3728b3bc6c7c3875130973430021e31bf56000c0df8b
+TERMUX_PKG_DEPENDS="ncurses"
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-x11 --bindir=$TERMUX_PREFIX/bin --sysconfdir=$TERMUX_PREFIX/share/angband"
 TERMUX_PKG_RM_AFTER_INSTALL="share/angband/xtra share/angband/icons"
+TERMUX_PKG_FOLDERNAME=angband-master
 
 termux_step_pre_configure () {
 	./autogen.sh
diff --git a/packages/angband/src-main.c.patch b/packages/angband/src-main.c.patch
new file mode 100644
index 000000000..65f251471
--- /dev/null
+++ b/packages/angband/src-main.c.patch
@@ -0,0 +1,25 @@
+diff -u -r ../angband-master/src/main.c ./src/main.c
+--- ../angband-master/src/main.c	2017-06-25 04:10:53.000000000 +0000
++++ ./src/main.c	2017-07-16 16:38:58.187988465 +0000
+@@ -35,7 +35,9 @@
+  * locale junk
+  */
+ #include "locale.h"
++#ifndef __ANDROID__
+ #include "langinfo.h"
++#endif
+ 
+ /**
+  * Some machines have a "main()" function in their "main-xxx.c" file,
+@@ -466,9 +468,11 @@
+ 		ANGBAND_SYS = mstr;
+ 
+ 	if (setlocale(LC_CTYPE, "")) {
++#ifndef __ANDROID__
+ 		/* Require UTF-8 */
+ 		if (strcmp(nl_langinfo(CODESET), "UTF-8") != 0)
+ 			quit("Angband requires UTF-8 support");
++#endif
+ 	}
+ 
+ 	/* Try the modules in the order specified by modules[] */