From f6c4e45af568dce132afbbfd2edee09d212378bf Mon Sep 17 00:00:00 2001
From: Renato Silva <br.renatosilva@gmail.com>
Date: Sun, 1 May 2016 19:51:39 -0300
Subject: [PATCH] Updates for the changes in filesystem package.

---
 README.md                                                   | 2 +-
 appveyor.yml                                                | 1 -
 .../0011-MSYS2-Changes-to-various-system-calls.patch        | 6 +++---
 mingw-w64-octopi-git/PKGBUILD                               | 4 ++--
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index a296840b21..8649d080fa 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ MINGW-packages
 
 Package scripts for MinGW-w64 targets to build under MSYS2.
 
-To build these, run msys2_shell.bat then from the bash prompt.
+To build these, run msys2_shell.cmd then from the bash prompt.
 
     cd ${package-name}
     makepkg-mingw
diff --git a/appveyor.yml b/appveyor.yml
index 1fae316517..68b6817257 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,5 +1,4 @@
 environment:
-    MSYSTEM: MSYS
     DEPLOY_PROVIDER: bintray
     BINTRAY_ACCOUNT: alexpux
     BINTRAY_REPOSITORY: msys2
diff --git a/mingw-w64-octopi-git/0011-MSYS2-Changes-to-various-system-calls.patch b/mingw-w64-octopi-git/0011-MSYS2-Changes-to-various-system-calls.patch
index 985e7a1d14..bd4734998e 100644
--- a/mingw-w64-octopi-git/0011-MSYS2-Changes-to-various-system-calls.patch
+++ b/mingw-w64-octopi-git/0011-MSYS2-Changes-to-various-system-calls.patch
@@ -7,7 +7,7 @@ openRootTerminal(), runCommandInTerminal()
 getSUCommand(), isRootRunning()
 
 MSYS2 behaviour changes for these:
-*Terminal() runs msys2_shell.bat
+*Terminal() runs msys2_shell.cmd
 getSUCommand() returns "sh.exe -c "
 isRootRunning() returns false
 ---
@@ -28,7 +28,7 @@ index bec9273..eb4293c 100644
 -    if (UnixCommand::getLinuxDistro() == ectn_MOOOSLINUX && UnixCommand::hasTheExecutable(ctn_RXVT_TERMINAL))
 +    if (UnixCommand::getLinuxDistro() == ectn_MSYS2)
 +    {
-+        QString cmd = ctn_MSYS2_SH + UnixCommand::getMSYS2Root() + QLatin1String("/msys2_shell.bat");
++        QString cmd = ctn_MSYS2_SH + UnixCommand::getMSYS2Root() + QLatin1String("/msys2_shell.cmd");
 +        m_process->startDetached(cmd);
 +    }
 +    else if (UnixCommand::getLinuxDistro() == ectn_MOOOSLINUX && UnixCommand::hasTheExecutable(ctn_RXVT_TERMINAL))
@@ -41,7 +41,7 @@ index bec9273..eb4293c 100644
    {
 +    if (UnixCommand::getLinuxDistro() == ectn_MSYS2)
 +    {
-+      QString cmd = ctn_MSYS2_SH + UnixCommand::getMSYS2Root() + QLatin1String("/msys2_shell.bat -c ") + ftemp->fileName();
++      QString cmd = ctn_MSYS2_SH + UnixCommand::getMSYS2Root() + QLatin1String("/msys2_shell.cmd -c ") + ftemp->fileName();
 +      m_process->start(cmd);
 +    }
      if (UnixCommand::getLinuxDistro() == ectn_MOOOSLINUX && UnixCommand::hasTheExecutable(ctn_RXVT_TERMINAL))
diff --git a/mingw-w64-octopi-git/PKGBUILD b/mingw-w64-octopi-git/PKGBUILD
index be57d81d65..3ad33314e0 100644
--- a/mingw-w64-octopi-git/PKGBUILD
+++ b/mingw-w64-octopi-git/PKGBUILD
@@ -6,7 +6,7 @@ pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
 #_qmake=${MINGW_PREFIX}/bin/qmake
 _qmake=${MINGW_PREFIX}/qt5-static/bin/qmake
 pkgver=r941.6df0f8a
-pkgrel=1
+pkgrel=2
 pkgdesc="a powerful Pacman frontend using Qt libs"
 arch=('any')
 url="https://github.com/aarnt/octopi"
@@ -44,7 +44,7 @@ sha256sums=('SKIP'
             '99a4246e38a96276a14f7da0bb79374c15f4ab1748028e992fdc64482112f1c3'
             '9e64d07f0f941c093b45f2c131ddae46893438d1645713bff96d315c725959e9'
             '7c38e05e5908faa09bb0840392e5ec0c98c02a8c1a0cb1199057f8ea3265030a'
-            '6af97c6b4a50f70497c4499efc372c33eb8f8f0ae5207cd6a87ccf594770e18b'
+            'b600c77761b6bda9a031b38de854e2603e199c0ee3e2189821390540f82d05b6'
             'b8c98d973733ed8b0497b1e68321c3b3b2e6af335b01ae10a7aae50653cee6f2'
             '01aae57819d08db29be9408594a99d8bf92768966fd7fb199b5220e5a9d19ebe'
             'c85c4f1710300f3793946ced1039667723411d5a8e97731399b040e1337d1ff3')