From 37b0185e6617c333f97234d47479eb9a2c9c4821 Mon Sep 17 00:00:00 2001
From: Gerhard Stein <gerstrong@gmail.com>
Date: Sun, 31 May 2015 06:52:25 +0200
Subject: [PATCH 1/2] Fixing strpcpy symbol issue with NDK 10e.

---
 project/jni/intl/src/dcigettext.c | 12 +++++++-----
 project/jni/intl/src/l10nflist.c  |  6 +++---
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/project/jni/intl/src/dcigettext.c b/project/jni/intl/src/dcigettext.c
index 3a4c33ef3..ae6d652e8 100644
--- a/project/jni/intl/src/dcigettext.c
+++ b/project/jni/intl/src/dcigettext.c
@@ -151,9 +151,11 @@ char *getwd ();
 char *getcwd ();
 #  endif
 # endif
+
 # ifndef HAVE_STPCPY
-static char *stpcpy (char *dest, const char *src);
+char *stpcpy (char *dest, const char *src);
 # endif
+
 # ifndef HAVE_MEMPCPY
 static void *mempcpy (void *dest, const void *src, size_t n);
 # endif
@@ -1648,15 +1650,15 @@ get_output_charset (struct binding *domainbinding)
    avoid the non-standard function stpcpy.  In GNU C Library this
    function is available, though.  Also allow the symbol HAVE_STPCPY
    to be defined.  */
-#if !_LIBC && !HAVE_STPCPY
-static char *
+/*#if !_LIBC && !HAVE_STPCPY
+char *
 stpcpy (char *dest, const char *src)
 {
   while ((*dest++ = *src++) != '\0')
-    /* Do nothing. */ ;
+    // Do nothing. ;
   return dest - 1;
 }
-#endif
+#endif*/
 
 #if !_LIBC && !HAVE_MEMPCPY
 static void *
diff --git a/project/jni/intl/src/l10nflist.c b/project/jni/intl/src/l10nflist.c
index 7252d54e7..fb6a9301c 100644
--- a/project/jni/intl/src/l10nflist.c
+++ b/project/jni/intl/src/l10nflist.c
@@ -58,7 +58,7 @@
 # endif
 #else
 # ifndef HAVE_STPCPY
-static char *stpcpy (char *dest, const char *src);
+char *stpcpy (char *dest, const char *src);
 # endif
 #endif
 
@@ -390,11 +390,11 @@ _nl_normalize_codeset (const char *codeset, size_t name_len)
    function is available, though.  Also allow the symbol HAVE_STPCPY
    to be defined.  */
 #if !_LIBC && !HAVE_STPCPY
-static char *
+char *
 stpcpy (char *dest, const char *src)
 {
   while ((*dest++ = *src++) != '\0')
-    /* Do nothing. */ ;
+    // Do nothing. ;
   return dest - 1;
 }
 #endif

From 55cb6e578a0cd74c142ca12df7a1655fa409879e Mon Sep 17 00:00:00 2001
From: Gerhard Stein <gerstrong@gmail.com>
Date: Sun, 31 May 2015 06:53:36 +0200
Subject: [PATCH 2/2] Free Heroes 2 upstream update to Rev. 3277 with android
 patches

---
 project/jni/application/fheroes2/AndroidAppSettings.cfg | 4 ++--
 project/jni/application/fheroes2/fheroes2               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/project/jni/application/fheroes2/AndroidAppSettings.cfg b/project/jni/application/fheroes2/AndroidAppSettings.cfg
index db668463a..c0addd9d2 100644
--- a/project/jni/application/fheroes2/AndroidAppSettings.cfg
+++ b/project/jni/application/fheroes2/AndroidAppSettings.cfg
@@ -180,10 +180,10 @@ MultiABI=all
 AppMinimumRAM=32
 
 # Application version code (integer)
-AppVersionCode=322300
+AppVersionCode=327700
 
 # Application user-visible version name (string)
-AppVersionName="3223.00"
+AppVersionName="3277.00"
 
 # Reset SDL config when updating application to the new version (y) / (n)
 ResetSdlConfigForThisVersion=n
diff --git a/project/jni/application/fheroes2/fheroes2 b/project/jni/application/fheroes2/fheroes2
index 97b50e5d4..4f76e4e1f 120000
--- a/project/jni/application/fheroes2/fheroes2
+++ b/project/jni/application/fheroes2/fheroes2
@@ -1 +1 @@
-../../../../../fheroes2
\ No newline at end of file
+/home/gerstrong/workspace/fheroes2/fheroes2-code/fheroes2
\ No newline at end of file