From 6514497c4fe3c7ef8f7b81ca4a3be057227a56b7 Mon Sep 17 00:00:00 2001
From: Alexey Pavlov <alexpux@gmail.com>
Date: Mon, 6 Jul 2015 16:52:48 +0300
Subject: [PATCH] === Rebuild with GCC-5.1.0. Part III ===

---
 mingw-w64-cairo/PKGBUILD                      |  2 +-
 ...-GetHostTriple-for-mingw-w64-in-msys.patch | 27 +++++
 ...-x86-arch-name-to-i686-for-mingw-w64.patch | 26 +++++
 mingw-w64-clang/PKGBUILD                      | 37 ++++---
 ...asminfo-for-mingw-arm-and-cygwin-arm.patch |  2 +-
 mingw-w64-cmake/PKGBUILD                      | 14 +--
 mingw-w64-cppunit/PKGBUILD                    |  5 +-
 mingw-w64-gd/PKGBUILD                         |  4 +-
 mingw-w64-ghostscript/PKGBUILD                | 36 ++++---
 mingw-w64-librsvg/PKGBUILD                    | 18 ++--
 mingw-w64-libspectre/PKGBUILD                 | 15 +--
 mingw-w64-libvpx/PKGBUILD                     | 12 +--
 mingw-w64-libwmf/PKGBUILD                     | 23 ++---
 mingw-w64-pango/PKGBUILD                      |  2 +-
 mingw-w64-poppler-data/PKGBUILD               |  2 +-
 mingw-w64-poppler/PKGBUILD                    |  8 +-
 mingw-w64-python-babel/PKGBUILD               | 86 ++++++++++++++++
 mingw-w64-python-babel/babel-fix.patch        | 98 +++++++++++++++++++
 mingw-w64-python-colorama/PKGBUILD            | 78 +++++++++++++++
 mingw-w64-python-jinja/PKGBUILD               | 35 +++----
 mingw-w64-python-pygments/PKGBUILD            | 49 +++++-----
 mingw-w64-python-pytz/PKGBUILD                | 33 +++----
 mingw-w64-python-six/PKGBUILD                 | 18 ++--
 mingw-w64-python-snowballstemmer/PKGBUILD     | 75 ++++++++++++++
 .../PKGBUILD                                  | 75 ++++++++++++++
 mingw-w64-python-sphinx/PKGBUILD              | 63 ++++++++----
 mingw-w64-python-sphinx_rtd_theme/PKGBUILD    | 75 ++++++++++++++
 ...03-add-generator-header-installs.1.4.patch | 12 ---
 ...-many-files-to-installed-headers.1.4.patch |  6 +-
 ...tch => 0090-WIP-Xcode-generator.1.4.patch} |  7 +-
 ...091-Disable-WIP-Xcode-generator.1.4.patch} |  0
 mingw-w64-qbs/PKGBUILD                        | 56 ++++++-----
 .../002-qt-5.5-compatibility.patch            | 10 --
 mingw-w64-qtbinpatcher/PKGBUILD               | 13 +--
 mingw-w64-qtcreator/PKGBUILD                  |  4 +-
 mingw-w64-wxPython/001-mingw-python.patch     | 13 +++
 mingw-w64-wxPython/PKGBUILD                   | 13 +--
 mingw-w64-wxwidgets/PKGBUILD                  | 10 +-
 38 files changed, 805 insertions(+), 257 deletions(-)
 create mode 100644 mingw-w64-clang/0002-Fix-GetHostTriple-for-mingw-w64-in-msys.patch
 create mode 100644 mingw-w64-clang/0013-Set-the-x86-arch-name-to-i686-for-mingw-w64.patch
 create mode 100644 mingw-w64-python-babel/PKGBUILD
 create mode 100644 mingw-w64-python-babel/babel-fix.patch
 create mode 100644 mingw-w64-python-colorama/PKGBUILD
 create mode 100644 mingw-w64-python-snowballstemmer/PKGBUILD
 create mode 100644 mingw-w64-python-sphinx-alabaster-theme/PKGBUILD
 create mode 100644 mingw-w64-python-sphinx_rtd_theme/PKGBUILD
 rename mingw-w64-qbs/{0002-WIP-Xcode-generator.1.4.patch => 0090-WIP-Xcode-generator.1.4.patch} (99%)
 rename mingw-w64-qbs/{0009-Disable-WIP-Xcode-generator.1.4.patch => 0091-Disable-WIP-Xcode-generator.1.4.patch} (100%)
 delete mode 100644 mingw-w64-qtbinpatcher/002-qt-5.5-compatibility.patch

diff --git a/mingw-w64-cairo/PKGBUILD b/mingw-w64-cairo/PKGBUILD
index 8d49aeeaff..70ba545994 100644
--- a/mingw-w64-cairo/PKGBUILD
+++ b/mingw-w64-cairo/PKGBUILD
@@ -4,7 +4,7 @@
 _realname=cairo
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.14.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Cairo vector graphics library (mingw-w64)"
 arch=('any')
 url="http://cairographics.org"
diff --git a/mingw-w64-clang/0002-Fix-GetHostTriple-for-mingw-w64-in-msys.patch b/mingw-w64-clang/0002-Fix-GetHostTriple-for-mingw-w64-in-msys.patch
new file mode 100644
index 0000000000..a919a30e25
--- /dev/null
+++ b/mingw-w64-clang/0002-Fix-GetHostTriple-for-mingw-w64-in-msys.patch
@@ -0,0 +1,27 @@
+From 12d299345b51c1686c1d82986de6de020970bb57 Mon Sep 17 00:00:00 2001
+From: Martell Malone <martellmalone@gmail.com>
+Date: Sun, 28 Jun 2015 20:14:51 +0100
+Subject: [PATCH] Fix GetHostTriple for mingw-w64 in msys
+
+
+diff --git a/cmake/modules/GetHostTriple.cmake b/cmake/modules/GetHostTriple.cmake
+index 671a8ce..45c47e1 100644
+--- a/cmake/modules/GetHostTriple.cmake
++++ b/cmake/modules/GetHostTriple.cmake
+@@ -8,11 +8,11 @@ function( get_host_triple var )
+     else()
+       set( value "i686-pc-win32" )
+     endif()
+-  elseif( MINGW AND NOT MSYS )
++  elseif( MINGW )
+     if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
+       set( value "x86_64-w64-mingw32" )
+     else()
+-      set( value "i686-pc-mingw32" )
++      set( value "i686-w64-mingw32" )
+     endif()
+   else( MSVC )
+     set(config_guess ${LLVM_MAIN_SRC_DIR}/autoconf/config.guess)
+-- 
+2.4.5
+
diff --git a/mingw-w64-clang/0013-Set-the-x86-arch-name-to-i686-for-mingw-w64.patch b/mingw-w64-clang/0013-Set-the-x86-arch-name-to-i686-for-mingw-w64.patch
new file mode 100644
index 0000000000..90824a9c31
--- /dev/null
+++ b/mingw-w64-clang/0013-Set-the-x86-arch-name-to-i686-for-mingw-w64.patch
@@ -0,0 +1,26 @@
+From 57def79f5d6e97f5b353b22a5fb856e627cdf061 Mon Sep 17 00:00:00 2001
+From: Martell Malone <martellmalone@gmail.com>
+Date: Sun, 28 Jun 2015 19:12:19 +0100
+Subject: [PATCH] Set the x86 arch name to i686 for mingw-w64
+
+
+diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp
+index 5451132..a6852b6 100644
+--- a/lib/Driver/Driver.cpp
++++ b/lib/Driver/Driver.cpp
+@@ -1991,6 +1991,12 @@ static llvm::Triple computeTargetTriple(StringRef DefaultTargetTriple,
+ 
+     if (AT != llvm::Triple::UnknownArch && AT != Target.getArch())
+       Target.setArch(AT);
++
++  // Override the default ArchName of 'i386' for mingw-w64 targets when passed -m32.
++  if (AT == llvm::Triple::x86 && Target.isWindowsGNUEnvironment() &&
++      Target.getVendorName().equals(StringRef("w64")))
++    Target.setArchName(StringRef("i686"));
++
+   }
+ 
+   return Target;
+-- 
+2.4.5
+
diff --git a/mingw-w64-clang/PKGBUILD b/mingw-w64-clang/PKGBUILD
index adb34d3d86..b6b0302a00 100644
--- a/mingw-w64-clang/PKGBUILD
+++ b/mingw-w64-clang/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
          #"${MINGW_PACKAGE_PREFIX}-compiler-rt"
          )
 pkgver=3.6.1
-pkgrel=3
+pkgrel=4
 pkgdesc="LC language family frontend for LLVM (mingw-w64)"
 arch=('any')
 url="http://llvm.org"
@@ -19,17 +19,20 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
              "python2" "tar")
 depends=("${MINGW_PACKAGE_PREFIX}-gcc")
 options=('staticlibs' 'strip')
