From 80ef82a4def044ae415c6a185e129dc1dc1eaf6e Mon Sep 17 00:00:00 2001
From: Alexey Pavlov <alexpux@gmail.com>
Date: Mon, 30 Jan 2017 13:06:15 +0300
Subject: [PATCH] msys2-runtimw: Fix typo im base msys2 patches. Pass GCC6
 error without patch

---
 .../0002-Rename-DLL-from-cygwin-to-msys.patch    |  2 +-
 msys2-runtime/PKGBUILD                           | 16 ++++++----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/msys2-runtime/0002-Rename-DLL-from-cygwin-to-msys.patch b/msys2-runtime/0002-Rename-DLL-from-cygwin-to-msys.patch
index 80234efa..8a5a8d08 100644
--- a/msys2-runtime/0002-Rename-DLL-from-cygwin-to-msys.patch
+++ b/msys2-runtime/0002-Rename-DLL-from-cygwin-to-msys.patch
@@ -504,7 +504,7 @@ index 159d4fe..e53fa17 100644
      {
 +#ifdef __MSYS__
 +      /* ... replace "lib" with "msys-", before ... */
-+      basenames.appendv ("msys-", 5, basename+3, basename-3, ext, extlen, NULL);
++      basenames.appendv ("msys-", 5, basename+3, baselen-3, ext, extlen, NULL);
 +#else
        /* ... replace "lib" with "cyg", before ... */
        basenames.appendv ("cyg", 3, basename+3, baselen-3, ext, extlen, NULL);
diff --git a/msys2-runtime/PKGBUILD b/msys2-runtime/PKGBUILD
index e32bd5f6..cc6b726d 100644
--- a/msys2-runtime/PKGBUILD
+++ b/msys2-runtime/PKGBUILD
@@ -4,7 +4,7 @@
 pkgbase=msys2-runtime
 pkgname=('msys2-runtime' 'msys2-runtime-devel')
 pkgver=2.6.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Cygwin POSIX emulation engine"
 arch=('i686' 'x86_64')
 url="https://www.cygwin.com/"
@@ -46,11 +46,10 @@ source=('msys2-runtime'::git://sourceware.org/git/newlib-cygwin.git#tag=cygwin-$
         0021-Add-debugging-for-strace-make_command_line.patch
         0022-environ.cc-New-facility-environment-variable-MSYS2_E.patch
         0023-path.cc-Ignore-zero-length-exclusions.patch
-        0200-FAST_CWD-adjust-initial-search-scope.patch
-        0300-gcc6-workaround-nonnull-error.patch)
+        0200-FAST_CWD-adjust-initial-search-scope.patch)
 sha256sums=('SKIP'
             'f12bf8b297f2712bb6018aa42ddf8ea6ac112ef92aaf00842aa79c72a3e3908a'
-            'ce30b608530e938868a17dc1c7545565e8c6718d1f55426324937369848dcd69'
+            '3e67a29bf4b2aec8e78dfe4f6ac8965b440d0926d2770f602dc0acd590cfef18'
             'd6810c9c0bfebc85d4e4eed28bb181a12e628e0477aebe9191d165beed1c75d5'
             '3cfa7544b8bf0c49a5103dc57db3e8b472bebc9d04477940b1354d37a3d41f8a'
             '91bc5209503dfc35d7d5be710150ad82c3fb929ee07b902e5abf6aeb940a3a14'
@@ -72,8 +71,7 @@ sha256sums=('SKIP'
             '04b4764ee046b351c3617b168682ec6c2391c4479178216fe518baf9f8de93e0'
             '9256c5f92ff69c66013fcae25343ff0149eb36b22a87b81423105753bd98098a'
             'a7723f601d524391fbc706392150173a4defb73a274bc28e46c00e51ddf53038'
-            'f2fcdf5d91639b527603ee371809cb5d7bf50d9a17a27c6a719c3f74d27e4237'
-            'd291edd51a8adc8380a227e89d7579a2673f19ea06337b502cef98375b564924')
+            'f2fcdf5d91639b527603ee371809cb5d7bf50d9a17a27c6a719c3f74d27e4237')
 prepare() {
   cd "${srcdir}"/msys2-runtime
   git am --committer-date-is-author-date "${srcdir}"/0001-Add-MSYS-triplets.patch
@@ -102,8 +100,6 @@ prepare() {
   
   # Upstream patches for next release
   git am --committer-date-is-author-date "${srcdir}"/0200-FAST_CWD-adjust-initial-search-scope.patch
-  
-  patch -p1 -i ${srcdir}/0300-gcc6-workaround-nonnull-error.patch
 }
 
 build() {
@@ -120,8 +116,8 @@ build() {
     OPTIM="-O2"
   fi
 
-  CFLAGS="$OPTIM -pipe -ggdb -Wno-error=frame-address"
-  CXXFLAGS="$OPTIM -pipe -ggdb -Wno-error=frame-address"
+  CFLAGS="$OPTIM -pipe -ggdb -Wno-error=frame-address -Wno-error=nonnull-compare"
+  CXXFLAGS="$OPTIM -pipe -ggdb -Wno-error=frame-address -Wno-error=nonnull-compare"
 
   "${srcdir}"/msys2-runtime/configure \
     --prefix=/usr \