Skip to content

Commit

Permalink
winpty-git: Update to 0.2.2.371.a4ba242. Restore removed patch
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexpux committed Feb 25, 2016
1 parent d473324 commit b59d3b2
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 3 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
From 08c2316f2f7791bc3a9243aabe8df84aaaf8b205 Mon Sep 17 00:00:00 2001
From: David Macek <[email protected]>
Date: Sat, 14 Nov 2015 11:27:43 +0100
Subject: [PATCH] Apply POSIX-to-Win conversion on all arguments on MSYS

---
src/unix-adapter/main.cc | 10 ++++++++++
1 file changed, 10 insertions(+)

diff --git a/unix-adapter/main.cc b/unix-adapter/main.cc
index da19735..b8092a0 100644
--- a/src/unix-adapter/main.cc
+++ b/src/unix-adapter/main.cc
@@ -412,6 +412,16 @@ int main(int argc, char *argv[])
exit(1);
}

+#if defined(__MSYS__)
+ {
+ int argc = args.childArgv.size();
+ int argi = 1;
+ for (; argi < argc; ++argi) {
+ args.childArgv[argi] = convertPosixPathToWin(args.childArgv[argi]);
+ }
+ }
+#endif
+
{
// Start the child process under the console.
args.childArgv[0] = convertPosixPathToWin(args.childArgv[0]);
--
2.6.2.windows.1
9 changes: 6 additions & 3 deletions winpty-git/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
_realname=winpty
pkgname="${_realname}-git"
epoch=1
pkgver=0.2.2.365.79c9859
pkgver=0.2.2.371.a4ba242
pkgrel=1
pkgdesc="A Windows software package providing an interface similar to a Unix pty-master for communicating with Windows console programs"
arch=('i686' 'x86_64')
Expand All @@ -15,8 +15,10 @@ provides=("${_realname}")
conflicts=("${_realname}")
#depends=( "ncurses-devel" )
options=('staticlibs' 'strip')
source=("${_realname}"::"git+https://github.com/rprichard/winpty.git")
md5sums=('SKIP')
source=("${_realname}"::"git+https://github.com/rprichard/winpty.git"
0001-Apply-POSIX-to-Win-conversion-on-all-arguments-on-MSYS.patch)
md5sums=('SKIP'
'f8f5983b4180878a5b143649cd6a15c4')

pkgver() {
cd "${srcdir}/${_realname}"
Expand All @@ -25,6 +27,7 @@ pkgver() {

prepare() {
cd "${srcdir}/${_realname}"
git am ${srcdir}/0001-Apply-POSIX-to-Win-conversion-on-all-arguments-on-MSYS.patch
}

build() {
Expand Down

0 comments on commit b59d3b2

Please sign in to comment.