From 1f207df00201dbfcb46f9b41b667519c0a37cd2f Mon Sep 17 00:00:00 2001
From: martell <martellmalone@gmail.com>
Date: Mon, 15 Sep 2014 16:23:47 +0100
Subject: [PATCH] winpty-git: rename console.exe to winpty.exe to fix unknown
 bugs

---
 winpty-git/0001-Added-Support-for-MSYS2.patch |  4 +--
 ...for-conversion-of-all-argv-path-args.patch |  5 ++--
 ...xe-to-winpty.exe-for-mintty-unicode-.patch | 25 +++++++++++++++++++
 winpty-git/PKGBUILD                           |  5 +++-
 4 files changed, 34 insertions(+), 5 deletions(-)
 create mode 100644 winpty-git/0003-rename-console.exe-to-winpty.exe-for-mintty-unicode-.patch

diff --git a/winpty-git/0001-Added-Support-for-MSYS2.patch b/winpty-git/0001-Added-Support-for-MSYS2.patch
index 74a1c326..1a8deec4 100644
--- a/winpty-git/0001-Added-Support-for-MSYS2.patch
+++ b/winpty-git/0001-Added-Support-for-MSYS2.patch
@@ -1,7 +1,7 @@
-From 80118b65a65f7725921661be696aee517f5ffa50 Mon Sep 17 00:00:00 2001
+From c4b4cb4320b6e5c80fa89bbc59146a2bf14f1c58 Mon Sep 17 00:00:00 2001
 From: martell <martellmalone@gmail.com>
 Date: Sat, 13 Sep 2014 21:32:08 +0100
-Subject: [PATCH 1/2] Added Support for MSYS2
+Subject: [PATCH 1/3] Added Support for MSYS2
 
 ---
  configure | 23 ++++++++++++++++++++++-
diff --git a/winpty-git/0002-Add-support-for-conversion-of-all-argv-path-args.patch b/winpty-git/0002-Add-support-for-conversion-of-all-argv-path-args.patch
index 381a4a1a..38cf285a 100644
--- a/winpty-git/0002-Add-support-for-conversion-of-all-argv-path-args.patch
+++ b/winpty-git/0002-Add-support-for-conversion-of-all-argv-path-args.patch
@@ -1,7 +1,7 @@
-From 3f96b51b236ba5a91f9bea063db96a3fa4f87c3a Mon Sep 17 00:00:00 2001
+From 637232e0b57941d7dfa1d9646b28c0f0111a5f7c Mon Sep 17 00:00:00 2001
 From: martell <martellmalone@gmail.com>
 Date: Mon, 15 Sep 2014 01:02:08 +0100
-Subject: [PATCH 2/2] Add support for conversion of all argv path args
+Subject: [PATCH 2/3] Add support for conversion of all argv path args
 
 ---
  unix-adapter/main.cc | 21 ++++-----------------
@@ -54,3 +54,4 @@ index bd9281f..17e978f 100644
          int ret = winpty_start_process(winpty,
 -- 
 2.1.0
+
diff --git a/winpty-git/0003-rename-console.exe-to-winpty.exe-for-mintty-unicode-.patch b/winpty-git/0003-rename-console.exe-to-winpty.exe-for-mintty-unicode-.patch
new file mode 100644
index 00000000..66912bc0
--- /dev/null
+++ b/winpty-git/0003-rename-console.exe-to-winpty.exe-for-mintty-unicode-.patch
@@ -0,0 +1,25 @@
+From bee434ceb77bac5801caf13412f4041507cb51e9 Mon Sep 17 00:00:00 2001
+From: martell <martellmalone@gmail.com>
+Date: Mon, 15 Sep 2014 16:14:08 +0100
+Subject: [PATCH 3/3] rename console.exe to winpty.exe for mintty unicode supp
+
+---
+ unix-adapter/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/unix-adapter/Makefile b/unix-adapter/Makefile
+index a89aee1..1d8d89b 100644
+--- a/unix-adapter/Makefile
++++ b/unix-adapter/Makefile
+@@ -21,7 +21,7 @@
+ include ../config.mk
+ include ../config-unix.mk
+ 
+-PROGRAM = ../build/console.exe
++PROGRAM = ../build/winpty.exe
+ OBJECTS = main.o Shared.o
+ CXXFLAGS += -I../include
+ LDFLAGS += $(LDFLAGS_STATIC_LIBSTDCXX) ../build/winpty.dll
+-- 
+2.1.0
+
diff --git a/winpty-git/PKGBUILD b/winpty-git/PKGBUILD
index df210046..882fff6e 100644
--- a/winpty-git/PKGBUILD
+++ b/winpty-git/PKGBUILD
@@ -18,9 +18,11 @@ options=('staticlibs' 'strip')
 
 source=("${_realname}"::"git+https://github.com/rprichard/winpty.git"
         "0001-Added-Support-for-MSYS2.patch"
-        "0002-Add-support-for-conversion-of-all-argv-path-args.patch")
+        "0002-Add-support-for-conversion-of-all-argv-path-args.patch"
+        "0003-rename-console.exe-to-winpty.exe-for-mintty-unicode-.patch")
 
 md5sums=('SKIP'
+         'SKIP'
          'SKIP'
          'SKIP')
 
@@ -36,6 +38,7 @@ prepare() {
 
   git am "$srcdir/0001-Added-Support-for-MSYS2.patch"
   git am "$srcdir/0002-Add-support-for-conversion-of-all-argv-path-args.patch"
+  git am "$srcdir/0003-rename-console.exe-to-winpty.exe-for-mintty-unicode-.patch"
 
 }