Skip to content

Commit

Permalink
msys2-runtime: update to v2.9.0
Browse files Browse the repository at this point in the history
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  • Loading branch information
dscho committed Oct 5, 2017
1 parent 73d6bf6 commit e9d0a2b
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 3 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
From bcbd8d5669616a572604b84271fa304361007e3e Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Mon, 11 Sep 2017 13:21:46 -0500
Subject: [PATCH 54/N] Revert "cygwin: only expose /dev/con{in,out,sole} when
started from a Windows console"

This caused serious regressions when running from a cmd window:

https://cygwin.com/ml/cygwin/2017-09/msg00114.html

This reverts commit b706c6b479422d31f0124b92c21b4cb536bbddff.

Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
winsup/cygwin/fhandler.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h
index cd73e6e..153e384 100644
--- a/winsup/cygwin/fhandler.h
+++ b/winsup/cygwin/fhandler.h
@@ -1439,7 +1439,7 @@ private:
ssize_t __stdcall write (const void *ptr, size_t len);
void doecho (const void *str, DWORD len) { (void) write (str, len); }
int close ();
- static bool exists () {return shared_console_info && !!GetConsoleCP ();}
+ static bool exists () {return !!GetConsoleCP ();}

int tcflush (int);
int tcsetattr (int a, const struct termios *t);
--
2.9.0

9 changes: 6 additions & 3 deletions msys2-runtime/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
pkgbase=msys2-runtime
pkgname=('msys2-runtime' 'msys2-runtime-devel')
pkgver=2.9.0
pkgrel=2
pkgrel=3
pkgdesc="Cygwin POSIX emulation engine"
arch=('i686' 'x86_64')
url="https://www.cygwin.com/"
Expand Down Expand Up @@ -76,7 +76,8 @@ source=('msys2-runtime'::git://sourceware.org/git/newlib-cygwin.git#tag=cygwin-$
0050-Make-paths-WCS-MBS-conversion-explicit.patch
0051-Avoid-comparing-this-to-NULL.patch
0052-Avoid-assert-this-statements.patch
0053-Fix-possible-segmentation-fault-in-strnstr-on-64-bit.patch)
0053-Fix-possible-segmentation-fault-in-strnstr-on-64-bit.patch
0054-Revert-cygwin-only-expose-dev-con-in-out-sole-when-s.patch)
sha256sums=('SKIP'
'412a414e00ed0976611b42dc1dcb2ac29741200b40d42ae281a5c74ec09844d4'
'580634b80de13b1730b648042d955cf0db40af97a6967602f4634c3034c06a9c'
Expand Down Expand Up @@ -130,7 +131,8 @@ sha256sums=('SKIP'
'd85f9dac6ba44e36ed90b88027359904fc2655cbcb17b7c6460c1ae37bf2d152'
'eed19654a6e04dede191f7504579220a2e08626a956519a4aea35f55e221354b'
'4dbabed704075e2d3cf49bed94c88d5b1de328fc7389527fff26cb6acc46bd87'
'bc0138bd6c112a298083676f7b20a3e8c59d0b93418f8b60f528e6e8645eb4dd')
'bc0138bd6c112a298083676f7b20a3e8c59d0b93418f8b60f528e6e8645eb4dd'
'6d8d392cb96b06ede215c3c595be4fa97080719fa4f988bf201338cf2a298fbc')
prepare() {
cd "${srcdir}"/msys2-runtime
git am --committer-date-is-author-date "${srcdir}"/0001-Add-MSYS-triplets.patch
Expand Down Expand Up @@ -186,6 +188,7 @@ prepare() {
git am --committer-date-is-author-date "${srcdir}"/0051-Avoid-comparing-this-to-NULL.patch
git am --committer-date-is-author-date "${srcdir}"/0052-Avoid-assert-this-statements.patch
git am --committer-date-is-author-date "${srcdir}"/0053-Fix-possible-segmentation-fault-in-strnstr-on-64-bit.patch
git am --committer-date-is-author-date "${srcdir}"/0054-Revert-cygwin-only-expose-dev-con-in-out-sole-when-s.patch
}

build() {
Expand Down

0 comments on commit e9d0a2b

Please sign in to comment.