From fc1eaf75dc931857b6300358f46643ada3c2734d Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 12 May 2019 01:09:39 +0200
Subject: [PATCH] gdb: Update from 8.2.1 to 8.3

---
 packages/gdb/build.sh                      |  5 ++---
 packages/gdb/cli-cmds.c.patch              | 21 ---------------------
 packages/gdb/gdb-cli-cli-cmds.c.patch      | 12 ++++++++++++
 packages/gdb/gdb-common-pathstuff.c.patch  | 21 +++++++++++++++++++++
 packages/gdb/gdb-nat-fork-inferior.c.patch | 12 ------------
 5 files changed, 35 insertions(+), 36 deletions(-)
 delete mode 100644 packages/gdb/cli-cmds.c.patch
 create mode 100644 packages/gdb/gdb-cli-cli-cmds.c.patch
 create mode 100644 packages/gdb/gdb-common-pathstuff.c.patch
 delete mode 100644 packages/gdb/gdb-nat-fork-inferior.c.patch

diff --git a/packages/gdb/build.sh b/packages/gdb/build.sh
index 4c38a7813..06d2a6079 100644
--- a/packages/gdb/build.sh
+++ b/packages/gdb/build.sh
@@ -2,9 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/gdb/
 TERMUX_PKG_DESCRIPTION="The standard GNU Debugger that runs on many Unix-like systems and works for many programming languages"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_DEPENDS="liblzma, libexpat, readline, ncurses, libmpfr, zlib"
-TERMUX_PKG_VERSION=8.2.1
-TERMUX_PKG_REVISION=3
-TERMUX_PKG_SHA256=0a6a432907a03c5c8eaad3c3cffd50c00a40c3a5e3c4039440624bae703f2202
+TERMUX_PKG_VERSION=8.3
+TERMUX_PKG_SHA256=802f7ee309dcc547d65a68d61ebd6526762d26c3051f52caebe2189ac1ffd72e
 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/gdb/gdb-${TERMUX_PKG_VERSION}.tar.xz
 # gdb can not build with our normal --disable-static: https://sourceware.org/bugzilla/show_bug.cgi?id=15916
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
diff --git a/packages/gdb/cli-cmds.c.patch b/packages/gdb/cli-cmds.c.patch
deleted file mode 100644
index 026ad40b5..000000000
--- a/packages/gdb/cli-cmds.c.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -uNr gdb-8.1/gdb/cli/cli-cmds.c gdb-8.1.mod/gdb/cli/cli-cmds.c
---- gdb-8.1/gdb/cli/cli-cmds.c	2018-01-05 06:07:23.000000000 +0200
-+++ gdb-8.1.mod/gdb/cli/cli-cmds.c	2018-06-19 19:21:22.451443520 +0300
-@@ -731,7 +731,7 @@
-       close_most_fds ();
- 
-       if ((user_shell = (char *) getenv ("SHELL")) == NULL)
--	user_shell = "/bin/sh";
-+	user_shell = "@TERMUX_PREFIX@/bin/sh";
- 
-       /* Get the name of the shell for arg0.  */
-       p = lbasename (user_shell);
-@@ -851,7 +851,7 @@
-     }
- 
-   if ((editor = (char *) getenv ("EDITOR")) == NULL)
--      editor = "/bin/ex";
-+      editor = "@TERMUX_REFIX@/bin/applets/vi";
- 
-   fn = symtab_to_fullname (sal.symtab);
- 
diff --git a/packages/gdb/gdb-cli-cli-cmds.c.patch b/packages/gdb/gdb-cli-cli-cmds.c.patch
new file mode 100644
index 000000000..d7d34c5ec
--- /dev/null
+++ b/packages/gdb/gdb-cli-cli-cmds.c.patch
@@ -0,0 +1,12 @@
+diff -u -r ../gdb-8.3/gdb/cli/cli-cmds.c ./gdb/cli/cli-cmds.c
+--- ../gdb-8.3/gdb/cli/cli-cmds.c	2019-05-11 18:19:02.000000000 +0000
++++ ./gdb/cli/cli-cmds.c	2019-05-11 22:43:31.962874247 +0000
+@@ -851,7 +851,7 @@
+     }
+ 
+   if ((editor = getenv ("EDITOR")) == NULL)
+-    editor = "/bin/ex";
++    editor = "@TERMUX_PREFIX@/bin/applets/vi";
+ 
+   fn = symtab_to_fullname (sal.symtab);
+ 
diff --git a/packages/gdb/gdb-common-pathstuff.c.patch b/packages/gdb/gdb-common-pathstuff.c.patch
new file mode 100644
index 000000000..a14bdff63
--- /dev/null
+++ b/packages/gdb/gdb-common-pathstuff.c.patch
@@ -0,0 +1,21 @@
+diff -u -r ../gdb-8.3/gdb/common/pathstuff.c ./gdb/common/pathstuff.c
+--- ../gdb-8.3/gdb/common/pathstuff.c	2019-02-27 04:51:50.000000000 +0000
++++ ./gdb/common/pathstuff.c	2019-05-11 22:45:37.765420769 +0000
+@@ -262,7 +262,7 @@
+   if (tmp != nullptr)
+     return tmp;
+ 
+-  return "/tmp";
++  return "@TERMUX_PREFIX@/tmp";
+ #endif
+ }
+ 
+@@ -273,7 +273,7 @@
+ {
+   const char *ret = getenv ("SHELL");
+   if (ret == NULL)
+-    ret = "/bin/sh";
++    ret = "@TERMUX_PREFIX@/bin/bash";
+ 
+   return ret;
+ }
diff --git a/packages/gdb/gdb-nat-fork-inferior.c.patch b/packages/gdb/gdb-nat-fork-inferior.c.patch
deleted file mode 100644
index 37aeef488..000000000
--- a/packages/gdb/gdb-nat-fork-inferior.c.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u -r ../gdb-8.1/gdb/nat/fork-inferior.c ./gdb/nat/fork-inferior.c
---- ../gdb-8.1/gdb/nat/fork-inferior.c	2018-01-05 05:07:23.000000000 +0100
-+++ ./gdb/nat/fork-inferior.c	2018-02-01 21:49:06.148349274 +0100
-@@ -32,7 +32,7 @@
- 
- /* Default shell file to be used if 'startup-with-shell' is set but
-    $SHELL is not.  */
--#define SHELL_FILE "/bin/sh"
-+#define SHELL_FILE "@TERMUX_PREFIX@/bin/sh"
- 
- /* Build the argument vector for execv(3).  */
-