-source=(http://llvm.org/releases/$pkgver/llvm-$pkgver.src.tar.xz{,.sig}
-        http://llvm.org/releases/$pkgver/cfe-$pkgver.src.tar.xz{,.sig}
-        http://llvm.org/releases/$pkgver/compiler-rt-$pkgver.src.tar.xz{,.sig}
-        http://llvm.org/releases/$pkgver/test-suite-$pkgver.src.tar.xz{,.sig}
-        http://llvm.org/releases/$pkgver/libcxx-$pkgver.src.tar.xz{,.sig}
-        http://llvm.org/releases/$pkgver/clang-tools-extra-$pkgver.src.tar.xz{,.sig}
-        http://llvm.org/releases/$pkgver/lldb-$pkgver.src.tar.xz{,.sig}
+source=(http://llvm.org/releases/${pkgver}/llvm-${pkgver}.src.tar.xz{,.sig}
+        http://llvm.org/releases/${pkgver}/cfe-${pkgver}.src.tar.xz{,.sig}
+        http://llvm.org/releases/${pkgver}/compiler-rt-${pkgver}.src.tar.xz{,.sig}
+        http://llvm.org/releases/${pkgver}/test-suite-${pkgver}.src.tar.xz{,.sig}
+        http://llvm.org/releases/${pkgver}/libcxx-${pkgver}.src.tar.xz{,.sig}
+        http://llvm.org/releases/${pkgver}/clang-tools-extra-${pkgver}.src.tar.xz{,.sig}
+        http://llvm.org/releases/${pkgver}/lldb-${pkgver}.src.tar.xz{,.sig}
         asminfo-for-mingw-arm-and-cygwin-arm.patch
         clang-mingw-driver.patch
         mingw-arm-and-cygwin-arm-target.patch
-        llvm-3.5.0-fix-cmake-llvm-exports.patch)
+        llvm-3.5.0-fix-cmake-llvm-exports.patch
+        0002-Fix-GetHostTriple-for-mingw-w64-in-msys.patch
+        0013-Set-the-x86-arch-name-to-i686-for-mingw-w64.patch
+        )
 sha256sums=('2f00c615913aa0b56607ee1548936e60ad2aa89e6d56f23fb032a4463366fc7a'
             'SKIP'
             '74f92d0c93b86678b015e87655f59474b2f657769680efdeb3c0524ffbd2dad7'
@@ -44,16 +47,18 @@ sha256sums=('2f00c615913aa0b56607ee1548936e60ad2aa89e6d56f23fb032a4463366fc7a'
             'SKIP'
             'cefb5c64e78e85ad05a06b80f017ccfe1208b74d3da34eb425c505c6fef9aaba'
             'SKIP'
-            'd52e3c0226bbedac412a69ac0cbb58f26c5546820240f59fa1dbb8e825ff7b6b'
+            'b37ad0edb84ef13e0750c7f8d41441363859928cb9133d05f248afa41f44fc93'
             '7c9366df58b27378c104d37466caa761873440e5fbee707d3d22693add5d2cdb'
             '5727fb67902b9cb3ef4e1c57bf16128076911b8bf58357f65e5c5201a6b59629'
-            '841a153d0e9d2d196ea5318388ff295e69c41547eb73b24edf92a1b2cc3cccdd')
+            '841a153d0e9d2d196ea5318388ff295e69c41547eb73b24edf92a1b2cc3cccdd'
+            '0804146b32138d55c611336cc81e1783c29a8fab0fe62f248ba1ad7acc711c4d'
+            '13a95a61e9c1c44c18a69947734e07515332a549446394f48b86b52511d221de')
 
 validpgpkeys=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D')
 noextract=(cfe-${pkgver}.src.tar.xz
-           libcxx-$pkgver.src.tar.xz
-           lldb-$pkgver.src.tar.xz
-           test-suite-$pkgver.src.tar.xz)
+           libcxx-${pkgver}.src.tar.xz
+           lldb-${pkgver}.src.tar.xz
+           test-suite-${pkgver}.src.tar.xz)
 
 prepare() {
   plain "Extracting clang-${pkgver}.src.tar.xz due to symlink(s) without pre-existing target(s)"
@@ -61,11 +66,13 @@ prepare() {
   [[ -d ${srcdir}/cfe-${pkgver} ]] || tar -xJvf ${srcdir}/cfe-${pkgver}.src.tar.xz -C ${srcdir} || true
 
   cd "${srcdir}/llvm-${pkgver}.src"
-  patch -p1 -i ${srcdir}/asminfo-for-mingw-arm-and-cygwin-arm
+  patch -p1 -i ${srcdir}/asminfo-for-mingw-arm-and-cygwin-arm.patch
+  patch -p1 -i ${srcdir}/0002-Fix-GetHostTriple-for-mingw-w64-in-msys.patch
 
   cd "${srcdir}/cfe-${pkgver}.src"
   patch -p1 -i ${srcdir}/clang-mingw-driver.patch
   patch -p1 -i ${srcdir}/mingw-arm-and-cygwin-arm-target.patch
+  patch -p1 -i ${srcdir}/0013-Set-the-x86-arch-name-to-i686-for-mingw-w64.patch
 
   mv "${srcdir}/llvm-${pkgver}.src" "$srcdir/llvm-${pkgver}"
   cd "${srcdir}/llvm-${pkgver}"
diff --git a/mingw-w64-clang/asminfo-for-mingw-arm-and-cygwin-arm.patch b/mingw-w64-clang/asminfo-for-mingw-arm-and-cygwin-arm.patch
index 0ee55a1a61..25239bd098 100644
--- a/mingw-w64-clang/asminfo-for-mingw-arm-and-cygwin-arm.patch
+++ b/mingw-w64-clang/asminfo-for-mingw-arm-and-cygwin-arm.patch
@@ -11,7 +11,7 @@ index 92c4d6a..e518d2e 100644
 @@ -282,7 +282,9 @@ static MCAsmInfo *createARMMCAsmInfo(const MCRegisterInfo &MRI,
    MCAsmInfo *MAI;
    if (TheTriple.isOSDarwin() || TheTriple.isOSBinFormatMachO())
-     MAI = new ARMMCAsmInfoDarwin(TheTriple);
+     MAI = new ARMMCAsmInfoDarwin(TT);
 -  else if (TheTriple.isWindowsItaniumEnvironment())
 +  else if (TheTriple.isWindowsItaniumEnvironment() ||
 +           TheTriple.isWindowsGNUEnvironment() ||
diff --git a/mingw-w64-cmake/PKGBUILD b/mingw-w64-cmake/PKGBUILD
index f2f60cb1a6..a26146dc92 100644
--- a/mingw-w64-cmake/PKGBUILD
+++ b/mingw-w64-cmake/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=cmake
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=3.2.3
-pkgrel=3
+pkgrel=4
 pkgdesc="A cross-platform open-source make system (mingw-w64)."
 arch=('any')
 url="http://www.cmake.org/"
@@ -12,13 +12,13 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
              "${MINGW_PACKAGE_PREFIX}-pkg-config"
              "${MINGW_PACKAGE_PREFIX}-qt5")
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
-        "${MINGW_PACKAGE_PREFIX}-curl"
-        "${MINGW_PACKAGE_PREFIX}-expat"
-        "${MINGW_PACKAGE_PREFIX}-jsoncpp"
-        "${MINGW_PACKAGE_PREFIX}-libarchive"
-        "${MINGW_PACKAGE_PREFIX}-zlib")
+         "${MINGW_PACKAGE_PREFIX}-curl"
+         "${MINGW_PACKAGE_PREFIX}-expat"
+         "${MINGW_PACKAGE_PREFIX}-jsoncpp"
+         "${MINGW_PACKAGE_PREFIX}-libarchive"
+         "${MINGW_PACKAGE_PREFIX}-zlib")
 optdepends=("${MINGW_PACKAGE_PREFIX}-qt5: CMake Qt GUI")
-options=('staticlibs') # '!strip' 'debug')
+options=('staticlibs') # '!strip' 'debug'
 source=("http://www.cmake.org/files/v${pkgver%.*}/${_realname}-${pkgver}.tar.gz"
         "disable-response-files-for-msys.patch"
         "dont-install-bundle.patch"
diff --git a/mingw-w64-cppunit/PKGBUILD b/mingw-w64-cppunit/PKGBUILD
index d297e1e34c..9ab0101263 100644
--- a/mingw-w64-cppunit/PKGBUILD
+++ b/mingw-w64-cppunit/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=cppunit
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.13.2
-pkgrel=3
+pkgrel=4
 pkgdesc="A C++ unit testing framework (mingw-w64)"
 arch=('any')
 url="http://www.freedesktop.org/wiki/Software/cppunit"
@@ -15,6 +15,7 @@ source=("http://dev-www.libreoffice.org/src/${_realname}-${pkgver}.tar.gz")
 md5sums=('d1c6bdd5a76c66d2c38331e2d287bc01')
 
 build() {
+  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
   mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST}
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
@@ -28,5 +29,5 @@ build() {
 
 package() {
   cd "${srcdir}/build-${MINGW_CHOST}"
-  make DESTDIR="$pkgdir" install
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/mingw-w64-gd/PKGBUILD b/mingw-w64-gd/PKGBUILD
index 386d1df1be..d54add36c2 100644
--- a/mingw-w64-gd/PKGBUILD
+++ b/mingw-w64-gd/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=gd
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=2.1.1
-pkgrel=2
+pkgrel=3
 pkgdesc='Library for the dynamic creation of images by programmers (mingw-w64)'
 url='http://www.libgd.org/'
 arch=('any')
@@ -46,7 +46,7 @@ build() {
 
 package() {
   cd "${srcdir}/build-${MINGW_CHOST}"
-  make -j1 DESTDIR="$pkgdir" install
+  make -j1 DESTDIR="${pkgdir}" install
   
   install -Dm644 ${srcdir}/libgd-${pkgver}/COPYING ${pkgdir}${MINGW_PREFIX}/share/licenses/libgd/LICENSE
 }
diff --git a/mingw-w64-ghostscript/PKGBUILD b/mingw-w64-ghostscript/PKGBUILD
index 8a41ebd639..ca0f7f6e7f 100644
--- a/mingw-w64-ghostscript/PKGBUILD
+++ b/mingw-w64-ghostscript/PKGBUILD
@@ -3,26 +3,24 @@
 _realname=ghostscript
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=9.15
-pkgrel=2
+pkgrel=3
 arch=('any')
 groups=("${MINGW_PACKAGE_PREFIX}")
 license=('AGPL' 'custom')
 pkgdesc="An interpreter for the PostScript language (mingw-w64)"
-depends=(
-        "${MINGW_PACKAGE_PREFIX}-freetype"
-        "${MINGW_PACKAGE_PREFIX}-fontconfig"
-        "${MINGW_PACKAGE_PREFIX}-jasper"
-        "${MINGW_PACKAGE_PREFIX}-zlib"
-        "${MINGW_PACKAGE_PREFIX}-libpng>=1.5.7"
-        "${MINGW_PACKAGE_PREFIX}-libjpeg"
-        "${MINGW_PACKAGE_PREFIX}-libtiff>=4.0.0"
-        "${MINGW_PACKAGE_PREFIX}-lcms2"
-        "${MINGW_PACKAGE_PREFIX}-dbus"
-        "${MINGW_PACKAGE_PREFIX}-openjpeg"
-        "${MINGW_PACKAGE_PREFIX}-gdk-pixbuf2"
-        )
+depends=("${MINGW_PACKAGE_PREFIX}-dbus"
+         "${MINGW_PACKAGE_PREFIX}-freetype"
+         "${MINGW_PACKAGE_PREFIX}-fontconfig"
+         "${MINGW_PACKAGE_PREFIX}-gdk-pixbuf2"
+         "${MINGW_PACKAGE_PREFIX}-jasper"
+         "${MINGW_PACKAGE_PREFIX}-libpng"
+         "${MINGW_PACKAGE_PREFIX}-libjpeg"
+         "${MINGW_PACKAGE_PREFIX}-libtiff"
+         "${MINGW_PACKAGE_PREFIX}-lcms2"
+         "${MINGW_PACKAGE_PREFIX}-openjpeg"
+         "${MINGW_PACKAGE_PREFIX}-zlib")
 makedepends=("${MINGW_PACKAGE_PREFIX}-gtk3" "${MINGW_PACKAGE_PREFIX}-gnutls")
-optdepends=("${MINGW_PACKAGE_PREFIX}-gtk3:          needed for gsx")
+optdepends=("${MINGW_PACKAGE_PREFIX}-gtk3: needed for gsx")
 url="http://www.ghostscript.com/"
 source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2
         mingw-build.patch
@@ -35,7 +33,7 @@ md5sums=('0ee21d975c67a4883ba66bcc332418f5'
          '1fddb43d7ec2cd90a38291e6410d108d')
 
 prepare() {
-  cd "$srcdir/${_realname}-$pkgver"
+  cd "${srcdir}/${_realname}-${pkgver}"
   patch -p1 -i ${srcdir}/mingw-build.patch
   patch -p1 -i ${srcdir}/ghostscript-sys-zlib.patch
   patch -p1 -i ${srcdir}/libspectre.patch
@@ -52,7 +50,7 @@ prepare() {
 
 build()
 {
-  cd ${srcdir}/${_realname}-$pkgver
+  cd ${srcdir}/${_realname}-${pkgver}
   ./configure \
     --prefix=${MINGW_PREFIX} \
     --host=${MINGW_CHOST} \
@@ -72,8 +70,8 @@ build()
 }
 
 package() {
-  cd ${srcdir}/${_realname}-$pkgver
-  make DESTDIR="$pkgdir" soinstall
+  cd ${srcdir}/${_realname}-${pkgver}
+  make DESTDIR="${pkgdir}" soinstall
 
   # install missing doc files # http://bugs.archlinux.org/task/18023
   install -m 644 "${srcdir}"/${_realname}-${pkgver}/doc/{Ps2ps2.htm,gs-vms.hlp,gsdoc.el,pscet_status.txt} "${pkgdir}${MINGW_PREFIX}"/share/${_realname}/$pkgver/doc/
diff --git a/mingw-w64-librsvg/PKGBUILD b/mingw-w64-librsvg/PKGBUILD
index 7b6d6726d9..54a03ef8f0 100644
--- a/mingw-w64-librsvg/PKGBUILD
+++ b/mingw-w64-librsvg/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=librsvg
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=2.40.9
-pkgrel=1
+pkgrel=2
 pkgdesc="A SVG viewing library (mingw-w64)"
 arch=('any')
 url="https://live.gnome.org/LibRsvg"
@@ -14,10 +14,12 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
             "${MINGW_PACKAGE_PREFIX}-gobject-introspection"
             "${MINGW_PACKAGE_PREFIX}-vala"
             "setconf")
-depends=("${MINGW_PACKAGE_PREFIX}-gdk-pixbuf2" "${MINGW_PACKAGE_PREFIX}-pango" "${MINGW_PACKAGE_PREFIX}-libcroco")
+depends=("${MINGW_PACKAGE_PREFIX}-gdk-pixbuf2"
+         "${MINGW_PACKAGE_PREFIX}-pango"
+         "${MINGW_PACKAGE_PREFIX}-libcroco")
 optdepends=("${MINGW_PACKAGE_PREFIX}-gtk3: for rsvg-view-3")
 options=('staticlibs' 'strip')
-source=("http://ftp.gnome.org/pub/gnome/sources/librsvg/${pkgver%.*}/${_realname}-$pkgver.tar.xz"
+source=("http://ftp.gnome.org/pub/gnome/sources/librsvg/${pkgver%.*}/${_realname}-${pkgver}.tar.xz"
         "0001-give-cc-to-gir-scanner.mingw.patch"
         "0005-hack-unixy-paths.patch")
 sha256sums=('13964c5d35357552b47d365c34215eee0a63bf0e6059b689f048648c6bf5f43a'
@@ -25,17 +27,17 @@ sha256sums=('13964c5d35357552b47d365c34215eee0a63bf0e6059b689f048648c6bf5f43a'
             'b23b094c0cb65fcbbbb952350448de6f3430b30f273e05acdbf7a56d634212dc')
 
 prepare() {
-  cd "$srcdir/${_realname}-$pkgver"
+  cd "${srcdir}/${_realname}-${pkgver}"
 
-  patch -p1 -i "$srcdir/0001-give-cc-to-gir-scanner.mingw.patch"
-  patch -p1 -i "$srcdir/0005-hack-unixy-paths.patch"
+  patch -p1 -i "${srcdir}/0001-give-cc-to-gir-scanner.mingw.patch"
+  patch -p1 -i "${srcdir}/0005-hack-unixy-paths.patch"
 
   autoreconf -fi
 }
 
 build() {
   [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
-  cp -r ${srcdir}/${_realname}-$pkgver "${srcdir}/build-${MINGW_CHOST}"
+  cp -r ${srcdir}/${_realname}-${pkgver} "${srcdir}/build-${MINGW_CHOST}"
   #mkdir -p "${srcdir}/build-${MINGW_CHOST}"
   cd "${srcdir}/build-${MINGW_CHOST}"
   CXXFLAGS+=" -D_POSIX_SOURCE"
@@ -53,7 +55,7 @@ build() {
 
 package() {
   cd "${srcdir}/build-${MINGW_CHOST}"
-  make DESTDIR="$pkgdir" install
+  make DESTDIR="${pkgdir}" install
 
   install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"
 }
diff --git a/mingw-w64-libspectre/PKGBUILD b/mingw-w64-libspectre/PKGBUILD
index a9da693cc5..a299a92871 100644
--- a/mingw-w64-libspectre/PKGBUILD
+++ b/mingw-w64-libspectre/PKGBUILD
@@ -3,22 +3,22 @@
 _realname=libspectre
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.2.7
-pkgrel=1
+pkgrel=2
 arch=('any')
-pkgdesc="libspectre is a small library for rendering PostScript documents. It provides a convenient easy to use API for handling and rendering PostScript documents. (mingw-w64)"
+pkgdesc="libspectre is a small library for rendering PostScript documents. It provides a convenient easy to use API for handling and rendering PostScript documents (mingw-w64)"
 depends=("${MINGW_PACKAGE_PREFIX}-ghostscript"
          "${MINGW_PACKAGE_PREFIX}-cairo")
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
+            "${MINGW_PACKAGE_PREFIX}-libidn"
+            "${MINGW_PACKAGE_PREFIX}-pkg-config"
             "libtool"
             "automake-wrapper"
             "autoconf"
-            "${MINGW_PACKAGE_PREFIX}-pkg-config"
-            "${MINGW_PACKAGE_PREFIX}-libidn"
             "make")
 options=('strip' 'staticlibs')
 license=("GPL 2")
 url="http://libspectre.freedesktop.org/"
-source=(http://libspectre.freedesktop.org/releases/${_realname}-$pkgver.tar.gz)
+source=(http://libspectre.freedesktop.org/releases/${_realname}-${pkgver}.tar.gz)
 sha256sums=('e81b822a106beed14cf0fec70f1b890c690c2ffa150fa2eee41dc26518a6c3ec')
 
 prepare() {
@@ -37,10 +37,11 @@ build() {
     --build=${MINGW_CHOST} \
     --prefix=${MINGW_PREFIX} \
     --libexecdir=${MINGW_PREFIX}/lib
+
   make
 }
 
 package() {
-  cd "$srcdir/build-${MINGW_CHOST}"
-  make DESTDIR=$pkgdir install
+  cd "${srcdir}/build-${MINGW_CHOST}"
+  make DESTDIR=${pkgdir} install
 }
diff --git a/mingw-w64-libvpx/PKGBUILD b/mingw-w64-libvpx/PKGBUILD
index c1d6a46285..519a16ad3e 100644
--- a/mingw-w64-libvpx/PKGBUILD
+++ b/mingw-w64-libvpx/PKGBUILD
@@ -3,13 +3,13 @@
 _realname=libvpx
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="The VP8 Codec SDK (mingw-w64)"
 arch=('any')
 license=('BSD')
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-yasm")
 url=('http://www.webmproject.org/')
-source=(https://github.com/webmproject/libvpx/archive/v${pkgver}.tar.gz
+source=(${_realname}-${pkgver}.tar.gz::https://github.com/webmproject/libvpx/archive/v${pkgver}.tar.gz
         0001-enable-shared-on.mingw.patch
         0002-no-pthreads.mingw.patch
         0003-cross-with-native-binutils.mingw.patch
@@ -26,7 +26,7 @@ md5sums=('9e82cdcb2d2146f812b71c8a7a2686a3'
          '1a5f3e0e8ff8126fbfd8bb133e7e1c87')
 
 prepare() {
-  cd ${srcdir}/$_realname-$pkgver
+  cd ${srcdir}/${_realname}-${pkgver}
 
   patch -Np1 -i ${srcdir}/0001-enable-shared-on.mingw.patch
   patch -Np1 -i ${srcdir}/0002-no-pthreads.mingw.patch
@@ -42,9 +42,9 @@ build() {
   else
     _targetarch="x86_64-win64-gcc"
   fi
-  mkdir -p $srcdir/build-$MINGW_CHOST
-  cd "$srcdir/build-$MINGW_CHOST"
-  ../$_realname-$pkgver/configure \
+  mkdir -p ${srcdir}/build-${MINGW_CHOST}
+  cd "${srcdir}/build-${MINGW_CHOST}"
+  ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --target=${_targetarch} \
     --enable-vp8 \
diff --git a/mingw-w64-libwmf/PKGBUILD b/mingw-w64-libwmf/PKGBUILD
index 78f3498f96..8bf04621bf 100644
--- a/mingw-w64-libwmf/PKGBUILD
+++ b/mingw-w64-libwmf/PKGBUILD
@@ -1,27 +1,24 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 _realname=libwmf
-
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.2.8.4
-pkgrel=2
+pkgrel=3
 pkgdesc="Library for Converting Metafile Images (mingw-w64)"
 arch=('any')
 url="http://wvWare.sourceforge.net"
 license=("GPL" "LGPL")
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
-    "${MINGW_PACKAGE_PREFIX}-pkg-config"
-    "libtool"
-    )
+             "${MINGW_PACKAGE_PREFIX}-gtk2"
+             "${MINGW_PACKAGE_PREFIX}-pkg-config"
+             "libtool")
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
-    "${MINGW_PACKAGE_PREFIX}-freetype"
-    "${MINGW_PACKAGE_PREFIX}-gdk-pixbuf2"
-    "${MINGW_PACKAGE_PREFIX}-gtk2"
-    "${MINGW_PACKAGE_PREFIX}-libjpeg"
-    "${MINGW_PACKAGE_PREFIX}-libpng"
-    "${MINGW_PACKAGE_PREFIX}-libxml2"
-    "${MINGW_PACKAGE_PREFIX}-zlib"
-    )
+         "${MINGW_PACKAGE_PREFIX}-freetype"
+         "${MINGW_PACKAGE_PREFIX}-gdk-pixbuf2"
+         "${MINGW_PACKAGE_PREFIX}-libjpeg"
+         "${MINGW_PACKAGE_PREFIX}-libpng"
+         "${MINGW_PACKAGE_PREFIX}-libxml2"
+         "${MINGW_PACKAGE_PREFIX}-zlib")
 options=('strip' 'staticlibs')
 source=(http://downloads.sourceforge.net/wvware/libwmf-${pkgver}.tar.gz
     libwmf-0.2.8.4-libpng.patch)
diff --git a/mingw-w64-pango/PKGBUILD b/mingw-w64-pango/PKGBUILD
index 9822bfb2f8..0afffdc176 100644
--- a/mingw-w64-pango/PKGBUILD
+++ b/mingw-w64-pango/PKGBUILD
@@ -4,7 +4,7 @@
 _realname=pango
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.37.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A library for layout and rendering of text (mingw-w64)"
 arch=('any')
 url="http://www.pango.org"
diff --git a/mingw-w64-poppler-data/PKGBUILD b/mingw-w64-poppler-data/PKGBUILD
index 76e52b27d9..f6fe05d1a1 100644
--- a/mingw-w64-poppler-data/PKGBUILD
+++ b/mingw-w64-poppler-data/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=poppler-data
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.4.7
-pkgrel=1
+pkgrel=2
 pkgdesc="Encoding data for the poppler PDF rendering library"
 arch=('any')
 license=('custom' 'GPL2')
diff --git a/mingw-w64-poppler/PKGBUILD b/mingw-w64-poppler/PKGBUILD
index 091219fa50..aafc5274e4 100644
--- a/mingw-w64-poppler/PKGBUILD
+++ b/mingw-w64-poppler/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=poppler
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.33.0
-pkgrel=1
+pkgrel=2
 pkgdesc="PDF rendering library based on xpdf 3.0 (mingw-w64)"
 arch=('any')
 url="http://poppler.freedesktop.org"
@@ -26,13 +26,13 @@ depends=("${MINGW_PACKAGE_PREFIX}-cairo"
 optdepends=("${MINGW_PACKAGE_PREFIX}-glib2: libpoppler-glib"
             "${MINGW_PACKAGE_PREFIX}-qt5: libpoppler-qt5")
 options=('strip' 'staticlibs')
-source=("http://poppler.freedesktop.org/poppler-${pkgver}.tar.xz"
+source=("http://poppler.freedesktop.org/${_realname}-${pkgver}.tar.xz"
         "give-cc-to-gir-scanner.mingw.patch")
 md5sums=('69927d1614d6704021c0b0dd0ee6a852'
          '727c1b414987f6ee2ba841d9db57a967')
 
 prepare() {
-  cd "$srcdir/poppler-$pkgver"
+  cd "${srcdir}/${_realname}-${pkgver}"
   patch -p1 -i "$srcdir/give-cc-to-gir-scanner.mingw.patch"
   #sed -i -e '/AC_PATH_XTRA/d' configure.ac
   #sed -i "s:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:" configure.ac
@@ -59,5 +59,5 @@ build() {
 
 package() {
   cd "${srcdir}/build-${MINGW_CHOST}"
-  make DESTDIR="$pkgdir" install
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/mingw-w64-python-babel/PKGBUILD b/mingw-w64-python-babel/PKGBUILD
new file mode 100644
index 0000000000..a9c3136129
--- /dev/null
+++ b/mingw-w64-python-babel/PKGBUILD
@@ -0,0 +1,86 @@
+# Maintainer: Alexey Pavlov <alexpux@gmail.com>
+
+_realname=babel
+pkgname=("${MINGW_PACKAGE_PREFIX}-python2-$_realname" "${MINGW_PACKAGE_PREFIX}-python3-$_realname")
+pkgver=1.3
+pkgrel=1
+pkgdesc="A collection of tools for internationalizing Python applications"
+url="http://babel.pocoo.org/"
+license=("BSD")
+arch=('any')
+makedepends=("${MINGW_PACKAGE_PREFIX}-python2-setuptools"
+             "${MINGW_PACKAGE_PREFIX}-python3-setuptools"
+             "${MINGW_PACKAGE_PREFIX}-python2-pytz"
+             "${MINGW_PACKAGE_PREFIX}-python3-pytz")
+source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/mitsuhiko/babel/archive/${pkgver}.tar.gz"
+        babel-fix.patch)
+md5sums=('752ecd661a4002d64ba07384404a2988'
+         '6fdce5263b6010a3d6d922df92360b74')
+
+prepare() {
+  cd ${srcdir}/${_realname}-${pkgver}
+  patch -p1 -i ${srcdir}/babel-fix.patch
+
+  cd ${srcdir}
+  cp -r ${_realname}-${pkgver} build-python2
+  cp -r ${_realname}-${pkgver} build-python3
+}
+
+package_python3-babel() {
+  depends=("${MINGW_PACKAGE_PREFIX}-python3-pytz")
+
+  cd ${srcdir}/build-python3
+  ${MINGW_PREFIX}/bin/python3 setup.py import_cldr
+  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
+  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}"
+
+  install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+
+  local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
+  # fix python command in files
+  for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*.py; do
+    sed -e "s|${PREFIX_WIN}/bin/|/usr/bin/env |g" -i ${_f}
+  done
+}
+
+package_python2-babel() {
+  depends=("${MINGW_PACKAGE_PREFIX}-python2-pytz")
+
+  cd ${srcdir}/build-python2
+  ${MINGW_PREFIX}/bin/python2 setup.py import_cldr
+  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
+  ${MINGW_PREFIX}/bin/python2 setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}"
+
+  install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/python2-${_realname}/LICENSE"
+
+  local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
+  # fix python command in files
+  for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*.py; do
+    sed -e "s|${PREFIX_WIN}/bin/|/usr/bin/env |g" -i ${_f}
+  done
+
+  for f in pybabel; do
+    mv "${pkgdir}${MINGW_PREFIX}"/bin/${f}{,2}.exe
+    if [ -f "${pkgdir}${MINGW_PREFIX}"/bin/${f}.exe.manifest ]; then
+      mv "${pkgdir}${MINGW_PREFIX}"/bin/${f}{,2}.exe.manifest
+      sed -e "s|${f}|${f}2|g" -i "${pkgdir}${MINGW_PREFIX}"/bin/${f}2.exe.manifest
+    fi
+    mv "${pkgdir}${MINGW_PREFIX}"/bin/${f}{,2}-script.py
+  done
+}
+
+package_mingw-w64-i686-python2-babel() {
+  package_python2-babel
+}
+
+package_mingw-w64-i686-python3-babel() {
+  package_python3-babel
+}
+
+package_mingw-w64-x86_64-python2-babel() {
+  package_python2-babel
+}
+
+package_mingw-w64-x86_64-python3-babel() {
+  package_python3-babel
+}
diff --git a/mingw-w64-python-babel/babel-fix.patch b/mingw-w64-python-babel/babel-fix.patch
new file mode 100644
index 0000000000..1b1ec3ac91
--- /dev/null
+++ b/mingw-w64-python-babel/babel-fix.patch
@@ -0,0 +1,98 @@
+diff -Naur babel-1.3-orig/babel/localtime/_win32.py babel-1.3/babel/localtime/_win32.py
+--- babel-1.3-orig/babel/localtime/_win32.py	2013-07-29 15:33:20.000000000 +0400
++++ babel-1.3/babel/localtime/_win32.py	2015-07-06 09:12:35.343528600 +0300
+@@ -10,8 +10,14 @@
+ import pytz
+ 
+ 
+-tz_names = get_global('windows_zone_mapping')
+-
++# When building the cldr data on windows this module gets imported.
++# Because at that point there is no global.dat yet this call will
++# fail.  We want to catch it down in that case then and just assume
++# the mapping was empty.
++try:
++    tz_names = get_global('windows_zone_mapping')
++except RuntimeError:
++    tz_names = {}
+ 
+ def valuestodict(key):
+     """Convert a registry key's values to a dictionary."""
+diff -Naur babel-1.3-orig/babel/messages/frontend.py babel-1.3/babel/messages/frontend.py
+--- babel-1.3-orig/babel/messages/frontend.py	2013-07-29 15:33:20.000000000 +0400
++++ babel-1.3/babel/messages/frontend.py	2015-07-06 09:19:44.621596500 +0300
+@@ -128,7 +128,7 @@
+ 
+         for idx, (locale, po_file) in enumerate(po_files):
+             mo_file = mo_files[idx]
+-            infile = open(po_file, 'r')
++            infile = open(po_file, 'rb')
+             try:
+                 catalog = read_po(infile, locale)
+             finally:
+@@ -439,7 +439,7 @@
+         log.info('creating catalog %r based on %r', self.output_file,
+                  self.input_file)
+ 
+-        infile = open(self.input_file, 'r')
++        infile = open(self.input_file, 'rb')
+         try:
+             # Although reading from the catalog template, read_po must be fed
+             # the locale in order to correctly calculate plurals
+@@ -554,7 +554,7 @@
+         if not domain:
+             domain = os.path.splitext(os.path.basename(self.input_file))[0]
+ 
+-        infile = open(self.input_file, 'U')
++        infile = open(self.input_file, 'rb')
+         try:
+             template = read_po(infile)
+         finally:
+@@ -566,7 +566,7 @@
+         for locale, filename in po_files:
+             log.info('updating catalog %r based on %r', filename,
+                      self.input_file)
+-            infile = open(filename, 'U')
++            infile = open(filename, 'rb')
+             try:
+                 catalog = read_po(infile, locale=locale, domain=domain)
+             finally:
+@@ -577,7 +577,7 @@
+             tmpname = os.path.join(os.path.dirname(filename),
+                                    tempfile.gettempprefix() +
+                                    os.path.basename(filename))
+-            tmpfile = open(tmpname, 'w')
++            tmpfile = open(tmpname, 'wb')
+             try:
+                 try:
+                     write_po(tmpfile, catalog,
+@@ -760,7 +760,7 @@
+ 
+         for idx, (locale, po_file) in enumerate(po_files):
+             mo_file = mo_files[idx]
+-            infile = open(po_file, 'r')
++            infile = open(po_file, 'rb')
+             try:
+                 catalog = read_po(infile, locale)
+             finally:
+@@ -1121,7 +1121,7 @@
+             tmpname = os.path.join(os.path.dirname(filename),
+                                    tempfile.gettempprefix() +
+                                    os.path.basename(filename))
+-            tmpfile = open(tmpname, 'w')
++            tmpfile = open(tmpname, 'wb')
+             try:
+                 try:
+                     write_po(tmpfile, catalog,
+diff -Naur babel-1.3-orig/babel/numbers.py babel-1.3/babel/numbers.py
+--- babel-1.3-orig/babel/numbers.py	2013-07-29 15:33:20.000000000 +0400
++++ babel-1.3/babel/numbers.py	2015-07-06 09:16:30.100050600 +0300
+@@ -303,7 +303,7 @@
+ 
+ 
+ PREFIX_END = r'[^0-9@#.,]'
+-NUMBER_TOKEN = r'[0-9@#.\-,E+]'
++NUMBER_TOKEN = r'[0-9@#.,E+]'
+ 
+ PREFIX_PATTERN = r"(?P<prefix>(?:'[^']*'|%s)*)" % PREFIX_END
+ NUMBER_PATTERN = r"(?P<number>%s+)" % NUMBER_TOKEN
diff --git a/mingw-w64-python-colorama/PKGBUILD b/mingw-w64-python-colorama/PKGBUILD
new file mode 100644
index 0000000000..589e4e6fee
--- /dev/null
+++ b/mingw-w64-python-colorama/PKGBUILD
@@ -0,0 +1,78 @@
+# Maintainer: Alexey Pavlov <Alexpux@gmail.com>
+# Contributor: Ray Donnelly <mingw.android@gmail.com>
+
+_realname=colorama
+pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgver=0.3.3
+pkgrel=1
+pkgdesc="Python API for cross-platform colored terminal text (mingw-w64)"
+arch=('any')
+license=('BSD')
+url="http://pypi.python.org/pypi/colorama"
+makedepends=("${MINGW_PACKAGE_PREFIX}-python2-setuptools"
+             "${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python2-nose"
+              "${MINGW_PACKAGE_PREFIX}-python3-nose")
+options=('staticlibs')
+source=(https://pypi.python.org/packages/source/c/colorama/colorama-${pkgver}.tar.gz)
+md5sums=('a56b8dc55158a41ab3c89c4c8feb8824')
+
+prepare() {
+  cd ${srcdir}
+  cp -r colorama-${pkgver} python2-build
+  cp -r colorama-${pkgver} python3-build
+}
+
+build() {
+  cd "${srcdir}"
+  for builddir in python{2,3}-build; do
+    pushd ${builddir}
+    ${MINGW_PREFIX}/bin/${builddir%-build} setup.py build
+    popd
+  done
+}
+
+check() {
+  cd "${srcdir}"
+  for builddir in python{2,3}-build; do
+    pushd ${builddir}
+    ${MINGW_PREFIX}/bin/${builddir%-build} py.test
+    popd
+  done
+}
+
+package_python2-colorama() {
+  depends=("${MINGW_PACKAGE_PREFIX}-python2")
+
+  cd "${srcdir}/python2-build"
+  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
+    ${MINGW_PREFIX}/bin/python2 setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1
+
+  install -Dm644 LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python2-${_realname}/COPYING"
+}
+
+package_python3-colorama() {
+  depends=("${MINGW_PACKAGE_PREFIX}-python3")
+
+  cd "${srcdir}/python3-build"
+  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
+    ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1
+
+  install -Dm644 LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/COPYING"
+}
+
+package_mingw-w64-i686-python2-colorama() {
+  package_python2-colorama
+}
+
+package_mingw-w64-i686-python3-colorama() {
+  package_python3-colorama
+}
+
+package_mingw-w64-x86_64-python2-colorama() {
+  package_python2-colorama
+}
+
+package_mingw-w64-x86_64-python3-colorama() {
+  package_python3-colorama
+}
diff --git a/mingw-w64-python-jinja/PKGBUILD b/mingw-w64-python-jinja/PKGBUILD
index c649b64d5a..c1d8206c92 100644
--- a/mingw-w64-python-jinja/PKGBUILD
+++ b/mingw-w64-python-jinja/PKGBUILD
@@ -1,28 +1,25 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 _realname=jinja
-
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=2.7.2
-pkgrel=2
+pkgver=2.7.3
+pkgrel=1
 pkgdesc="A simple pythonic template language written in Python (mingw-w64)"
 arch=('any')
 license=('BSD')
 url="http://jinja.pocoo.org/"
-makedepends=(
-  "${MINGW_PACKAGE_PREFIX}-python3-setuptools"
-  "${MINGW_PACKAGE_PREFIX}-python3-markupsafe"
-  "${MINGW_PACKAGE_PREFIX}-python2-setuptools"
-  "${MINGW_PACKAGE_PREFIX}-python2-markupsafe"
-)
-source=(http://pypi.python.org/packages/source/J/Jinja2/Jinja2-$pkgver.tar.gz)
-sha256sums=('310a35fbccac3af13ebf927297f871ac656b9da1d248b1fe6765affa71b53235')
+makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools"
+             "${MINGW_PACKAGE_PREFIX}-python3-markupsafe"
+             "${MINGW_PACKAGE_PREFIX}-python2-setuptools"
+             "${MINGW_PACKAGE_PREFIX}-python2-markupsafe")
+source=(http://pypi.python.org/packages/source/J/Jinja2/Jinja2-${pkgver}.tar.gz)
+sha256sums=('2e24ac5d004db5714976a04ac0e80c6df6e47e98c354cb2c0d82f8879d4f8fdb')
 
 build() {
-  cd "$srcdir"
+  cd "${srcdir}"
   rm -rf python{2,3}-build
   for builddir in python{2,3}-build; do
-    cp -r Jinja2-$pkgver $builddir
+    cp -r Jinja2-${pkgver} $builddir
     pushd $builddir
     ${MINGW_PREFIX}/bin/${builddir%-build} setup.py build
     popd
@@ -33,21 +30,21 @@ package_python3-jinja() {
   pkgdesc='Python3 documentation generator'
   depends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools" "${MINGW_PACKAGE_PREFIX}-python3-markupsafe")
 
-  cd "$srcdir/python3-build"
+  cd "${srcdir}/python3-build"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-    ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} --root="$pkgdir" -O1
+    ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1
 
-  install -Dm644 LICENSE "${pkgdi}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
 }
 
 package_python2-jinja() {
   depends=("${MINGW_PACKAGE_PREFIX}-python2-setuptools" "${MINGW_PACKAGE_PREFIX}-python2-markupsafe")
 
-  cd "$srcdir/python3-build"
+  cd "${srcdir}/python3-build"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-    ${MINGW_PREFIX}/bin/python2 setup.py install --prefix=${MINGW_PREFIX} --root="$pkgdir" -O1
+    ${MINGW_PREFIX}/bin/python2 setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1
 
-  install -Dm644 LICENSE "${pkgdi}${MINGW_PREFIX}/share/licenses/python2-${_realname}/LICENSE"
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python2-${_realname}/LICENSE"
 }
 
 package_mingw-w64-i686-python2-jinja() {
diff --git a/mingw-w64-python-pygments/PKGBUILD b/mingw-w64-python-pygments/PKGBUILD
index 10d92ade99..37ff5007ed 100644
--- a/mingw-w64-python-pygments/PKGBUILD
+++ b/mingw-w64-python-pygments/PKGBUILD
@@ -5,7 +5,7 @@ _realname=pygments
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=2.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Python syntax highlighter (mingw-w64)"
 arch=('any')
 license=('BSD')
@@ -21,12 +21,12 @@ prepare() {
 }
 
 build() {
-  cd "$srcdir"
+  cd "${srcdir}"
 
   rm -rf python{2,3}-build
   for builddir in python{2,3}-build; do
-    cp -r Pygments-$pkgver $builddir
-    pushd $builddir
+    cp -r Pygments-${pkgver} $builddir
+    pushd ${builddir}
     ${MINGW_PREFIX}/bin/${builddir%-build} setup.py build
     popd
   done
@@ -35,48 +35,43 @@ build() {
 package_python3-pygments() {
   depends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
 
-  pushd ${MINGW_PREFIX} > /dev/null
-  local _mingw_prefix=`pwd -W`
-  popd > /dev/null
+  local _mingw_prefix=$(cygpath -am ${MINGW_PREFIX})
 
-  cd "$srcdir/python3-build"
+  cd "${srcdir}/python3-build"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} --root="$pkgdir" -O1
+  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1
 
-  # pygmentize has been moved to the python2-pygments package
-  #rm ${pkgdir}${MINGW_PREFIX}/bin/pygmentize.exe{,.manifest}
-  #rm -rf ${pkgdir}${MINGW_PREFIX}/bin
-
-  for f in pygmentize; do
-    mv "${pkgdir}${MINGW_PREFIX}"/bin/${f}.exe "${pkgdir}${MINGW_PREFIX}"/bin/${f}-3.4.exe
-    if [ -f "${pkgdir}${MINGW_PREFIX}"/bin/${f}.exe.manifest ]; then
-      mv "${pkgdir}${MINGW_PREFIX}"/bin/${f}.exe.manifest "${pkgdir}${MINGW_PREFIX}"/bin/${f}-3.4.exe.manifest
-      sed -e "s|${f}|${f}-3.4|g" -i "${pkgdir}${MINGW_PREFIX}"/bin/${f}-3.4.exe.manifest
-    fi
-    mv "${pkgdir}${MINGW_PREFIX}"/bin/${f}-script.py "${pkgdir}${MINGW_PREFIX}"/bin/${f}-3.4-script.py
-  done
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+  
   # fix python command in files
   for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*.py; do
     sed -e "s|${_mingw_prefix}/bin/|/usr/bin/env |g" -i ${_f}
   done
-  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
 }
 
 package_python2-pygments() {
   depends=("${MINGW_PACKAGE_PREFIX}-python2-setuptools")
 
-  pushd ${MINGW_PREFIX} > /dev/null
-  local _mingw_prefix=`pwd -W`
-  popd > /dev/null
+  local _mingw_prefix=$(cygpath -am ${MINGW_PREFIX})
 
-  cd "$srcdir/python2-build"
+  cd "${srcdir}/python2-build"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python2 setup.py install --prefix=${MINGW_PREFIX} --root="$pkgdir" -O1
+  ${MINGW_PREFIX}/bin/python2 setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1
 
   # fix python command in files
   for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*.py; do
     sed -e "s|${_mingw_prefix}/bin/|/usr/bin/env |g" -i ${_f}
   done
+
+  for f in pygmentize; do
+    mv "${pkgdir}${MINGW_PREFIX}"/bin/${f}{,2}.exe
+    if [ -f "${pkgdir}${MINGW_PREFIX}"/bin/${f}.exe.manifest ]; then
+      mv "${pkgdir}${MINGW_PREFIX}"/bin/${f}{,2}.exe.manifest
+      sed -e "s|${f}|${f}2|g" -i "${pkgdir}${MINGW_PREFIX}"/bin/${f}2.exe.manifest
+    fi
+    mv "${pkgdir}${MINGW_PREFIX}"/bin/${f}{,2}-script.py
+  done
+
   install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python2-${_realname}/LICENSE"
 }
 
diff --git a/mingw-w64-python-pytz/PKGBUILD b/mingw-w64-python-pytz/PKGBUILD
index 8269b1a2ad..8a8c833286 100644
--- a/mingw-w64-python-pytz/PKGBUILD
+++ b/mingw-w64-python-pytz/PKGBUILD
@@ -2,42 +2,39 @@
 
 _realname=pytz
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-$_realname" "${MINGW_PACKAGE_PREFIX}-python3-$_realname")
-pkgver=2014.7
+pkgver=2015.4
 pkgrel=1
 pkgdesc="Cross platform time zone library for Python (mingw-w64)"
 arch=('any')
 url="http://pypi.python.org/pypi/pytz"
 license=("MIT")
-makedepends=(
-            "${MINGW_PACKAGE_PREFIX}-python3"
-            "${MINGW_PACKAGE_PREFIX}-python2"
-)
-source=(http://pypi.python.org/packages/source/p/pytz/pytz-$pkgver.tar.bz2)
-md5sums=('5c1d3966406c6637b95d1eb2652cd8e1')
+makedepends=("${MINGW_PACKAGE_PREFIX}-python3"
+             "${MINGW_PACKAGE_PREFIX}-python2")
+source=(http://pypi.python.org/packages/source/p/pytz/pytz-${pkgver}.tar.bz2)
+md5sums=('39f7375c4b1fa34cdcb4b4765d08f817')
 
 prepare() {
   cd "${srcdir}"
-  cp -r pytz-$pkgver python2-pytz-$pkgver
-  cp -r pytz-$pkgver python3-pytz-$pkgver
+  cp -r pytz-${pkgver} build-python2
+  cp -r pytz-${pkgver} build-python3
 }
 
 check(){
-    cd $srcdir/python2-pytz-$pkgver/pytz/tests
+    cd ${srcdir}/build-python2/pytz/tests
     ${MINGW_PREFIX}/bin/python2 test_tzinfo.py
-    cd $srcdir/python3-pytz-$pkgver/pytz/tests
+    cd ${srcdir}/build-python3/pytz/tests
     ${MINGW_PREFIX}/bin/python3 test_tzinfo.py
 }
 
 package_python3-pytz() {
   depends=("${MINGW_PACKAGE_PREFIX}-python3")
 
-  cd $srcdir/python3-pytz-$pkgver
+  cd ${srcdir}/build-python3
   # Fix locale https://github.com/ipython/ipython/issues/2057
   export LC_ALL=en_US.UTF-8
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
-  --root=$pkgdir --optimize=1
+  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} --root=${pkgdir} --optimize=1
 
   install -D LICENSE.txt ${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE
 }
@@ -45,13 +42,15 @@ package_python3-pytz() {
 package_python2-pytz() {
   depends=("${MINGW_PACKAGE_PREFIX}-python2")
 
-  cd $srcdir/python2-pytz-$pkgver
+  cd ${srcdir}/build-python2
   # Fix locale https://github.com/ipython/ipython/issues/2057
   export LC_ALL=en_US.UTF-8
 
+  # python 2 fix
+  sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' pytz/tzfile.py
+
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python2 setup.py install --prefix=${MINGW_PREFIX} \
-  --root=$pkgdir --optimize=1
+  ${MINGW_PREFIX}/bin/python2 setup.py install --prefix=${MINGW_PREFIX} --root=${pkgdir} --optimize=1
 
   install -D LICENSE.txt ${pkgdir}${MINGW_PREFIX}/share/licenses/python2-${_realname}/LICENSE
 }
diff --git a/mingw-w64-python-six/PKGBUILD b/mingw-w64-python-six/PKGBUILD
index 83885f4467..ea399573d5 100644
--- a/mingw-w64-python-six/PKGBUILD
+++ b/mingw-w64-python-six/PKGBUILD
@@ -2,7 +2,7 @@
 
 _realname=six
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-$_realname" "${MINGW_PACKAGE_PREFIX}-python3-$_realname")
-pkgver=1.8.0
+pkgver=1.9.0
 pkgrel=1
 pkgdesc="Python 2 and 3 compatibility utilities (mingw-w64)"
 arch=('any')
@@ -12,26 +12,26 @@ makedepends=(
     "${MINGW_PACKAGE_PREFIX}-python2"
     "${MINGW_PACKAGE_PREFIX}-python3"
 )
-source=(http://pypi.python.org/packages/source/s/six/six-$pkgver.tar.gz)
-md5sums=('1626eb24cc889110c38f7e786ec69885')
+source=(http://pypi.python.org/packages/source/s/six/six-${pkgver}.tar.gz)
+md5sums=('476881ef4012262dfc8adc645ee786c4')
 
 prepare() {
   cd "${srcdir}"
-  cp -r six-$pkgver python2-six-$pkgver
-  cp -r six-$pkgver python3-six-$pkgver
+  cp -r six-$pkgver python2-six-${pkgver}
+  cp -r six-$pkgver python3-six-${pkgver}
 }
 
 check() {
-  cd $srcdir/python2-six-$pkgver
+  cd ${srcdir}/python2-six-${pkgver}
   ${MINGW_PREFIX}/bin/python2 setup.py check
-  cd $srcdir/python3-six-$pkgver
+  cd ${srcdir}/python3-six-${pkgver}
   ${MINGW_PREFIX}/bin/python3 setup.py check
 }
 
 package_python3-six() {
   depends=("${MINGW_PACKAGE_PREFIX}-python3")
 
-  cd $srcdir/python3-six-$pkgver
+  cd ${srcdir}/python3-six-${pkgver}
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
   --root "${pkgdir}" --optimize=1
@@ -42,7 +42,7 @@ package_python3-six() {
 package_python2-six() {
   depends=("${MINGW_PACKAGE_PREFIX}-python2")
 
-  cd $srcdir/python2-six-$pkgver
+  cd ${srcdir}/python2-six-${pkgver}
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python2 setup.py install --prefix=${MINGW_PREFIX} \
   --root "${pkgdir}" --optimize=1
diff --git a/mingw-w64-python-snowballstemmer/PKGBUILD b/mingw-w64-python-snowballstemmer/PKGBUILD
new file mode 100644
index 0000000000..59a63d20ff
--- /dev/null
+++ b/mingw-w64-python-snowballstemmer/PKGBUILD
@@ -0,0 +1,75 @@
+# Maintainer: Alexey Pavlov <Alexpux@gmail.com>
+
+_realname=snowballstemmer
+pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgver=1.2.0
+pkgrel=1
+pkgdesc="Snowball stemming library collection for Python (mingw-w64)"
+arch=('any')
+license=('BSD')
+url='https://github.com/shibukawa/snowball_py'
+makedepends=("${MINGW_PACKAGE_PREFIX}-python2-setuptools"
+             "${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+options=('staticlibs')
+source=("https://pypi.python.org/packages/source/s/${_realname}/${_realname}-${pkgver}.tar.gz")
+md5sums=('51f2ef829db8129dd0f2354f0b209970')
+
+prepare() {
+  cd ${srcdir}
+  cp -r ${_realname}-${pkgver} python2-build
+  cp -r ${_realname}-${pkgver} python3-build
+}
+
+build() {
+  cd "${srcdir}"
+  for builddir in python{2,3}-build; do
+    pushd ${builddir}
+    ${MINGW_PREFIX}/bin/${builddir%-build} setup.py build
+    popd
+  done
+}
+
+check() {
+  cd "${srcdir}"
+  for builddir in python{2,3}-build; do
+    pushd ${builddir}
+    ${MINGW_PREFIX}/bin/${builddir%-build} py.test
+    popd
+  done
+}
+
+package_python2-snowballstemmer() {
+  depends=("${MINGW_PACKAGE_PREFIX}-python2")
+
+  cd "${srcdir}/python2-build"
+  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
+    ${MINGW_PREFIX}/bin/python2 setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1
+
+  install -Dm644 LICENSE.rst "${pkgdir}${MINGW_PREFIX}/share/licenses/python2-${_realname}/LICENSE.rst"
+}
+
+package_python3-snowballstemmer() {
+  depends=("${MINGW_PACKAGE_PREFIX}-python3")
+
+  cd "${srcdir}/python3-build"
+  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
+    ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1
+
+  install -Dm644 LICENSE.rst "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE.rst"
+}
+
+package_mingw-w64-i686-python2-snowballstemmer() {
+  package_python2-snowballstemmer
+}
+
+package_mingw-w64-i686-python3-snowballstemmer() {
+  package_python3-snowballstemmer
+}
+
+package_mingw-w64-x86_64-python2-snowballstemmer() {
+  package_python2-snowballstemmer
+}
+
+package_mingw-w64-x86_64-python3-snowballstemmer() {
+  package_python3-snowballstemmer
+}
diff --git a/mingw-w64-python-sphinx-alabaster-theme/PKGBUILD b/mingw-w64-python-sphinx-alabaster-theme/PKGBUILD
new file mode 100644
index 0000000000..65ceb8c553
--- /dev/null
+++ b/mingw-w64-python-sphinx-alabaster-theme/PKGBUILD
@@ -0,0 +1,75 @@
+# Maintainer: Alexey Pavlov <Alexpux@gmail.com>
+
+_realname=sphinx-alabaster-theme
+pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgver=0.7.4
+pkgrel=1
+pkgdesc="Modified Kr Sphinx doc theme (mingw-w64)"
+arch=('any')
+license=('BSD')
+url='https://github.com/bitprophet/alabaster'
+makedepends=("${MINGW_PACKAGE_PREFIX}-python2-setuptools"
+             "${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+options=('staticlibs')
+source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/bitprophet/alabaster/archive/${pkgver}.tar.gz")
+md5sums=('ed0f1f6cba60e930cba5ed45276b5323')
+
+prepare() {
+  cd ${srcdir}
+  cp -r alabaster-${pkgver} python2-build
+  cp -r alabaster-${pkgver} python3-build
+}
+
+build() {
+  cd "${srcdir}"
+  for builddir in python{2,3}-build; do
+    pushd ${builddir}
+    ${MINGW_PREFIX}/bin/${builddir%-build} setup.py build
+    popd
+  done
+}
+
+check() {
+  cd "${srcdir}"
+  for builddir in python{2,3}-build; do
+    pushd ${builddir}
+    ${MINGW_PREFIX}/bin/${builddir%-build} py.test
+    popd
+  done
+}
+
+package_python2-sphinx-alabaster-theme() {
+  depends=("${MINGW_PACKAGE_PREFIX}-python2")
+
+  cd "${srcdir}/python2-build"
+  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
+    ${MINGW_PREFIX}/bin/python2 setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1
+
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python2-${_realname}/LICENSE"
+}
+
+package_python3-sphinx-alabaster-theme() {
+  depends=("${MINGW_PACKAGE_PREFIX}-python3")
+
+  cd "${srcdir}/python3-build"
+  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
+    ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1
+
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE"
+}
+
+package_mingw-w64-i686-python2-sphinx-alabaster-theme() {
+  package_python2-sphinx-alabaster-theme
+}
+
+package_mingw-w64-i686-python3-sphinx-alabaster-theme() {
+  package_python3-sphinx-alabaster-theme
+}
+
+package_mingw-w64-x86_64-python2-sphinx-alabaster-theme() {
+  package_python2-sphinx-alabaster-theme
+}
+
+package_mingw-w64-x86_64-python3-sphinx-alabaster-theme() {
+  package_python3-sphinx-alabaster-theme
+}
diff --git a/mingw-w64-python-sphinx/PKGBUILD b/mingw-w64-python-sphinx/PKGBUILD
index 599dbc5c4d..3af7913def 100644
--- a/mingw-w64-python-sphinx/PKGBUILD
+++ b/mingw-w64-python-sphinx/PKGBUILD
@@ -3,29 +3,44 @@
 
 _realname=sphinx
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=1.2.3
+pkgver=1.3.1
 pkgrel=2
 pkgdesc="A discovery-based unittest extension (mingw-w64)"
 arch=('any')
 license=('LGPL-2.1')
 url="http://sphinx.pocoo.org/"
 makedepends=(
-            "${MINGW_PACKAGE_PREFIX}-python3-setuptools"
+            "${MINGW_PACKAGE_PREFIX}-python3-colorama"
             "${MINGW_PACKAGE_PREFIX}-python3-docutils"
             "${MINGW_PACKAGE_PREFIX}-python3-jinja"
             "${MINGW_PACKAGE_PREFIX}-python3-pygments"
-            "${MINGW_PACKAGE_PREFIX}-python2-setuptools"
+            "${MINGW_PACKAGE_PREFIX}-python3-setuptools"
+            "${MINGW_PACKAGE_PREFIX}-python3-six"
+            
+            "${MINGW_PACKAGE_PREFIX}-python2-colorama"
             "${MINGW_PACKAGE_PREFIX}-python2-docutils"
             "${MINGW_PACKAGE_PREFIX}-python2-jinja"
             "${MINGW_PACKAGE_PREFIX}-python2-pygments"
+            "${MINGW_PACKAGE_PREFIX}-python2-setuptools"
+            "${MINGW_PACKAGE_PREFIX}-python2-six"
             )
 checkdepends=(
               "${MINGW_PACKAGE_PREFIX}-python3-nose"
               "${MINGW_PACKAGE_PREFIX}-python2-nose"
+              "${MINGW_PACKAGE_PREFIX}-python3-snowballstemmer"
+              "${MINGW_PACKAGE_PREFIX}-python2-snowballstemmer"
+              "${MINGW_PACKAGE_PREFIX}-python3-babel"
+              "${MINGW_PACKAGE_PREFIX}-python2-babel"
+              "${MINGW_PACKAGE_PREFIX}-python3-sphinx-alabaster-theme"
+              "${MINGW_PACKAGE_PREFIX}-python2-sphinx-alabaster-theme"
+              "${MINGW_PACKAGE_PREFIX}-python3-sphinx_rtd_theme"
+              "${MINGW_PACKAGE_PREFIX}-python2-sphinx_rtd_theme"
+              "${MINGW_PACKAGE_PREFIX}-python2-mock"
+              "${MINGW_PACKAGE_PREFIX}-python3-mock"
               #'texlive-latexextra'
               )
-source=("http://pypi.python.org/packages/source/S/Sphinx/Sphinx-$pkgver.tar.gz")
-md5sums=('a98c93124035b4cd7183604aec656cb3')
+source=("http://pypi.python.org/packages/source/S/Sphinx/Sphinx-${pkgver}.tar.gz")
+md5sums=('8786a194acf9673464c5455b11fd4332')
 
 prepare() {
   # souce duplication is required because makefile modify source code
@@ -41,9 +56,9 @@ prepare() {
 }
 
 build() {
-  cd "$srcdir"
+  cd "${srcdir}"
   for builddir in python{2,3}-build; do
-    pushd $builddir
+    pushd ${builddir}
     ${MINGW_PREFIX}/bin/${builddir%-build} setup.py build
     popd
   done
@@ -51,16 +66,21 @@ build() {
 
 package_python3-sphinx() {
   pkgdesc='Python3 documentation generator'
-  depends=("${MINGW_PACKAGE_PREFIX}-python3-jinja" "${MINGW_PACKAGE_PREFIX}-python3-pygments" "${MINGW_PACKAGE_PREFIX}-python3-docutils")
+  depends=("${MINGW_PACKAGE_PREFIX}-python3-babel"
+           "${MINGW_PACKAGE_PREFIX}-python3-colorama"
+           "${MINGW_PACKAGE_PREFIX}-python3-docutils"
+           "${MINGW_PACKAGE_PREFIX}-python3-jinja"
+           "${MINGW_PACKAGE_PREFIX}-python3-pygments"
+           "${MINGW_PACKAGE_PREFIX}-python3-sphinx_rtd_theme"
+           "${MINGW_PACKAGE_PREFIX}-python3-snowballstemmer"
+           "${MINGW_PACKAGE_PREFIX}-python3-sphinx-alabaster-theme")
   #optdepends=("${MINGW_PACKAGE_PREFIX}-texlive-latexextra": for generation of PDF documentation')
 
-  pushd ${MINGW_PREFIX} > /dev/null
-  local _mingw_prefix=`pwd -W`
-  popd > /dev/null
+  local _mingw_prefix=$(cygpath -am ${MINGW_PREFIX})
 
-  cd "$srcdir/python3-build"
+  cd "${srcdir}/python3-build"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} --root="$pkgdir" -O1
+  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1
 
   #rm -f ${pkgdir}${MINGW_PREFIX}/bin/sphinx{.exe,-script.py,.exe.manifest}
   # fix python command in files
@@ -71,16 +91,21 @@ package_python3-sphinx() {
 
 package_python2-sphinx() {
   pkgdesc='Python2 documentation generator'
-  depends=("${MINGW_PACKAGE_PREFIX}-python2-jinja" "${MINGW_PACKAGE_PREFIX}-python2-pygments" "${MINGW_PACKAGE_PREFIX}-python2-docutils")
+  depends=("${MINGW_PACKAGE_PREFIX}-python2-babel"
+           "${MINGW_PACKAGE_PREFIX}-python2-colorama"
+           "${MINGW_PACKAGE_PREFIX}-python2-docutils"
+           "${MINGW_PACKAGE_PREFIX}-python2-jinja"
+           "${MINGW_PACKAGE_PREFIX}-python2-pygments"
+           "${MINGW_PACKAGE_PREFIX}-python2-sphinx_rtd_theme"
+           "${MINGW_PACKAGE_PREFIX}-python2-snowballstemmer"
+           "${MINGW_PACKAGE_PREFIX}-python2-sphinx-alabaster-theme")
   #optdepends=("${MINGW_PACKAGE_PREFIX}-texlive-latexextra": for generation of PDF documentation')
 
-  pushd ${MINGW_PREFIX} > /dev/null
-  local _mingw_prefix=`pwd -W`
-  popd > /dev/null
+  local _mingw_prefix=$(cygpath -am ${MINGW_PREFIX})
 
-  cd "$srcdir/python2-build"
+  cd "${srcdir}/python2-build"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python2 setup.py install --prefix=${MINGW_PREFIX} --root="$pkgdir" -O1
+  ${MINGW_PREFIX}/bin/python2 setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1
 
   # fix python command in files
   for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*.py; do
diff --git a/mingw-w64-python-sphinx_rtd_theme/PKGBUILD b/mingw-w64-python-sphinx_rtd_theme/PKGBUILD
new file mode 100644
index 0000000000..f18fec1dd0
--- /dev/null
+++ b/mingw-w64-python-sphinx_rtd_theme/PKGBUILD
@@ -0,0 +1,75 @@
+# Maintainer: Alexey Pavlov <Alexpux@gmail.com>
+
+_realname=sphinx_rtd_theme
+pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgver=0.1.8
+pkgrel=1
+pkgdesc="Python Sphinx Read The Docs Theme (mingw-w64)"
+arch=('any')
+license=('MIT')
+url='https://github.com/snide/sphinx_rtd_theme'
+makedepends=("${MINGW_PACKAGE_PREFIX}-python2-setuptools"
+             "${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+options=('staticlibs')
+source=("https://pypi.python.org/packages/source/s/${_realname}/${_realname}-${pkgver}.tar.gz")
+md5sums=('713ce7c53239449bdd799385577329ee')
+
+prepare() {
+  cd ${srcdir}
+  cp -r ${_realname}-${pkgver} python2-build
+  cp -r ${_realname}-${pkgver} python3-build
+}
+
+build() {
+  cd "${srcdir}"
+  for builddir in python{2,3}-build; do
+    pushd ${builddir}
+    ${MINGW_PREFIX}/bin/${builddir%-build} setup.py build
+    popd
+  done
+}
+
+check() {
+  cd "${srcdir}"
+  for builddir in python{2,3}-build; do
+    pushd ${builddir}
+    ${MINGW_PREFIX}/bin/${builddir%-build} py.test
+    popd
+  done
+}
+
+package_python2-sphinx_rtd_theme() {
+  depends=("${MINGW_PACKAGE_PREFIX}-python2")
+
+  cd "${srcdir}/python2-build"
+  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
+    ${MINGW_PREFIX}/bin/python2 setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1
+
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python2-${_realname}/COPYING"
+}
+
+package_python3-sphinx_rtd_theme() {
+  depends=("${MINGW_PACKAGE_PREFIX}-python3")
+
+  cd "${srcdir}/python3-build"
+  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
+    ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1
+
+  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/COPYING"
+}
+
+package_mingw-w64-i686-python2-sphinx_rtd_theme() {
+  package_python2-sphinx_rtd_theme
+}
+
+package_mingw-w64-i686-python3-sphinx_rtd_theme() {
+  package_python3-sphinx_rtd_theme
+}
+
+package_mingw-w64-x86_64-python2-sphinx_rtd_theme() {
+  package_python2-sphinx_rtd_theme
+}
+
+package_mingw-w64-x86_64-python3-sphinx_rtd_theme() {
+  package_python3-sphinx_rtd_theme
+}
diff --git a/mingw-w64-qbs/0003-add-generator-header-installs.1.4.patch b/mingw-w64-qbs/0003-add-generator-header-installs.1.4.patch
index e9171a27f5..a392819e95 100644
--- a/mingw-w64-qbs/0003-add-generator-header-installs.1.4.patch
+++ b/mingw-w64-qbs/0003-add-generator-header-installs.1.4.patch
@@ -20,18 +20,6 @@ index 18b3b47..10d9bf8 100644
          $$PWD/rulecommand.h \
          $$PWD/runenvironment.h
      api_headers.path = $${QBS_INSTALL_PREFIX}/include/qbs/api
-diff --git a/src/lib/corelib/tools/tools.pri b/src/lib/corelib/tools/tools.pri
-index 431eb27..a77926c 100644
---- a/src/lib/corelib/tools/tools.pri
-+++ b/src/lib/corelib/tools/tools.pri
-@@ -96,6 +96,7 @@ qbs_enable_unit_tests {
-         $$PWD/generateoptions.h \
-         $$PWD/generatorpluginmanager.h \
-         $$PWD/installoptions.h \
-+        $$PWD/generateoptions.h \
-         $$PWD/setupprojectparameters.h
-     tools_headers.path = $${QBS_INSTALL_PREFIX}/include/qbs/tools
-     INSTALLS += tools_headers
 -- 
 2.3.5
 
diff --git a/mingw-w64-qbs/0008-add-many-files-to-installed-headers.1.4.patch b/mingw-w64-qbs/0008-add-many-files-to-installed-headers.1.4.patch
index f548407c69..d2f1810858 100644
--- a/mingw-w64-qbs/0008-add-many-files-to-installed-headers.1.4.patch
+++ b/mingw-w64-qbs/0008-add-many-files-to-installed-headers.1.4.patch
@@ -19,17 +19,15 @@ diff --git a/src/lib/corelib/generators/generators.pri b/src/lib/corelib/generat
 index 2fa095e..4217853 100644
 --- a/src/lib/corelib/generators/generators.pri
 +++ b/src/lib/corelib/generators/generators.pri
-@@ -1,4 +1,10 @@
+@@ -1,2 +1,8 @@
  HEADERS += \
      $$PWD/generator.h
- 
++
 +!qbs_no_dev_install {
 +    generators_headers.files = $$PWD/generator.h
 +    generators_headers.path = $${QBS_INSTALL_PREFIX}/include/qbs/generators
 +    INSTALLS += generators_headers
 +}
-+
- include(xcode/xcode.pri)
 diff --git a/src/lib/corelib/language/language.pri b/src/lib/corelib/language/language.pri
 index 6da8536..4f8f2ba 100644
 --- a/src/lib/corelib/language/language.pri
diff --git a/mingw-w64-qbs/0002-WIP-Xcode-generator.1.4.patch b/mingw-w64-qbs/0090-WIP-Xcode-generator.1.4.patch
similarity index 99%
rename from mingw-w64-qbs/0002-WIP-Xcode-generator.1.4.patch
rename to mingw-w64-qbs/0090-WIP-Xcode-generator.1.4.patch
index e7c737d0fe..c965c47868 100644
--- a/mingw-w64-qbs/0002-WIP-Xcode-generator.1.4.patch
+++ b/mingw-w64-qbs/0090-WIP-Xcode-generator.1.4.patch
@@ -202,9 +202,10 @@ diff --git a/src/lib/corelib/generators/generators.pri b/src/lib/corelib/generat
 index 6372e81..2fa095e 100644
 --- a/src/lib/corelib/generators/generators.pri
 +++ b/src/lib/corelib/generators/generators.pri
-@@ -1,2 +1,4 @@
- HEADERS += \
-     $$PWD/generator.h
+@@ -6,3 +6,5 @@
+     generators_headers.path = $${QBS_INSTALL_PREFIX}/include/qbs/generators
+     INSTALLS += generators_headers
+ }
 +
 +include(xcode/xcode.pri)
 diff --git a/src/lib/corelib/generators/xcode/opensteppropertylist.cpp b/src/lib/corelib/generators/xcode/opensteppropertylist.cpp
diff --git a/mingw-w64-qbs/0009-Disable-WIP-Xcode-generator.1.4.patch b/mingw-w64-qbs/0091-Disable-WIP-Xcode-generator.1.4.patch
similarity index 100%
rename from mingw-w64-qbs/0009-Disable-WIP-Xcode-generator.1.4.patch
rename to mingw-w64-qbs/0091-Disable-WIP-Xcode-generator.1.4.patch
diff --git a/mingw-w64-qbs/PKGBUILD b/mingw-w64-qbs/PKGBUILD
index fdcb8e1840..fff41bf8e7 100644
--- a/mingw-w64-qbs/PKGBUILD
+++ b/mingw-w64-qbs/PKGBUILD
@@ -21,9 +21,9 @@
 
 _realname=qbs
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=1.4.0
-pkgrel=3
-_pkgfqn="${_realname}-${pkgver}.src"
+pkgver=1.4.1
+pkgrel=1
+_pkgfqn="${_realname}-src-${pkgver}"
 pkgdesc='Qt Build Suite'
 url='http://qt-project.org'
 arch=('any')
@@ -33,29 +33,25 @@ options=('docs' 'staticlibs') # '!strip' 'debug')
 source=("http://download.qt-project.org/official_releases/qbs/${pkgver}/${_pkgfqn}.tar.gz"
         #${_realname}-${pkgver}::"git://gitorious.org/qt-labs/qbs.git#tag=v${pkgver}"
         "manifest"
-        "0001-add-hostosinfo.h-to-installed-headers.1.4.patch"
-        "0002-WIP-Xcode-generator.1.4.patch"
         "0003-add-generator-header-installs.1.4.patch"
         "0004-Use-.dll.a-instead-of-.a-for-mingw-import-librar.1.4.patch"
         "0005-setup-toolchains-Pretend-msys-is-mingw.1.4.patch"
         "0006-Add-some-missing-files.1.4.patch"
-        "0007-add-commandechomode.h-to-installed-headers.1.4.patch"
         "0008-add-many-files-to-installed-headers.1.4.patch"
-        "0009-Disable-WIP-Xcode-generator.1.4.patch")
-sha256sums=('d384d0368c3e32ab3bdd9d85c96bb037aa1f650e77326ab5cd400a38cfef33f3'
+        "0090-WIP-Xcode-generator.1.4.patch"
+        "0091-Disable-WIP-Xcode-generator.1.4.patch")
+sha256sums=('eea8e0c1b2ef71f295fa5f1798a04a9f0509a701094fec11a691a4d7ae0155a9'
             '838098b25a8044176b3139b4003594570c62a8d64f5470fbbd769f3bf44e0855'
-            '55a48d077aa3f2274639cba2d4ad99f85db2351b22c8b307535b1c6df6daf594'
-            '7874ddf89d788d2bfef6ddc97956638df1389300c82132af680aa4268c6b52b6'
-            '12a4efc62b04ca4b157f3154589b7516d5a650388dc30eec8b107c6a087f0b81'
+            '18f1bfe2434ccf97e1366a96b83bdc41bbd4399185bb701d061710b292a5ad59'
             '6daa43c65e4ac440470687a31c74ab6d4bdcfa0fb3c195678e62a9f800356b1a'
             '5002df9cb3ad3451db92918a4b74bb05237648d8697faf8894d96b51cb7faa8a'
             '40d53fca4e80ab63baa8649bae43882daf2c91de22412c71dec712ac59f4a39e'
-            'df453adffd85dfdefef285a2594da9d83ad22eaeddcf2f3f13fb66cbd32bfd32'
-            '10adad688e6c3222df7264d5946ba5231cb980d620ccf4393f76d1fd97b3a23f'
+            'f00efb4af427e4de5edb0c46196f0c6192294559c92a309eea6dfd81c0d302c3'
+            '576d7a6875fc20f4360edea765f8134493ad64a5941afbd92732e841e055b854'
             'ef46ff74aac8aa267a8397d4c02a9481554c45f41748ef8b04ac7ef152d52f22')
 
 prepare() {
-  cd ${_realname}-${pkgver}
+  cd ${_pkgfqn}
   [ -d src/plugins/generator ] && rm -rf src/plugins/generator
   rm -rf src/lib/corelib/api/generator.*
   rm -rf src/lib/corelib/tools/generat*
@@ -66,15 +62,14 @@ prepare() {
     git add -A
     git commit -m "Initial git import"
   fi
-  git am "${srcdir}"/0001-add-hostosinfo.h-to-installed-headers.1.4.patch
-  git am "${srcdir}"/0002-WIP-Xcode-generator.1.4.patch
+
   git am "${srcdir}"/0003-add-generator-header-installs.1.4.patch
   git am "${srcdir}"/0004-Use-.dll.a-instead-of-.a-for-mingw-import-librar.1.4.patch
   git am "${srcdir}"/0005-setup-toolchains-Pretend-msys-is-mingw.1.4.patch
   git am "${srcdir}"/0006-Add-some-missing-files.1.4.patch
-  git am "${srcdir}"/0007-add-commandechomode.h-to-installed-headers.1.4.patch
   git am "${srcdir}"/0008-add-many-files-to-installed-headers.1.4.patch
-  git am "${srcdir}"/0009-Disable-WIP-Xcode-generator.1.4.patch
+  #git am "${srcdir}"/0090-WIP-Xcode-generator.1.4.patch
+  #git am "${srcdir}"/0091-Disable-WIP-Xcode-generator.1.4.patch
 }
 
 build() {
@@ -84,27 +79,34 @@ build() {
   else
     _config="debug"
   fi
-  cd ${srcdir}/${_realname}-${pkgver}
+  cd ${srcdir}/${_pkgfqn}
   [ -d build-${CARCH} ] && rm -rf build-${CARCH}
   mkdir build-${CARCH}
   cd build-${CARCH}
-  ${MINGW_PREFIX}/bin/qmake.exe ../qbs.pro \
+  
+  export MSYS2_ARG_CONV_EXCL="QBS_INSTALL_PREFIX="
+  ${MINGW_PREFIX}/bin/qmake.exe \
+    QBS_INSTALL_PREFIX="${MINGW_PREFIX}" \
     CONFIG+=${_config} \
-    CONFIG+=qbs_enable_project_file_updates
+    CONFIG+=qbs_enable_project_file_updates \
+    ../qbs.pro
+  
   # Because xcodeprojectgenerator has a build order problem.
-  make -j1
+  make
   make docs
 }
 
 package() {
-  cd ${srcdir}/${_realname}-${pkgver}/build-${CARCH}
-  make INSTALL_ROOT=${pkgdir}${MINGW_PREFIX} install
-  make INSTALL_ROOT=${pkgdir}${MINGW_PREFIX} install_docs
+  cd ${srcdir}/${_pkgfqn}/build-${CARCH}
+  
+  export MSYS2_ARG_CONV_EXCL="QBS_INSTALL_PREFIX="
+  make INSTALL_ROOT=${pkgdir} install
+  make INSTALL_ROOT=${pkgdir} install_docs
 
   rm -f ${pkgdir}${MINGW_PREFIX}/lib/*.dll
 
-  for file in qbs-setup-madde-platforms qbs-setup-qt; do
-    cp ${srcdir}/manifest ${pkgdir}${MINGW_PREFIX}/bin/${file}.exe.manifest
+  for ff in qbs-setup-toolchains qbs-setup-qt; do
+    cp ${srcdir}/manifest ${pkgdir}${MINGW_PREFIX}/bin/${ff}.exe.manifest
   done
 }
 
diff --git a/mingw-w64-qtbinpatcher/002-qt-5.5-compatibility.patch b/mingw-w64-qtbinpatcher/002-qt-5.5-compatibility.patch
deleted file mode 100644
index 5a85dac165..0000000000
--- a/mingw-w64-qtbinpatcher/002-qt-5.5-compatibility.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- qtbinpatcher-2.1.4/QtBinPatcher.cpp.orig	2015-07-03 09:39:13.399693800 +0300
-+++ qtbinpatcher-2.1.4/QtBinPatcher.cpp	2015-07-03 10:44:04.574537400 +0300
-@@ -178,6 +178,7 @@
- 
-     static const TParam Params[] = {
-         { "QT_INSTALL_PREFIX",       "qt_prfxpath="},
-+        { "QT_INSTALL_PREFIX",       "qt_epfxpath="},
-         { "QT_INSTALL_ARCHDATA",     "qt_adatpath="},
-         { "QT_INSTALL_DOCS",         "qt_docspath="},
-         { "QT_INSTALL_HEADERS",      "qt_hdrspath="},
diff --git a/mingw-w64-qtbinpatcher/PKGBUILD b/mingw-w64-qtbinpatcher/PKGBUILD
index 4d6075653d..5e4207d8b6 100644
--- a/mingw-w64-qtbinpatcher/PKGBUILD
+++ b/mingw-w64-qtbinpatcher/PKGBUILD
@@ -2,8 +2,8 @@
 
 _realname=qtbinpatcher
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=2.1.4
-pkgrel=3
+pkgver=2.2.0
+pkgrel=1
 pkgdesc="Patcher for Qt libraries (mingw-w64)"
 arch=('any')
 url="http://tver-soft.org"
@@ -12,16 +12,13 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-cmake")
 options=('staticlibs' 'strip')
 source=(${_realname}-${pkgver}.tar.gz::https://github.com/tver-soft/QtBinPatcher/archive/v${pkgver}.tar.gz
         #http://tver-soft.org/dl/${_realname}-${pkgver}.tar.bz2
-        001-minimize-files-touching.patch
-        002-qt-5.5-compatibility.patch)
-md5sums=('cb7dcc9a40b8e46bb09a768426b7025b'
-         'c3c99f967b7c619d351740f155adc012'
-         '86f2aca492184fb8ff8e40b6b94d5ef1')
+        001-minimize-files-touching.patch)
+md5sums=('cb170f2c4f304a23d734ac3717e9950c'
+         'c3c99f967b7c619d351740f155adc012')
 
 prepare() {
   cd ${srcdir}/${_realname}-${pkgver}
   patch -p1 -i ${srcdir}/001-minimize-files-touching.patch
-  patch -p1 -i ${srcdir}/002-qt-5.5-compatibility.patch
 }
 
 build() {
diff --git a/mingw-w64-qtcreator/PKGBUILD b/mingw-w64-qtcreator/PKGBUILD
index e30a90d13f..679adb1deb 100644
--- a/mingw-w64-qtcreator/PKGBUILD
+++ b/mingw-w64-qtcreator/PKGBUILD
@@ -4,7 +4,7 @@
 _realname=qt-creator
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 __pre=
-_base_ver=3.4.1
+_base_ver=3.4.2
 pkgver=${_base_ver}${_pre}
 pkgrel=1
 pkgdesc='Cross-patform IDE (mingw-w64)'
@@ -41,7 +41,7 @@ source=(#http://download.qt-project.org/development_releases/qtcreator/${_base_v
         qt-creator-3.3.0-abi-msys-is-Windows.patch
         qt-creator-3.3.0-MinGW-w64-MIB_TCP_STATE-not-defined-until-Vista.patch)
 noextract=(${_pkgfqn}.tar.gz)
-sha256sums=('029e22307e79c4fb3a34be854dedddaa56476c6c6374c312125b9302bcbc0fd9'
+sha256sums=('f57df9954768badb252154a51cca9b21a4903f8e003ef944d25801cde1754bab'
             '205d8637152d6e6e57c4a9d9c5146efa7fa16db5fb7b8cabc3bc5ded96823d8a'
             '6217d0682c40ac586205abc835490b36ac79525fdefde5afd66e3b02daabd8a0'
             '22253cf29a2c8effebb1cc8313a0f350cf993d7fc404763063e6bd8444fa61f1'
diff --git a/mingw-w64-wxPython/001-mingw-python.patch b/mingw-w64-wxPython/001-mingw-python.patch
index d6b5958373..8e62061407 100644
--- a/mingw-w64-wxPython/001-mingw-python.patch
+++ b/mingw-w64-wxPython/001-mingw-python.patch
@@ -44,6 +44,19 @@
          lflags = lflags.split()
          
          # if wx-config --libs output does not start with -L, wx is
+@@ -663,9 +663,11 @@
+     newLFLAGS = []
+     for flag in lflags:
+         if flag[:2] == '-L':
+-            libdirs.append(flag[2:])
++            libdirs.append(os.popen(' '.join(['cygpath', '-am', flag[2:]])).readline().strip())
+         elif flag[:2] == '-l':
+             libs.append(flag[2:])
++        elif flag[:1] == '/':
++            libs.append(os.popen(' '.join(['cygpath', '-am', flag])).readline().strip())
+         else:
+             newLFLAGS.append(flag)
+     return removeDuplicates(newLFLAGS) 
 @@ -856,14 +861,16 @@
          # gcc needs '.res' and '.rc' compiled to object files !!!
          try:
diff --git a/mingw-w64-wxPython/PKGBUILD b/mingw-w64-wxPython/PKGBUILD
index 2038333e11..98dfda9a49 100644
--- a/mingw-w64-wxPython/PKGBUILD
+++ b/mingw-w64-wxPython/PKGBUILD
@@ -4,14 +4,13 @@ _realname=wxPython
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=3.0.2.0
 _editraver=0.7.20
-pkgrel=1
+pkgrel=3
 pkgdesc="A wxWidgets GUI toolkit for Python (mingw-w64)"
 arch=('any')
 license=("custom:wxWindows")
-groups=("${MINGW_PACKAGE_PREFIX}")
 url="http://www.wxpython.org/"
 depends=("${MINGW_PACKAGE_PREFIX}-python2"
-        "${MINGW_PACKAGE_PREFIX}-wxWidgets")
+         "${MINGW_PACKAGE_PREFIX}-wxWidgets")
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc")
 options=('strip' 'staticlibs' 'buildflags')
 source=(http://downloads.sourceforge.net/wxpython/${_realname}-src-${pkgver}.tar.bz2
@@ -20,7 +19,7 @@ source=(http://downloads.sourceforge.net/wxpython/${_realname}-src-${pkgver}.tar
         002-system-includes.patch
         003-fix-cast-error.patch)
 sha1sums=('5053f3fa04f4eb3a9d4bfd762d963deb7fa46866'
-          'b189dac25d4354ba3cca93e6108fb279dea0e2b7'
+          '0c664ca61e64b35e88527c2a545b9cff0a3b25fc'
           'fb96353201fb0b529a71e70710986246b2978e94'
           '9fa4ac1988fec999feca090f8a8360807664f987')
 
@@ -67,13 +66,11 @@ package() {
   cd "${srcdir}/wxPython-src-${pkgver}/wxPython"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=;--install-headers=;-install-data=" \
   ${MINGW_PREFIX}/bin/python2 setup.py NO_HEADERS=0 WXPORT=msw BUILD_ACTIVEX=0 UNICODE=1 COMPILER=mingw32 \
-    install --prefix=${MINGW_PREFIX} --root="$pkgdir"
+    install --prefix=${MINGW_PREFIX} --root="${pkgdir}"
 
   install -D -m644 ../docs/licence.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
 
-  pushd ${MINGW_PREFIX} > /dev/null
-  local _dir=`pwd -W`
-  popd > /dev/null
+  local _dir=$(cygpath -am ${MINGW_PREFIX})
   for _f in ${pkgdir}${MINGW_PREFIX}/bin/*; do
     sed -e "s|${_dir}|${MINGW_PREFIX}|g" -i ${_f}
   done
diff --git a/mingw-w64-wxwidgets/PKGBUILD b/mingw-w64-wxwidgets/PKGBUILD
index c78bc40ab3..5700c6d093 100644
--- a/mingw-w64-wxwidgets/PKGBUILD
+++ b/mingw-w64-wxwidgets/PKGBUILD
@@ -5,11 +5,10 @@
 _realname=wxWidgets
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=3.0.2
-pkgrel=9
+pkgrel=10
 pkgdesc="A C++ library that lets developers create applications for Windows, Linux and UNIX (mingw-w64)"
 arch=('any')
 license=("custom:wxWindows")
-groups=("${MINGW_PACKAGE_PREFIX}")
 url="http://www.wxwidgets.org/"
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-cppunit"
@@ -89,12 +88,13 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/build-${CARCH}
-  make DESTDIR="${pkgdir}" install
-
   cd ${srcdir}/build-${CARCH}-static
   make DESTDIR="${pkgdir}" install
+  mv ${pkgdir}${MINGW_PREFIX}/bin/wx-config{,-static}
 
+  cd ${srcdir}/build-${CARCH}
+  make DESTDIR="${pkgdir}" install
+  
   mv ${pkgdir}${MINGW_PREFIX}/lib/*.dll ${pkgdir}${MINGW_PREFIX}/bin
 
   # License files