From 6fb9b35b58f5c09ec13c526361fe16be9fe39cca Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Wed, 13 Jul 2016 13:43:19 +0200
Subject: [PATCH 01/22] Added ngspice package

---
 mingw-w64-ngspice/PKGBUILD | 57 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 mingw-w64-ngspice/PKGBUILD

diff --git a/mingw-w64-ngspice/PKGBUILD b/mingw-w64-ngspice/PKGBUILD
new file mode 100644
index 0000000000..f2ea982d4a
--- /dev/null
+++ b/mingw-w64-ngspice/PKGBUILD
@@ -0,0 +1,57 @@
+# Maintainer: Maciej Suminski <maciej.suminski@cern.ch>
+#
+# Based on Arch ngspice PKGBUILD:
+# https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/ngspice
+#   Contributor: Kyle Keen <keenerd@gmail.com>
+#   Contributor: Abhishek Dasgupta <abhidg@gmail.com>
+#   Contributor: Jason Taylor <jftaylor21@gmail.com>
+#   Contributor: Luis Henrique <lmello.009@gmail.com>
+
+_realname=ngspice
+pkgbase=mingw-w64-${_realname}
+pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
+pkgver=26
+pkgrel=3
+pkgdesc='Mixed-level/Mixed-signal circuit simulator based on Spice3f5, Ciber1b1, and Xspice.'
+url='http://ngspice.sourceforge.net'
+license=('BSD')
+arch=('i686' 'x86_64')
+makedepends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
+source=("http://downloads.sourceforge.net/project/${_realname}/ng-spice-rework/${pkgver}/${_realname}-${pkgver}.tar.gz"
+        "http://downloads.sourceforge.net/project/${_realname}/ng-spice-rework/${pkgver}/${_realname}-doc-${pkgver}.tar.gz")
+sha256sums=('51e230c8b720802d93747bc580c0a29d1fb530f3dd06f213b6a700ca9a4d0108'
+            'adc722cf627ee4506ea612c3fcb79f9c73c497e328547ab2d1ea97da588459cb')
+
+build() {
+  cd "${srcdir}/${_realname}-${pkgver}"
+  [[ -d "${srcdir}/build-${CARCH}" ]] && rm -rf "${srcdir}/build-${CARCH}"
+  mkdir -p "${srcdir}/build-${CARCH}" && cd "${srcdir}/build-${CARCH}"
+
+  # FS#45230, create so lib
+  # shared lib sets flags and modifies headers, needs dedicated pass
+  # adding --with-readline disables libngspice-0.dll
+  ../${_realname}-${pkgver}/configure --prefix=${MINGW_PREFIX} \
+              --build=${MINGW_CHOST} \
+              --host=${MINGW_CHOST} \
+              --enable-openmp \
+              --enable-xspice \
+              --enable-cider \
+              --with-ngshared
+  make
+
+  ../${_realname}-${pkgver}/configure --prefix=${MINGW_PREFIX} \
+              --build=${MINGW_CHOST} \
+              --host=${MINGW_CHOST} \
+              --enable-xspice \
+              --enable-cider \
+              --enable-openmp
+  make
+}
+
+package() {
+  cd "${srcdir}/build-${CARCH}"
+  make install DESTDIR="${pkgdir}"
+  install -D -m755 "src/.libs/libngspice-0.dll" "${pkgdir}/${MINGW_PREFIX}/bin"
+  install -D -m644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}/usr/share/licenses/${_realname}/LICENSE"
+  install -D -m644  "${srcdir}/${_realname}-doc-${pkgver}/manual.pdf" "${pkgdir}/usr/share/doc/${_realname}/manual.pdf"
+}

From aee183c72d1a60073fa631ff897edce6b2697020 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Wed, 13 Jul 2016 12:09:25 +0200
Subject: [PATCH 02/22] ngspice: Replace /usr with ${MINGW_PREFIX}

---
 mingw-w64-ngspice/PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mingw-w64-ngspice/PKGBUILD b/mingw-w64-ngspice/PKGBUILD
index f2ea982d4a..edfe376e01 100644
--- a/mingw-w64-ngspice/PKGBUILD
+++ b/mingw-w64-ngspice/PKGBUILD
@@ -52,6 +52,6 @@ package() {
   cd "${srcdir}/build-${CARCH}"
   make install DESTDIR="${pkgdir}"
   install -D -m755 "src/.libs/libngspice-0.dll" "${pkgdir}/${MINGW_PREFIX}/bin"
-  install -D -m644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}/usr/share/licenses/${_realname}/LICENSE"
-  install -D -m644  "${srcdir}/${_realname}-doc-${pkgver}/manual.pdf" "${pkgdir}/usr/share/doc/${_realname}/manual.pdf"
+  install -D -m644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
+  install -D -m644  "${srcdir}/${_realname}-doc-${pkgver}/manual.pdf" "${pkgdir}${MINGW_PREFIX}/share/doc/${_realname}/manual.pdf"
 }

From c5623475b2e9fa347b974ad919e4cc291f50bd47 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Wed, 13 Jul 2016 12:13:08 +0200
Subject: [PATCH 03/22] ngspice: Perform shared library & static builds in
 separate directories

---
 mingw-w64-ngspice/PKGBUILD | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/mingw-w64-ngspice/PKGBUILD b/mingw-w64-ngspice/PKGBUILD
index edfe376e01..f24b9e9187 100644
--- a/mingw-w64-ngspice/PKGBUILD
+++ b/mingw-w64-ngspice/PKGBUILD
@@ -24,8 +24,8 @@ sha256sums=('51e230c8b720802d93747bc580c0a29d1fb530f3dd06f213b6a700ca9a4d0108'
 
 build() {
   cd "${srcdir}/${_realname}-${pkgver}"
-  [[ -d "${srcdir}/build-${CARCH}" ]] && rm -rf "${srcdir}/build-${CARCH}"
-  mkdir -p "${srcdir}/build-${CARCH}" && cd "${srcdir}/build-${CARCH}"
+  [[ -d "${srcdir}/build-shared-${CARCH}" ]] && rm -rf "${srcdir}/build-shared-${CARCH}"
+  mkdir -p "${srcdir}/build-shared-${CARCH}" && cd "${srcdir}/build-shared-${CARCH}"
 
   # FS#45230, create so lib
   # shared lib sets flags and modifies headers, needs dedicated pass
@@ -39,6 +39,10 @@ build() {
               --with-ngshared
   make
 
+  cd "${srcdir}/${_realname}-${pkgver}"
+  [[ -d "${srcdir}/build-static-${CARCH}" ]] && rm -rf "${srcdir}/build-static-${CARCH}"
+  mkdir -p "${srcdir}/build-static-${CARCH}" && cd "${srcdir}/build-static-${CARCH}"
+
   ../${_realname}-${pkgver}/configure --prefix=${MINGW_PREFIX} \
               --build=${MINGW_CHOST} \
               --host=${MINGW_CHOST} \
@@ -49,9 +53,12 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-${CARCH}"
+  cd "${srcdir}/build-static-${CARCH}"
   make install DESTDIR="${pkgdir}"
-  install -D -m755 "src/.libs/libngspice-0.dll" "${pkgdir}/${MINGW_PREFIX}/bin"
   install -D -m644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
   install -D -m644  "${srcdir}/${_realname}-doc-${pkgver}/manual.pdf" "${pkgdir}${MINGW_PREFIX}/share/doc/${_realname}/manual.pdf"
+
+  cd "${srcdir}/build-shared-${CARCH}"
+  install -D -m755 "src/.libs/libngspice-0.dll" "${pkgdir}/${MINGW_PREFIX}/bin"
+
 }

From c36770e11747f8d6cd1bfeb268ec8397e20c16ea Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Wed, 13 Jul 2016 12:27:30 +0200
Subject: [PATCH 04/22] ngspice: pkgrel reset

---
 mingw-w64-ngspice/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mingw-w64-ngspice/PKGBUILD b/mingw-w64-ngspice/PKGBUILD
index f24b9e9187..ea3f624485 100644
--- a/mingw-w64-ngspice/PKGBUILD
+++ b/mingw-w64-ngspice/PKGBUILD
@@ -11,7 +11,7 @@ _realname=ngspice
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=26
-pkgrel=3
+pkgrel=1
 pkgdesc='Mixed-level/Mixed-signal circuit simulator based on Spice3f5, Ciber1b1, and Xspice.'
 url='http://ngspice.sourceforge.net'
 license=('BSD')

From 8754edbd2e5762a08a78a6d280835603ed47e2d1 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Wed, 13 Jul 2016 13:04:51 +0200
Subject: [PATCH 05/22] ngspice: Corrected depends & makedepends fields

---
 mingw-w64-ngspice/PKGBUILD | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mingw-w64-ngspice/PKGBUILD b/mingw-w64-ngspice/PKGBUILD
index ea3f624485..6f05c37371 100644
--- a/mingw-w64-ngspice/PKGBUILD
+++ b/mingw-w64-ngspice/PKGBUILD
@@ -16,7 +16,8 @@ pkgdesc='Mixed-level/Mixed-signal circuit simulator based on Spice3f5, Ciber1b1,
 url='http://ngspice.sourceforge.net'
 license=('BSD')
 arch=('i686' 'x86_64')
-makedepends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
+makedepends=("${MINGW_PACKAGE_PREFIX}-gcc")
+depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
 source=("http://downloads.sourceforge.net/project/${_realname}/ng-spice-rework/${pkgver}/${_realname}-${pkgver}.tar.gz"
         "http://downloads.sourceforge.net/project/${_realname}/ng-spice-rework/${pkgver}/${_realname}-doc-${pkgver}.tar.gz")
 sha256sums=('51e230c8b720802d93747bc580c0a29d1fb530f3dd06f213b6a700ca9a4d0108'

From f3e39e1b233b8a55d1d9a7d8b6c1fa3d32926d08 Mon Sep 17 00:00:00 2001
From: oroppas <oroppas@github.com>
Date: Fri, 15 Jul 2016 00:26:20 +0900
Subject: [PATCH 06/22] Created PKGBUILD

---
 mingw-w64-python-prompt_toolkit/PKGBUILD      | 88 +++++++++++++++++++
 mingw-w64-python-wcwidth/PKGBUILD             | 80 +++++++++++++++++
 mingw-w64-python-win_unicode_console/PKGBUILD | 68 ++++++++++++++
 3 files changed, 236 insertions(+)
 create mode 100644 mingw-w64-python-prompt_toolkit/PKGBUILD
 create mode 100644 mingw-w64-python-wcwidth/PKGBUILD
 create mode 100644 mingw-w64-python-win_unicode_console/PKGBUILD

diff --git a/mingw-w64-python-prompt_toolkit/PKGBUILD b/mingw-w64-python-prompt_toolkit/PKGBUILD
new file mode 100644
index 0000000000..45b55136db
--- /dev/null
+++ b/mingw-w64-python-prompt_toolkit/PKGBUILD
@@ -0,0 +1,88 @@
+# Maintainer: Ryuta Suzuki <oroppas@gmail.com>
+
+_realname=prompt_toolkit
+pkgbase=mingw-w64-python-${_realname}
+pkgname=(
+  "${MINGW_PACKAGE_PREFIX}-python3-${_realname}"
+  "${MINGW_PACKAGE_PREFIX}-python2-${_realname}"
+)
+pkgver=1.0.3
+pkgrel=1
+pkgdesc=""
+url="https://github.com/jonathanslenders/python-prompt-toolkit"
+arch=('any')
+license=('BSD')
+makedepends=(
+  "${MINGW_PACKAGE_PREFIX}-python3-setuptools"
+  "${MINGW_PACKAGE_PREFIX}-python2-setuptools"
+)
+checkdepends=(
+  "${MINGW_PACKAGE_PREFIX}-python3-pytest"
+  "${MINGW_PACKAGE_PREFIX}-python2-pytest"
+)
+source=(python-prompt-toolkit-${pkgver}.tar.gz::https://github.com/jonathanslenders/python-prompt-toolkit/archive/${pkgver}.tar.gz)
+sha256sums=('496a70f54781cee48fe1bd91b846267055c9e6df87ab70d08fe1ef84a9adaad9')
+
+prepare() {
+  cp -a python-prompt-toolkit-${pkgver}{,-py2}
+}
+
+build() {
+  cd ${srcdir}/python-prompt-toolkit-${pkgver}
+  python3 setup.py build
+
+  cd ${srcdir}/python-prompt-toolkit-${pkgver}-py2
+  python2 setup.py build
+}
+
+#check() {
+#    cd ${srcdir}/python-prompt-toolkit-${pkgver}
+#    py.test-3.5
+
+#    cd ${srcdir}/python-prompt-toolkit-${pkgver}-py2
+#    py.test-2.7
+#}
+
+package_python3-prompt_toolkit() {
+  depends=(
+    "${MINGW_PACKAGE_PREFIX}-python3-pygments"
+    "${MINGW_PACKAGE_PREFIX}-python3-six"
+    "${MINGW_PACKAGE_PREFIX}-python3-wcwidth"
+  )
+
+  cd ${srcdir}/python-prompt-toolkit-${pkgver}
+  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
+  ${MINGW_PREFIX}/bin/python3 setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1
+  install -Dm644 LICENSE ${pkgdir}/${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE
+}
+
+package_python2-prompt_toolkit() {
+  depends=(
+    "${MINGW_PACKAGE_PREFIX}-python2-pygments"
+    "${MINGW_PACKAGE_PREFIX}-python2-six"
+    "${MINGW_PACKAGE_PREFIX}-python2-wcwidth"
+  )
+
+  cd ${srcdir}/python-prompt-toolkit-${pkgver}-py2
+  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
+  ${MINGW_PREFIX}/bin/python2 setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1
+  install -Dm644 LICENSE ${pkgdir}/${MINGW_PREFIX}/share/licenses/python2-${_realname}/LICENSE
+}
+
+package_mingw-w64-i686-python2-prompt_toolkit() {
+  package_python2-prompt_toolkit
+}
+
+package_mingw-w64-i686-python3-prompt_toolkit() {
+  package_python3-prompt_toolkit
+}
+
+package_mingw-w64-x86_64-python2-prompt_toolkit() {
+  package_python2-prompt_toolkit
+}
+
+package_mingw-w64-x86_64-python3-prompt_toolkit() {
+  package_python3-prompt_toolkit
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/mingw-w64-python-wcwidth/PKGBUILD b/mingw-w64-python-wcwidth/PKGBUILD
new file mode 100644
index 0000000000..3a09a1777c
--- /dev/null
+++ b/mingw-w64-python-wcwidth/PKGBUILD
@@ -0,0 +1,80 @@
+# Maintainer: Ryuta Suzuki <oroppas@gmail.com>
+
+_realname=wcwidth
+pkgbase=mingw-w64-python-${_realname}
+pkgname=(
+  "${MINGW_PACKAGE_PREFIX}-python3-${_realname}"
+  "${MINGW_PACKAGE_PREFIX}-python2-${_realname}"
+)
+pkgver=0.1.7
+pkgrel=1
+pkgdesc="Measures number of Terminal column cells of wide-character codes"
+url="https://github.com/jquast/wcwidth"
+arch=('any')
+license=('MIT')
+makedepends=(
+  "${MINGW_PACKAGE_PREFIX}-python3-setuptools"
+  "${MINGW_PACKAGE_PREFIX}-python2-setuptools"
+)
+#checkdepends=(
+#  "${MINGW_PACKAGE_PREFIX}-python3-tox"
+#  "${MINGW_PACKAGE_PREFIX}-python2-tox"
+#)
+source=(${_realname}-${pkgver}.tar.gz::https://github.com/jquast/${_realname}/archive/${pkgver}.tar.gz)
+sha256sums=('c0122eb9a4ef7ab6489d0ef7c72db4143387b9466e27385cd5201950f49583b3')
+
+prepare() {
+  cp -a ${_realname}-${pkgver}{,-py2}
+}
+
+build() {
+  cd ${srcdir}/${_realname}-${pkgver}
+  python3 setup.py build
+
+  cd ${srcdir}/${_realname}-${pkgver}-py2
+  python2 setup.py build
+}
+
+#check() {
+#    cd ${srcdir}/${_realname}-${pkgver}
+#    tox
+
+#    cd ${srcdir}/${_realname}-${pkgver}-py2
+#    tox
+#}
+
+package_python3-wcwidth() {
+  depends=("${MINGW_PACKAGE_PREFIX}-python3")
+
+  cd ${srcdir}/${_realname}-${pkgver}
+  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
+  ${MINGW_PREFIX}/bin/python3 setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1
+  install -Dm644 LICENSE.txt ${pkgdir}/${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE
+}
+
+package_python2-wcwidth() {
+  depends=("${MINGW_PACKAGE_PREFIX}-python2")
+
+  cd ${srcdir}/${_realname}-${pkgver}-py2
+  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
+  ${MINGW_PREFIX}/bin/python2 setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1
+  install -Dm644 LICENSE.txt ${pkgdir}/${MINGW_PREFIX}/share/licenses/python2-${_realname}/LICENSE
+}
+
+package_mingw-w64-i686-python2-wcwidth() {
+  package_python2-wcwidth
+}
+
+package_mingw-w64-i686-python3-wcwidth() {
+  package_python3-wcwidth
+}
+
+package_mingw-w64-x86_64-python2-wcwidth() {
+  package_python2-wcwidth
+}
+
+package_mingw-w64-x86_64-python3-wcwidth() {
+  package_python3-wcwidth
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/mingw-w64-python-win_unicode_console/PKGBUILD b/mingw-w64-python-win_unicode_console/PKGBUILD
new file mode 100644
index 0000000000..3fba3136ed
--- /dev/null
+++ b/mingw-w64-python-win_unicode_console/PKGBUILD
@@ -0,0 +1,68 @@
+# Maintainer: Ryuta Suzuki <oroppas@gmail.com>
+
+_realname=win_unicode_console
+pkgbase=mingw-w64-python-${_realname}
+pkgname=(
+  "${MINGW_PACKAGE_PREFIX}-python3-${_realname}"
+  "${MINGW_PACKAGE_PREFIX}-python2-${_realname}"
+)
+pkgver=0.5
+pkgrel=1
+pkgdesc="Measures number of Terminal column cells of wide-character codes"
+url="https://github.com/Drekin/win-unicode-console"
+arch=('any')
+license=('MIT')
+makedepends=(
+  "${MINGW_PACKAGE_PREFIX}-python3-setuptools"
+  "${MINGW_PACKAGE_PREFIX}-python2-setuptools"
+)
+source=(win-unicode-console-${pkgver}.tar.gz::https://github.com/Drekin/win-unicode-console/archive/${pkgver}.tar.gz)
+sha256sums=('2eca3277096ddf88f852b667fcdd866a342500f86c6e10cce9842420290d5048')
+
+prepare() {
+  cp -a win-unicode-console-${pkgver}{,-py2}
+}
+
+build() {
+  cd ${srcdir}/win-unicode-console-${pkgver}
+  python3 setup.py build
+
+  cd ${srcdir}/win-unicode-console-${pkgver}-py2
+  python2 setup.py build
+}
+
+package_python3-win_unicode_console() {
+  depends=("${MINGW_PACKAGE_PREFIX}-python3")
+
+  cd ${srcdir}/win-unicode-console-${pkgver}
+  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
+  ${MINGW_PREFIX}/bin/python3 setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1
+  install -Dm644 LICENSE ${pkgdir}/${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE
+}
+
+package_python2-win_unicode_console() {
+  depends=("${MINGW_PACKAGE_PREFIX}-python2")
+
+  cd ${srcdir}/win-unicode-console-${pkgver}-py2
+  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
+  ${MINGW_PREFIX}/bin/python2 setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1
+  install -Dm644 LICENSE ${pkgdir}/${MINGW_PREFIX}/share/licenses/python2-${_realname}/LICENSE
+}
+
+package_mingw-w64-i686-python2-win_unicode_console() {
+  package_python2-win_unicode_console
+}
+
+package_mingw-w64-i686-python3-win_unicode_console() {
+  package_python3-win_unicode_console
+}
+
+package_mingw-w64-x86_64-python2-win_unicode_console() {
+  package_python2-win_unicode_console
+}
+
+package_mingw-w64-x86_64-python3-win_unicode_console() {
+  package_python3-win_unicode_console
+}
+
+# vim:set ts=2 sw=2 et:

From cd47ea8eb70092ba39a97e4b8f4199a1dc8cf0a9 Mon Sep 17 00:00:00 2001
From: oroppas <oroppas@github.com>
Date: Fri, 15 Jul 2016 00:28:56 +0900
Subject: [PATCH 07/22] Updated packages

---
 mingw-w64-python-decorator/PKGBUILD   |  2 +-
 mingw-w64-python-path/PKGBUILD        |  9 ++++++---
 mingw-w64-python-pickleshare/PKGBUILD | 10 ++++++----
 mingw-w64-python-traitlets/PKGBUILD   |  8 +++++---
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/mingw-w64-python-decorator/PKGBUILD b/mingw-w64-python-decorator/PKGBUILD
index b0e9f89f42..a4822e8a17 100644
--- a/mingw-w64-python-decorator/PKGBUILD
+++ b/mingw-w64-python-decorator/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=(
   "${MINGW_PACKAGE_PREFIX}-python3-${_realname}"
   "${MINGW_PACKAGE_PREFIX}-python2-${_realname}"
 )
-pkgver=4.0.9
+pkgver=4.0.10
 pkgrel=1
 pkgdesc="Better living through Python with decorators (mingw-w64)"
 arch=('any')
diff --git a/mingw-w64-python-path/PKGBUILD b/mingw-w64-python-path/PKGBUILD
index cb8debc0d7..2e9d961329 100644
--- a/mingw-w64-python-path/PKGBUILD
+++ b/mingw-w64-python-path/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=(
   "${MINGW_PACKAGE_PREFIX}-python3-path"
   "${MINGW_PACKAGE_PREFIX}-python2-path"
 )
-pkgver=8.1.2
+pkgver=8.2.1
 pkgrel=1
 pkgdesc="File system based database that uses python pickles (mingw-w64)"
 url="https://github.com/jaraco/path.py"
@@ -25,7 +25,7 @@ checkdepends=(
   "${MINGW_PACKAGE_PREFIX}-python2-py"
 )
 source=("https://pypi.python.org/packages/source/p/${_realname}/${_realname}-${pkgver}.tar.gz")
-sha256sums=('ada95d117c4559abe64080961daf5badda68561afdd34c278f8ca20f2fa466d2')
+sha256sums=('c9ad2d462a7f8d7f6f6d2b89220bd50425221e399a4b8dfe5fa6725eb26fd708')
 
 
 prepare() {
@@ -42,7 +42,10 @@ build() {
 
 #check() {
 #    cd ${srcdir}/${_realname}-${pkgver}
-#    py.test
+#    py.test-3.5
+#
+#    cd ${srcdir}/${_realname}-${pkgver}-py2
+#    py.test-2.7
 #}
 
 package_python3-path() {
diff --git a/mingw-w64-python-pickleshare/PKGBUILD b/mingw-w64-python-pickleshare/PKGBUILD
index c8394e8494..864c972976 100644
--- a/mingw-w64-python-pickleshare/PKGBUILD
+++ b/mingw-w64-python-pickleshare/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=(
   "${MINGW_PACKAGE_PREFIX}-python3-${_realname}"
   "${MINGW_PACKAGE_PREFIX}-python2-${_realname}"
 )
-pkgver=0.5
+pkgver=0.7.1
 pkgrel=1
 pkgdesc="File system based database that uses python pickles (mingw-w64)"
 url="https://github.com/pickleshare/pickleshare"
@@ -20,8 +20,8 @@ checkdepends=(
   "${MINGW_PACKAGE_PREFIX}-python3-nose"
   "${MINGW_PACKAGE_PREFIX}-python2-nose"
 )
-source=(${_realname}-${pkgver}.tar.gz::https://github.com/${_realname}/${_realname}/archive/${pkgver}.tar.gz)
-sha256sums=('2b0ef126389d011045185f03240566786e65772385248def352242fc344aad8c')
+source=("${_realname}-${pkgver}.tar.gz::https://github.com/${_realname}/${_realname}/archive/${pkgver}.tar.gz")
+sha256sums=('b68416add5647232440d1c72514b9724cd0a58a97cb5a15ae0d2f6fdbcf89557')
 
 prepare() {
   cp -a ${_realname}-${pkgver}{,-py2}
@@ -40,7 +40,7 @@ check() {
     nosetests-3.5
 
     cd ${srcdir}/${_realname}-${pkgver}-py2
-    nosetests-3.5
+    nosetests-2.7
 }
 
 package_python3-pickleshare() {
@@ -49,6 +49,7 @@ package_python3-pickleshare() {
   cd ${srcdir}/${_realname}-${pkgver}
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python3 setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1
+  install -Dm644 LICENSE ${pkgdir}/${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE
 }
 
 package_python2-pickleshare() {
@@ -57,6 +58,7 @@ package_python2-pickleshare() {
   cd ${srcdir}/${_realname}-${pkgver}-py2
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python2 setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1
+  install -Dm644 LICENSE ${pkgdir}/${MINGW_PREFIX}/share/licenses/python2-${_realname}/LICENSE
 }
 
 package_mingw-w64-i686-python2-pickleshare() {
diff --git a/mingw-w64-python-traitlets/PKGBUILD b/mingw-w64-python-traitlets/PKGBUILD
index f9e16558a0..60e53bbf73 100644
--- a/mingw-w64-python-traitlets/PKGBUILD
+++ b/mingw-w64-python-traitlets/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=(
   "${MINGW_PACKAGE_PREFIX}-python3-${_realname}"
   "${MINGW_PACKAGE_PREFIX}-python2-${_realname}"
 )
-pkgver=4.1.0
+pkgver=4.2.2
 pkgrel=1
 pkgdesc="A lightweight Traits like module (mingw-w64)"
 url="https://github.com/ipython/traitlets"
@@ -20,8 +20,8 @@ checkdepends=(
   "${MINGW_PACKAGE_PREFIX}-python3-nose"
   "${MINGW_PACKAGE_PREFIX}-python2-nose"
 )
-source=(${_realname}-${pkgver}.tar.gz::https://github.com/ipython/${_realname}/archive/${pkgver}.tar.gz)
-sha256sums=('93ead8dbf7e9617c88b79620072bfc499e7f25613f3df2234e5fdf08348c0a83')
+source=("${_realname}-${pkgver}.tar.gz::https://github.com/ipython/${_realname}/archive/${pkgver}.tar.gz")
+sha256sums=('bc749e08dd89c6007eb70e98c958f16d41e9a1fa42fdc9e9ba24e67469efa0ef')
 
 
 prepare() {
@@ -53,6 +53,7 @@ package_python3-traitlets() {
   cd ${srcdir}/${_realname}-${pkgver}
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python3 setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1
+  install -Dm644 COPYING.md ${pkgdir}/${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE
 }
 
 package_python2-traitlets() {
@@ -64,6 +65,7 @@ package_python2-traitlets() {
   cd ${srcdir}/${_realname}-${pkgver}-py2
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python2 setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1
+  install -Dm644 COPYING.md ${pkgdir}/${MINGW_PREFIX}/share/licenses/python2-${_realname}/LICENSE
 }
 
 package_mingw-w64-i686-python2-traitlets() {

From 6ae83b1faadc90db567b5f7d5edc51581a94a978 Mon Sep 17 00:00:00 2001
From: oroppas <oroppas@github.com>
Date: Fri, 15 Jul 2016 00:30:17 +0900
Subject: [PATCH 08/22] Updated ipython to 5.0.0

---
 .../0001-unimplemented-readline-calls.patch      | 16 ----------------
 mingw-w64-python-ipython/PKGBUILD                | 16 ++++++++++------
 2 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/mingw-w64-python-ipython/0001-unimplemented-readline-calls.patch b/mingw-w64-python-ipython/0001-unimplemented-readline-calls.patch
index a4343ebc61..051f62d286 100644
--- a/mingw-w64-python-ipython/0001-unimplemented-readline-calls.patch
+++ b/mingw-w64-python-ipython/0001-unimplemented-readline-calls.patch
@@ -15,19 +15,3 @@
  # Thanks to Boyd Waters for the original patch.
  uses_libedit = False
 
---- ipython-2.3.1/IPython/core/interactiveshell.py.orig	2015-01-19 23:27:23.065906800 -0500
-+++ ipython-2.3.1/IPython/core/interactiveshell.py	2015-01-19 23:28:02.695374400 -0500
-@@ -657,11 +657,8 @@
-         # override sys.stdout and sys.stderr themselves, you need to do that
-         # *before* instantiating this class, because io holds onto
-         # references to the underlying streams.
--        if (sys.platform == 'win32' or sys.platform == 'cli') and self.has_readline:
--            io.stdout = io.stderr = io.IOStream(self.readline._outputfile)
--        else:
--            io.stdout = io.IOStream(sys.stdout)
--            io.stderr = io.IOStream(sys.stderr)
-+        io.stdout = io.IOStream(sys.stdout)
-+        io.stderr = io.IOStream(sys.stderr)
-
-     def init_prompts(self):
-         self.prompt_manager = PromptManager(shell=self, parent=self)
diff --git a/mingw-w64-python-ipython/PKGBUILD b/mingw-w64-python-ipython/PKGBUILD
index 01c06c8bd6..978adab183 100644
--- a/mingw-w64-python-ipython/PKGBUILD
+++ b/mingw-w64-python-ipython/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=ipython
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=4.1.2
+pkgver=5.0.0
 pkgrel=1
 pkgdesc="An enhanced Interactive Python shell (mingw-w64)"
 arch=('any')
@@ -13,10 +13,10 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-sqlite3"
              "${MINGW_PACKAGE_PREFIX}-python2-setuptools"
              "${MINGW_PACKAGE_PREFIX}-python3-setuptools")
 
-source=("https://pypi.python.org/packages/source/i/ipython/${_realname}-${pkgver}.tar.gz"
+source=("${_realname}-${pkgver}.tar.gz::https://github.com/ipython/ipython/archive/$pkgver.tar.gz"
         0001-unimplemented-readline-calls.patch)
-sha256sums=('052f9692a227f285febecec856d749811ac6a20b32c7629b4de31f04ea701692'
-            'f0058458bf74cb4782824e1c4037b346346b2fe3ea07845ae9e0e1aa3a89427d')
+sha256sums=('5816a693315a705811ce6ae1094e7032ad341a31841609388ce782ce024d3d4d'
+            'cd6dac2442a2477c28096d87cdb7f38ef46b9d3341920d9e88396288a81bfbe2')
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
@@ -55,7 +55,9 @@ package_python3-ipython() {
            "${MINGW_PACKAGE_PREFIX}-python3-setuptools"
            "${MINGW_PACKAGE_PREFIX}-python3-traitlets"
            "${MINGW_PACKAGE_PREFIX}-python3-simplegeneric"
-           "${MINGW_PACKAGE_PREFIX}-python3-pickleshare")
+           "${MINGW_PACKAGE_PREFIX}-python3-pickleshare"
+           "${MINGW_PACKAGE_PREFIX}-python3-prompt_toolkit"
+           "${MINGW_PACKAGE_PREFIX}-python3-win_unicode_console")
   optdepends=("${MINGW_PACKAGE_PREFIX}-python3-nose: for IPython's test suite"
               "${MINGW_PACKAGE_PREFIX}-python3-pyqt4: for ipython qtconsole"
               "${MINGW_PACKAGE_PREFIX}-python3-sip: for ipython qtconsole"
@@ -78,7 +80,9 @@ package_python2-ipython() {
            "${MINGW_PACKAGE_PREFIX}-python2-setuptools"
            "${MINGW_PACKAGE_PREFIX}-python2-traitlets"
            "${MINGW_PACKAGE_PREFIX}-python2-simplegeneric"
-           "${MINGW_PACKAGE_PREFIX}-python2-pickleshare")
+           "${MINGW_PACKAGE_PREFIX}-python2-pickleshare"
+           "${MINGW_PACKAGE_PREFIX}-python2-prompt_toolkit"
+           "${MINGW_PACKAGE_PREFIX}-python2-win_unicode_console")
   optdepends=("${MINGW_PACKAGE_PREFIX}-python2-nose: for IPython's test suite"
               "${MINGW_PACKAGE_PREFIX}-python2-pyqt4: for ipython qtconsole"
               "${MINGW_PACKAGE_PREFIX}-python2-sip: for ipython qtconsole"

From b2bfaca9d0621224b3a910b1a576e02c1aaa89b6 Mon Sep 17 00:00:00 2001
From: Diego Sogari <diego.sogari@gmail.com>
Date: Fri, 15 Jul 2016 05:51:19 -0300
Subject: [PATCH 09/22] add SOCI library (version 3.2.3)

---
 mingw-w64-soci/PKGBUILD         | 50 +++++++++++++++++
 mingw-w64-soci/soci-3.2.3.patch | 96 +++++++++++++++++++++++++++++++++
 2 files changed, 146 insertions(+)
 create mode 100644 mingw-w64-soci/PKGBUILD
 create mode 100644 mingw-w64-soci/soci-3.2.3.patch

diff --git a/mingw-w64-soci/PKGBUILD b/mingw-w64-soci/PKGBUILD
new file mode 100644
index 0000000000..ce4f85cd02
--- /dev/null
+++ b/mingw-w64-soci/PKGBUILD
@@ -0,0 +1,50 @@
+# Maintainer: Diego Sogari <diego.sogari@gmail.com>
+
+_realname=soci
+pkgbase=mingw-w64-${_realname}
+pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
+pkgver=3.2.3
+pkgrel=1
+pkgdesc="The C++ Database Access Library (mingw-w64)"
+arch=('any')
+url="http://soci.sourceforge.net/"
+license=('Boost Software License')
+makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
+             "${MINGW_PACKAGE_PREFIX}-cmake"
+             "${MINGW_PACKAGE_PREFIX}-firebird2-git"
+             "${MINGW_PACKAGE_PREFIX}-postgresql"
+             "${MINGW_PACKAGE_PREFIX}-sqlite3")
+depends=("${MINGW_PACKAGE_PREFIX}-boost")
+optdepends=("${MINGW_PACKAGE_PREFIX}-firebird2-git"
+            "${MINGW_PACKAGE_PREFIX}-postgresql"
+            "${MINGW_PACKAGE_PREFIX}-sqlite3")
+source=("${_realname}-${pkgver}.tar.gz::https://codeload.github.com/SOCI/soci/tar.gz/${pkgver}"
+        "${_realname}-${pkgver}.patch")
+sha256sums=('1166664d5d7c4552c4c2abf173f98fa4427fbb454930fd04de3a39782553199e'
+            'd1fcdb5650cca8d947ee01af0cb65a72035bd5a8ea5bdb4669e45f52807ff6b1')
+
+prepare() {
+  cd "${srcdir}/${_realname}-${pkgver}"
+  patch -Np1 -i "../${_realname}-${pkgver}.patch"
+}
+
+build() {
+  rm -rf "${srcdir}/build-${MINGW_CHOST}"
+  mkdir "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MINGW_CHOST}"
+
+  MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
+  ${MINGW_PREFIX}/bin/cmake.exe \
+    -G"MSYS Makefiles" \
+    -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
+    -DODBC_INCLUDE_DIR=${MINGW_PREFIX}/${MINGW_CHOST}/include \
+    -SOCI_TESTS=OFF \
+    "../${_realname}-${pkgver}/src"
+
+  make
+}
+
+package() {
+  cd "${srcdir}/build-${MINGW_CHOST}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/mingw-w64-soci/soci-3.2.3.patch b/mingw-w64-soci/soci-3.2.3.patch
new file mode 100644
index 0000000000..9b6d9e2030
--- /dev/null
+++ b/mingw-w64-soci/soci-3.2.3.patch
@@ -0,0 +1,96 @@
+diff -c -r soci-3.2.3.orig/src/backends/firebird/statement.cpp soci-3.2.3/src/backends/firebird/statement.cpp
+*** soci-3.2.3.orig/src/backends/firebird/statement.cpp	2015-04-08 19:39:00.000000000 -0300
+--- soci-3.2.3/src/backends/firebird/statement.cpp	2016-07-15 05:34:54.025411700 -0300
+***************
+*** 53,65 ****
+  
+      ISC_STATUS stat[stat_size];
+  
+!     if (stmtp_ != NULL)
+      {
+          if (isc_dsql_free_statement(stat, &stmtp_, DSQL_drop))
+          {
+              throw_iscerror(stat);
+          }
+!         stmtp_ = NULL;
+      }
+  
+      if (sqldap_ != NULL)
+--- 53,65 ----
+  
+      ISC_STATUS stat[stat_size];
+  
+!     if (stmtp_ != (isc_stmt_handle)NULL)
+      {
+          if (isc_dsql_free_statement(stat, &stmtp_, DSQL_drop))
+          {
+              throw_iscerror(stat);
+          }
+!         stmtp_ = (isc_stmt_handle)NULL;
+      }
+  
+      if (sqldap_ != NULL)
+diff -c -r soci-3.2.3.orig/src/backends/sqlite3/soci-sqlite3.h soci-3.2.3/src/backends/sqlite3/soci-sqlite3.h
+*** soci-3.2.3.orig/src/backends/sqlite3/soci-sqlite3.h	2015-04-08 19:39:00.000000000 -0300
+--- soci-3.2.3/src/backends/sqlite3/soci-sqlite3.h	2016-07-15 05:32:02.348241800 -0300
+***************
+*** 61,67 ****
+  public:
+      sqlite3_soci_error(std::string const & msg, int result);
+  
+!     int result() const;
+  
+  private:
+      int result_;
+--- 61,67 ----
+  public:
+      sqlite3_soci_error(std::string const & msg, int result);
+  
+!     SOCI_SQLITE3_DECL int result() const;
+  
+  private:
+      int result_;
+diff -c -r soci-3.2.3.orig/src/cmake/SociConfig.cmake soci-3.2.3/src/cmake/SociConfig.cmake
+*** soci-3.2.3.orig/src/cmake/SociConfig.cmake	2015-04-08 19:39:00.000000000 -0300
+--- soci-3.2.3/src/cmake/SociConfig.cmake	2016-07-15 05:32:02.348241800 -0300
+***************
+*** 32,39 ****
+  	"-pedantic -ansi -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wfloat-equal -Wredundant-decls -Wno-long-long")
+  
+    if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
+!         
+!     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC ${SOCI_GCC_CLANG_COMMON_FLAGS}")
+      if (CMAKE_COMPILER_IS_GNUCXX)
+          if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+              set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++98")
+--- 32,41 ----
+  	"-pedantic -ansi -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wfloat-equal -Wredundant-decls -Wno-long-long")
+  
+    if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
+! 
+!     if(NOT MINGW)
+!         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC ${SOCI_GCC_CLANG_COMMON_FLAGS}")
+!     endif()
+      if (CMAKE_COMPILER_IS_GNUCXX)
+          if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+              set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++98")
+diff -c -r soci-3.2.3.orig/src/CMakeLists.txt soci-3.2.3/src/CMakeLists.txt
+*** soci-3.2.3.orig/src/CMakeLists.txt	2015-04-08 19:39:00.000000000 -0300
+--- soci-3.2.3/src/CMakeLists.txt	2016-07-15 05:32:02.363867500 -0300
+***************
+*** 73,79 ****
+  # Installation
+  ###############################################################################
+  
+! if(APPLE OR CMAKE_SIZEOF_VOID_P EQUAL 4)
+    set(SOCI_LIBDIR "lib")
+  else()
+    set(SOCI_LIBDIR "lib64")
+--- 73,79 ----
+  # Installation
+  ###############################################################################
+  
+! if(APPLE OR MINGW OR CMAKE_SIZEOF_VOID_P EQUAL 4)
+    set(SOCI_LIBDIR "lib")
+  else()
+    set(SOCI_LIBDIR "lib64")

From 7288f46ca9e2a6a95573dd4cc5b6c66cb2d9fe4e Mon Sep 17 00:00:00 2001
From: Diego Sogari <diego.sogari@gmail.com>
Date: Fri, 15 Jul 2016 05:58:19 -0300
Subject: [PATCH 10/22] fix package description and an argument to the cmake
 call

---
 mingw-w64-soci/PKGBUILD | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mingw-w64-soci/PKGBUILD b/mingw-w64-soci/PKGBUILD
index ce4f85cd02..bbb0e101d7 100644
--- a/mingw-w64-soci/PKGBUILD
+++ b/mingw-w64-soci/PKGBUILD
@@ -5,10 +5,10 @@ pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=3.2.3
 pkgrel=1
-pkgdesc="The C++ Database Access Library (mingw-w64)"
+pkgdesc="SOCI - The C++ Database Access Library (mingw-w64)"
 arch=('any')
 url="http://soci.sourceforge.net/"
-license=('Boost Software License')
+license=('custom')
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-firebird2-git"
@@ -38,7 +38,7 @@ build() {
     -G"MSYS Makefiles" \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
     -DODBC_INCLUDE_DIR=${MINGW_PREFIX}/${MINGW_CHOST}/include \
-    -SOCI_TESTS=OFF \
+    -DSOCI_TESTS=OFF \
     "../${_realname}-${pkgver}/src"
 
   make

From c6be920849995fb952beaf335160ee3e11885d1e Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Fri, 15 Jul 2016 12:14:42 +0200
Subject: [PATCH 11/22] ngspice: Text formatting corrections

---
 mingw-w64-ngspice/PKGBUILD | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/mingw-w64-ngspice/PKGBUILD b/mingw-w64-ngspice/PKGBUILD
index 6f05c37371..316230c510 100644
--- a/mingw-w64-ngspice/PKGBUILD
+++ b/mingw-w64-ngspice/PKGBUILD
@@ -15,7 +15,7 @@ pkgrel=1
 pkgdesc='Mixed-level/Mixed-signal circuit simulator based on Spice3f5, Ciber1b1, and Xspice.'
 url='http://ngspice.sourceforge.net'
 license=('BSD')
-arch=('i686' 'x86_64')
+arch=('any')
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc")
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
 source=("http://downloads.sourceforge.net/project/${_realname}/ng-spice-rework/${pkgver}/${_realname}-${pkgver}.tar.gz"
@@ -31,7 +31,8 @@ build() {
   # FS#45230, create so lib
   # shared lib sets flags and modifies headers, needs dedicated pass
   # adding --with-readline disables libngspice-0.dll
-  ../${_realname}-${pkgver}/configure --prefix=${MINGW_PREFIX} \
+  ../${_realname}-${pkgver}/configure \
+              --prefix=${MINGW_PREFIX} \
               --build=${MINGW_CHOST} \
               --host=${MINGW_CHOST} \
               --enable-openmp \
@@ -44,7 +45,8 @@ build() {
   [[ -d "${srcdir}/build-static-${CARCH}" ]] && rm -rf "${srcdir}/build-static-${CARCH}"
   mkdir -p "${srcdir}/build-static-${CARCH}" && cd "${srcdir}/build-static-${CARCH}"
 
-  ../${_realname}-${pkgver}/configure --prefix=${MINGW_PREFIX} \
+  ../${_realname}-${pkgver}/configure \
+              --prefix=${MINGW_PREFIX} \
               --build=${MINGW_CHOST} \
               --host=${MINGW_CHOST} \
               --enable-xspice \
@@ -60,6 +62,6 @@ package() {
   install -D -m644  "${srcdir}/${_realname}-doc-${pkgver}/manual.pdf" "${pkgdir}${MINGW_PREFIX}/share/doc/${_realname}/manual.pdf"
 
   cd "${srcdir}/build-shared-${CARCH}"
-  install -D -m755 "src/.libs/libngspice-0.dll" "${pkgdir}/${MINGW_PREFIX}/bin"
+  install -D -m755 "src/.libs/libngspice-0.dll" "${pkgdir}${MINGW_PREFIX}/bin"
 
 }

From 116f7ff512779db2042ad7e29322d333433d1511 Mon Sep 17 00:00:00 2001
From: Diego Sogari <diego.sogari@gmail.com>
Date: Fri, 15 Jul 2016 11:10:11 -0300
Subject: [PATCH 12/22] remove uneeded argument to cmake call

---
 mingw-w64-soci/PKGBUILD | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mingw-w64-soci/PKGBUILD b/mingw-w64-soci/PKGBUILD
index bbb0e101d7..de0efe48bf 100644
--- a/mingw-w64-soci/PKGBUILD
+++ b/mingw-w64-soci/PKGBUILD
@@ -37,7 +37,6 @@ build() {
   ${MINGW_PREFIX}/bin/cmake.exe \
     -G"MSYS Makefiles" \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-    -DODBC_INCLUDE_DIR=${MINGW_PREFIX}/${MINGW_CHOST}/include \
     -DSOCI_TESTS=OFF \
     "../${_realname}-${pkgver}/src"
 

From 4e0f1c037847c593b1eae6f76bfef1f36bd068a4 Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com>
Date: Fri, 15 Jul 2016 16:04:14 +0100
Subject: [PATCH 13/22] creduce-git: Update to latest

---
 mingw-w64-creduce-git/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mingw-w64-creduce-git/PKGBUILD b/mingw-w64-creduce-git/PKGBUILD
index 4bf4c468cd..bac7a78efe 100644
--- a/mingw-w64-creduce-git/PKGBUILD
+++ b/mingw-w64-creduce-git/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname}-git
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}-git")
 provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-pkgver=2.4.0.r205.gbc92ff4
+pkgver=2.5.0.r77.g56670fd
 pkgrel=1
 pkgdesc="A C program reducer (mingw-w64)"
 depends=('perl-Benchmark-Timer'

From e7029d84ad2eef1ffe64f55d27f21b4c3683ee72 Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com>
Date: Fri, 15 Jul 2016 16:11:59 +0100
Subject: [PATCH 14/22] creduce: Update to 2.5.0

---
 ...-function-name-capitalization-change.patch | 25 -------------------
 mingw-w64-creduce/PKGBUILD                    |  9 ++-----
 2 files changed, 2 insertions(+), 32 deletions(-)
 delete mode 100644 mingw-w64-creduce/0001-Track-member-function-name-capitalization-change.patch

diff --git a/mingw-w64-creduce/0001-Track-member-function-name-capitalization-change.patch b/mingw-w64-creduce/0001-Track-member-function-name-capitalization-change.patch
deleted file mode 100644
index fefefaa3d2..0000000000
--- a/mingw-w64-creduce/0001-Track-member-function-name-capitalization-change.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0df87ff60d5c5df528feaeae16d5ad9c2741eeb5 Mon Sep 17 00:00:00 2001
-From: Eric Eide <eeide@cs.utah.edu>
-Date: Mon, 14 Sep 2015 17:35:33 -0600
-Subject: [PATCH] Track member-function-name capitalization change.
-
----
- clang_delta/TransformationManager.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/clang_delta/TransformationManager.cpp b/clang_delta/TransformationManager.cpp
-index e677930..dceb497 100644
---- a/clang_delta/TransformationManager.cpp
-+++ b/clang_delta/TransformationManager.cpp
-@@ -112,7 +112,7 @@ bool TransformationManager::initializeCompilerInstance(std::string &ErrorMsg)
-   ClangInstance->setASTConsumer(
-     std::unique_ptr<ASTConsumer>(CurrentTransformationImpl));
-   Preprocessor &PP = ClangInstance->getPreprocessor();
--  PP.getBuiltinInfo().InitializeBuiltins(PP.getIdentifierTable(),
-+  PP.getBuiltinInfo().initializeBuiltins(PP.getIdentifierTable(),
-                                          PP.getLangOpts());
- 
-   if (!ClangInstance->InitializeSourceManager(FrontendInputFile(SrcFileName, IK))) {
--- 
-2.8.1
-
diff --git a/mingw-w64-creduce/PKGBUILD b/mingw-w64-creduce/PKGBUILD
index 6ec7bb3518..fb129548df 100644
--- a/mingw-w64-creduce/PKGBUILD
+++ b/mingw-w64-creduce/PKGBUILD
@@ -4,7 +4,7 @@ _realname=creduce
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}-git")
-pkgver=2.4.0
+pkgver=2.5.0
 pkgrel=1
 pkgdesc="A C program reducer (mingw-w64)"
 depends=('perl-Benchmark-Timer'
@@ -13,7 +13,6 @@ depends=('perl-Benchmark-Timer'
          'perl-Getopt-Tabular'
          'perl-Regexp-Common'
          'perl-Sys-CPU'
-         'delta'
          "${MINGW_PACKAGE_PREFIX}-astyle"
          "${MINGW_PACKAGE_PREFIX}-indent"
          "${MINGW_PACKAGE_PREFIX}-clang")
@@ -22,10 +21,8 @@ url='https://github.com/csmith-project/creduce'
 license=('custom:University of Illinois/NCSA Open Source License')
 makedepends=("flex" "${MINGW_PACKAGE_PREFIX}-clang")
 source=(https://github.com/csmith-project/creduce/archive/${_realname}-${pkgver}.tar.gz
-        "0001-Track-member-function-name-capitalization-change.patch"
         "llvm-config-cygpath")
-sha256sums=('a3917e37b0c7d77e7f2c2961794ba511f874f78684a7fd944e51c9d43cc5d7c6'
-            'f345091edbb54a614256dea99c373dd3fd0c1de9d97c27cf58685292c8e2ab8b'
+sha256sums=('6d860adaeac10589441b6075f78778b70a25d1305c7c1638f02e953c804ab16d'
             '03a7239d1e26d8a5dd5f405e10826679725cae6c01a9c37e80c6f1c184dad0a9')
 
 prepare() {
@@ -33,8 +30,6 @@ prepare() {
   [[ -d tools ]] && rm -rf tools
   mkdir tools
   cp -f "${srcdir}"/llvm-config-cygpath tools/llvm-config
-  cd ${_realname}-${_realname}-${pkgver}
-  patch -p1 -i "${srcdir}"/0001-Track-member-function-name-capitalization-change.patch
 }
 
 build() {

From 328105b37e201727e93aaa69ca7e5163519245c5 Mon Sep 17 00:00:00 2001
From: "Ricardo Constantino (:RiCON)" <wiiaboo@gmail.com>
Date: Sat, 16 Jul 2016 03:10:58 +0100
Subject: [PATCH 15/22] opus: Update to 1.1.3

---
 .../0001-correctly-detect-alloca.mingw.patch  | 14 ---------
 ...only-use-dllexport-when-building-dll.patch | 31 -------------------
 mingw-w64-opus/PKGBUILD                       | 17 +++-------
 3 files changed, 4 insertions(+), 58 deletions(-)
 delete mode 100644 mingw-w64-opus/0001-correctly-detect-alloca.mingw.patch
 delete mode 100644 mingw-w64-opus/0002-win32-only-use-dllexport-when-building-dll.patch

diff --git a/mingw-w64-opus/0001-correctly-detect-alloca.mingw.patch b/mingw-w64-opus/0001-correctly-detect-alloca.mingw.patch
deleted file mode 100644
index 2d56e6f541..0000000000
--- a/mingw-w64-opus/0001-correctly-detect-alloca.mingw.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- opus-1.1-beta/configure.ac.orig	2013-07-31 06:27:54.930255200 +0000
-+++ opus-1.1-beta/configure.ac	2013-07-31 06:28:56.746104800 +0000
-@@ -99,9 +99,9 @@
- 
- AS_IF([test "$has_var_arrays" = "no"],
-   [
--   AC_CHECK_HEADERS([alloca.h])
-+   AC_CHECK_HEADERS([malloc.h])
-    AC_MSG_CHECKING(for alloca)
--   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <alloca.h>]],
-+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <malloc.h>]],
-                                       [[int foo=10; int *array = alloca(foo);]])],
-      [ use_alloca=yes;
-        AC_DEFINE([USE_ALLOCA], [], [Make use of alloca])
diff --git a/mingw-w64-opus/0002-win32-only-use-dllexport-when-building-dll.patch b/mingw-w64-opus/0002-win32-only-use-dllexport-when-building-dll.patch
deleted file mode 100644
index 9961fc8980..0000000000
--- a/mingw-w64-opus/0002-win32-only-use-dllexport-when-building-dll.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 6e9617371f7cf3f669a60d9540723a01f1128fc8 Mon Sep 17 00:00:00 2001
-From: Daniel Verkamp <daniel@drv.nu>
-Date: Wed, 21 Oct 2015 17:24:41 -0700
-Subject: [PATCH] win32: only use dllexport when building DLL
-
-If building a static library, marking symbols as dllexport causes them
-to be exported from the final executable. For example, run
-objdump -x opus_demo.exe on a --disabled-shared build and look for the
-export table; there should not be one in a normal Win32 .exe file, but
-when linking static libopus, the exe exports all of the opus_* public
-functions.
-
-Use the libtool-defined DLL_EXPORT flag to determine whether we are
-building a DLL and only specify __declspec(dllexport) in that case.
----
- include/opus_defines.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/opus_defines.h b/include/opus_defines.h
-index 647ed5d..315412d 100644
---- a/include/opus_defines.h
-+++ b/include/opus_defines.h
-@@ -65,7 +65,7 @@ extern "C" {
- 
- #ifndef OPUS_EXPORT
- # if defined(WIN32)
--#  ifdef OPUS_BUILD
-+#  if defined(OPUS_BUILD) && defined(DLL_EXPORT)
- #   define OPUS_EXPORT __declspec(dllexport)
- #  else
- #   define OPUS_EXPORT
diff --git a/mingw-w64-opus/PKGBUILD b/mingw-w64-opus/PKGBUILD
index 98b5dd0615..9d3e995acd 100644
--- a/mingw-w64-opus/PKGBUILD
+++ b/mingw-w64-opus/PKGBUILD
@@ -3,26 +3,19 @@
 _realname=opus
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=1.1.2
-pkgrel=4
+pkgver=1.1.3
+pkgrel=1
 pkgdesc="Codec designed for interactive speech and audio transmission over the Internet (mingw-w64)"
 arch=('any')
 url="https://www.opus-codec.org/"
 license=("BSD")
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config")
 options=('strip' 'staticlibs')
-source=("http://downloads.xiph.org/releases/${_realname}/${_realname}-${pkgver}.tar.gz"
-        0001-correctly-detect-alloca.mingw.patch
-        0002-win32-only-use-dllexport-when-building-dll.patch)
-sha256sums=('0e290078e31211baa7b5886bcc8ab6bc048b9fc83882532da4a1a45e58e907fd'
-            'e4c6fdfa0b9f46f5a836fae01d02c9d6964be9cfa9a38a2071deb91d15c2659e'
-            'ae116fc9b6979c1eda5e5527ceb9548ae61a4d357119a4a75a948a00cd277265')
+source=("http://downloads.xiph.org/releases/${_realname}/${_realname}-${pkgver}.tar.gz")
+sha256sums=('58b6fe802e7e30182e95d0cde890c0ace40b6f125cffc50635f0ad2eef69b633')
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
-  patch -p1 -i "${srcdir}/0001-correctly-detect-alloca.mingw.patch"
-  patch -p1 -i "${srcdir}/0002-win32-only-use-dllexport-when-building-dll.patch"
-  autoreconf -fi
 }
 
 build() {
@@ -35,8 +28,6 @@ build() {
     --host=${MINGW_CHOST} \
     --target=${MINGW_CHOST} \
     --enable-custom-modes \
-    --enable-rtcd \
-    --enable-intrinsics \
     --enable-shared \
     --enable-static
 

From bc37f0b95435d55e5e9c1040f6d0969ce12175b9 Mon Sep 17 00:00:00 2001
From: "Ricardo Constantino (:RiCON)" <wiiaboo@gmail.com>
Date: Sat, 16 Jul 2016 03:11:50 +0100
Subject: [PATCH 16/22] opusfile: Update to 0.8

---
 mingw-w64-opusfile/PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mingw-w64-opusfile/PKGBUILD b/mingw-w64-opusfile/PKGBUILD
index 717822c3c8..a9393a7cf3 100644
--- a/mingw-w64-opusfile/PKGBUILD
+++ b/mingw-w64-opusfile/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=opusfile
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=0.7
+pkgver=0.8
 pkgrel=1
 pkgdesc="Library for opening, seeking, and decoding .opus files (mingw-w64)"
 arch=('any')
@@ -15,7 +15,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-libogg"
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config")
 options=('strip' 'staticlibs')
 source=("https://ftp.mozilla.org/pub/mozilla.org/opus/${_realname}-${pkgver}.tar.gz")
-sha256sums=('9e2bed13bc729058591a0f1cab2505e8cfd8e7ac460bf10a78bcc3b125e7c301')
+sha256sums=('2c231ed3cfaa1b3173f52d740e5bbd77d51b9dfecb87014b404917fba4b855a4')
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"

From fdea2f97bef6a728c2df6ec287fff2b032f6d25f Mon Sep 17 00:00:00 2001
From: Viktor Szakats <vszakats@users.noreply.github.com>
Date: Sat, 16 Jul 2016 13:58:36 +0200
Subject: [PATCH 17/22] fontconfig: allow to disable auto font cache update

Each time fontconfig is installed or updated, a lengthy
process of font cache update is started automatically.
In certain use-cases, f.e. when one if its dependents
is used for automated build purposes, this causes an
unnecessary and unwanted delay in the process. On
AppVeyor CI free-tier in particular, this process takes
about 5 minutes.

This patch adds the ability to disable this automatic
font cache update, by setting the environment variable
`MSYS2_FC_CACHE_SKIP` to any non-empty value, prior
to lauching `pacman`.
---
 mingw-w64-fontconfig/fontconfig-i686.install  | 22 +++++++++++++------
 .../fontconfig-x86_64.install                 | 20 ++++++++++++-----
 2 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/mingw-w64-fontconfig/fontconfig-i686.install b/mingw-w64-fontconfig/fontconfig-i686.install
index f52c9c6bbc..618baf458e 100644
--- a/mingw-w64-fontconfig/fontconfig-i686.install
+++ b/mingw-w64-fontconfig/fontconfig-i686.install
@@ -6,15 +6,23 @@ post_install() {
 
 _EOF
 
-  echo -n "updating font cache... "
-  mingw32/bin/fc-cache -f
-  echo "done."
+  if [ -n "${MSYS2_FC_CACHE_SKIP}" ]; then
+    echo "Warning: 'MSYS2_FC_CACHE_SKIP' set, skipping font cache update"
+  else
+    echo -n "updating font cache... "
+    mingw32/bin/fc-cache -f
+    echo "done."
+  fi
 }
 
 post_upgrade() {
-  echo -n "updating font cache... "
-  mingw32/bin/fc-cache -f
-  echo "done."
+  if [ -n "${MSYS2_FC_CACHE_SKIP}" ]; then
+    echo "Warning: 'MSYS2_FC_CACHE_SKIP' set, skipping font cache update"
+  else
+    echo -n "updating font cache... "
+    mingw32/bin/fc-cache -f
+    echo "done."
+  fi
 }
 
 post_remove() {
@@ -24,4 +32,4 @@ post_remove() {
   in mingw32/etc/fonts/conf.d/
 
 _EOF
-}
\ No newline at end of file
+}
diff --git a/mingw-w64-fontconfig/fontconfig-x86_64.install b/mingw-w64-fontconfig/fontconfig-x86_64.install
index 08e5bd10ea..469be24b49 100644
--- a/mingw-w64-fontconfig/fontconfig-x86_64.install
+++ b/mingw-w64-fontconfig/fontconfig-x86_64.install
@@ -6,15 +6,23 @@ post_install() {
 
 _EOF
 
-  echo -n "updating font cache... "
-  mingw64/bin/fc-cache -f
-  echo "done."
+  if [ -n "${MSYS2_FC_CACHE_SKIP}" ]; then
+    echo "Warning: 'MSYS2_FC_CACHE_SKIP' set, skipping font cache update"
+  else
+    echo -n "updating font cache... "
+    mingw64/bin/fc-cache -f
+    echo "done."
+  fi
 }
 
 post_upgrade() {
-  echo -n "updating font cache... "
-  mingw64/bin/fc-cache -f
-  echo "done."
+  if [ -n "${MSYS2_FC_CACHE_SKIP}" ]; then
+    echo "Warning: 'MSYS2_FC_CACHE_SKIP' set, skipping font cache update"
+  else
+    echo -n "updating font cache... "
+    mingw64/bin/fc-cache -f
+    echo "done."
+  fi
 }
 
 post_remove() {

From 5401bf8f420ab8bfad98a68087a7bfbc6d993576 Mon Sep 17 00:00:00 2001
From: David Macek <david.macek.0@gmail.com>
Date: Sat, 16 Jul 2016 19:02:45 +0200
Subject: [PATCH 18/22] pngcrush: Update to v1.8.2

---
 mingw-w64-pngcrush/PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mingw-w64-pngcrush/PKGBUILD b/mingw-w64-pngcrush/PKGBUILD
index d89ab9d85e..b65e27331f 100644
--- a/mingw-w64-pngcrush/PKGBUILD
+++ b/mingw-w64-pngcrush/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=pngcrush
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=1.8.1
+pkgver=1.8.2
 pkgrel=1
 pkgdesc="A tool for optimizing the compression of PNG files (mingw-w64)"
 arch=('any')
@@ -13,7 +13,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc")
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-libpng" "${MINGW_PACKAGE_PREFIX}-zlib")
 source=("https://downloads.sourceforge.net/pmt/${_realname}-${pkgver}-nolib.tar.gz"
         LICENSE)
-sha256sums=('5d55f89a3a596f4916c42a1819bdcf4e3bae77db7ce42716eb5c2ad69a6a2e36'
+sha256sums=('eb742ba39cd8cbeb87ccbd7849b0084da45f3701254ebd5f6db98ab7ebcaa236'
             '5628338f1b1c711b2b2e82d14124bc3001b37216a66f00b18d0b3b9c7e016720')
 
 prepare() {

From 4c1f3a80d37da344faf5df11c9c2ae3355ed8487 Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com>
Date: Sat, 16 Jul 2016 22:34:45 +0100
Subject: [PATCH 19/22] gcc-git: Backport -Os ICE fix from master to
 gcc-6-branch

Also added an unapplied patch to aid debugging -Os issues.
---
 ...c-71092-ICE-with-array-and-constexpr.patch | 111 ++++++++
 ...to-disable-optimize-for-size-changes.patch | 251 ++++++++++++++++++
 mingw-w64-gcc-git/PKGBUILD                    |  43 +--
 3 files changed, 387 insertions(+), 18 deletions(-)
 create mode 100644 mingw-w64-gcc-git/0016-gcc-6-branch-PR-c-71092-ICE-with-array-and-constexpr.patch
 create mode 100644 mingw-w64-gcc-git/9999-gcc-6-branch-Add-defines-to-disable-optimize-for-size-changes.patch

diff --git a/mingw-w64-gcc-git/0016-gcc-6-branch-PR-c-71092-ICE-with-array-and-constexpr.patch b/mingw-w64-gcc-git/0016-gcc-6-branch-PR-c-71092-ICE-with-array-and-constexpr.patch
new file mode 100644
index 0000000000..ee5fb76bb9
--- /dev/null
+++ b/mingw-w64-gcc-git/0016-gcc-6-branch-PR-c-71092-ICE-with-array-and-constexpr.patch
@@ -0,0 +1,111 @@
+From e743361cb91a7e1b8572c2c125ad2ddf69eed890 Mon Sep 17 00:00:00 2001
+From: jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Fri, 15 Jul 2016 18:49:38 +0000
+Subject: [PATCH] PR c++/71092 - ICE with array and constexpr.
+
+	* constexpr.c (cxx_eval_call_expression): Fail quietly when cgraph
+	threw away DECL_SAVED_TREE.
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@238395 138bc75d-0d04-0410-961f-82ee72b054a4
+---
+ gcc/cp/constexpr.c                             | 14 +++++-
+ gcc/testsuite/g++.dg/cpp0x/constexpr-array17.C | 61 ++++++++++++++++++++++++++
+ 2 files changed, 73 insertions(+), 2 deletions(-)
+ create mode 100644 gcc/testsuite/g++.dg/cpp0x/constexpr-array17.C
+
+diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c
+index 55b05e7..4c98518 100644
+--- a/gcc/cp/constexpr.c
++++ b/gcc/cp/constexpr.c
+@@ -1450,9 +1450,19 @@ cxx_eval_call_expression (const constexpr_ctx *ctx, tree t,
+     }
+   else
+     {
+-      if (!result || result == error_mark_node)
++      if (result && result != error_mark_node)
++	/* OK */;
++      else if (!DECL_SAVED_TREE (fun))
++	{
++	  /* When at_eof >= 2, cgraph has started throwing away
++	     DECL_SAVED_TREE, so fail quietly.  FIXME we get here because of
++	     late code generation for VEC_INIT_EXPR, which needs to be
++	     completely reconsidered.  */
++	  gcc_assert (at_eof >= 2 && ctx->quiet);
++	  *non_constant_p = true;
++	}
++      else
+ 	{
+-	  gcc_assert (DECL_SAVED_TREE (fun));
+ 	  tree body, parms, res;
+ 
+ 	  /* Reuse or create a new unshared copy of this function's body.  */
+diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-array17.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-array17.C
+new file mode 100644
+index 0000000..c6afa50
+--- /dev/null
++++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-array17.C
+@@ -0,0 +1,61 @@
++// PR c++/71092
++// { dg-do compile { target c++11 } }
++
++template <typename _Default> struct A { using type = _Default; };
++template <typename _Default, template <typename> class>
++using __detected_or = A<_Default>;
++template <typename _Default, template <typename> class _Op>
++using __detected_or_t = typename __detected_or<_Default, _Op>::type;
++template <typename _Tp> struct B { typedef _Tp value_type; };
++struct C {
++  template <typename _Tp> using __pointer = typename _Tp::pointer;
++};
++template <typename _Alloc> struct J : C {
++  using pointer = __detected_or_t<typename _Alloc::value_type *, __pointer>;
++};
++template <typename _T1> void _Construct(_T1 *) { new _T1; }
++struct D {
++  template <typename _ForwardIterator, typename _Size>
++  static _ForwardIterator __uninit_default_n(_ForwardIterator p1, _Size) {
++    _Construct(p1);
++  }
++};
++template <typename _ForwardIterator, typename _Size>
++void __uninitialized_default_n(_ForwardIterator p1, _Size) {
++  D::__uninit_default_n(p1, 0);
++}
++template <typename _ForwardIterator, typename _Size, typename _Tp>
++void __uninitialized_default_n_a(_ForwardIterator p1, _Size, _Tp) {
++  __uninitialized_default_n(p1, 0);
++}
++template <typename> struct __shared_ptr {
++  constexpr __shared_ptr() : _M_ptr(), _M_refcount() {}
++  int _M_ptr;
++  int _M_refcount;
++};
++template <typename _Alloc> struct F {
++  typedef _Alloc _Tp_alloc_type;
++  struct G {
++    typename J<_Tp_alloc_type>::pointer _M_start;
++    G(_Tp_alloc_type);
++  };
++  F(int, _Alloc p2) : _M_impl(p2) {}
++  G _M_impl;
++};
++template <typename _Tp, typename _Alloc = B<_Tp>> struct K : F<_Alloc> {
++  typedef _Alloc allocator_type;
++  K(int, allocator_type p2 = allocator_type()) : F<_Alloc>(0, p2) {
++    __uninitialized_default_n_a(this->_M_impl._M_start, 0, 0);
++  }
++};
++struct H {
++  H();
++  struct I {
++    __shared_ptr<int> trigger[1];
++  };
++  __shared_ptr<int> resetTrigger_;
++  K<I> states_;
++  __shared_ptr<int> triggerManager_;
++};
++__shared_ptr<int> a;
++H::H() : states_(0), triggerManager_(a) {}
+-- 
+2.9.1
+
diff --git a/mingw-w64-gcc-git/9999-gcc-6-branch-Add-defines-to-disable-optimize-for-size-changes.patch b/mingw-w64-gcc-git/9999-gcc-6-branch-Add-defines-to-disable-optimize-for-size-changes.patch
new file mode 100644
index 0000000000..fd3e392b00
--- /dev/null
+++ b/mingw-w64-gcc-git/9999-gcc-6-branch-Add-defines-to-disable-optimize-for-size-changes.patch
@@ -0,0 +1,251 @@
+From 0436f76da397aef1b088d7fe8ad68f3fd259f750 Mon Sep 17 00:00:00 2001
+From: Ray Donnelly <mingw.android@gmail.com>
+Date: Sat, 16 Jul 2016 18:06:04 +0100
+Subject: [PATCH] Add defines to disable optimize for size changes
+
+---
+ gcc/c-family/c-opts.c  |  4 ++++
+ gcc/cgraph.c           |  2 ++
+ gcc/cgraph.h           |  2 ++
+ gcc/config.in          | 11 +++++++++++
+ gcc/config/i386/i386.c | 15 +++++++++++++--
+ gcc/ipa-icf.c          | 14 ++++++++++----
+ gcc/ipa-inline.c       | 16 +++++++++++-----
+ gcc/predict.c          |  4 ++++
+ 8 files changed, 57 insertions(+), 11 deletions(-)
+
+diff --git a/gcc/c-family/c-opts.c b/gcc/c-family/c-opts.c
+index fec58bc..4db2809 100644
+--- a/gcc/c-family/c-opts.c
++++ b/gcc/c-family/c-opts.c
+@@ -869,8 +869,12 @@ c_common_post_options (const char **pfilename)
+ 				 && (cxx_dialect >= cxx11 || flag_isoc99));
+ 
+   /* Declone C++ 'structors if -Os.  */
++#ifdef OSIZE_FLAG_DECLONE_CTOR_DTOR
+   if (flag_declone_ctor_dtor == -1)
+     flag_declone_ctor_dtor = optimize_size;
++#else
++  flag_declone_ctor_dtor = 0;
++#endif
+ 
+   if (warn_abi_version == -1)
+     {
+diff --git a/gcc/cgraph.c b/gcc/cgraph.c
+index e256dd0..5be5aad 100644
+--- a/gcc/cgraph.c
++++ b/gcc/cgraph.c
+@@ -2097,8 +2097,10 @@ cgraph_node::dump (FILE *f)
+     fprintf (f, " only_called_at_startup");
+   if (only_called_at_exit)
+     fprintf (f, " only_called_at_exit");
++#ifdef OSIZE_CGRAPH_NODE_DUMP
+   if (opt_for_fn (decl, optimize_size))
+     fprintf (f, " optimize_size");
++#endif
+   if (parallelized_function)
+     fprintf (f, " parallelized_function");
+ 
+diff --git a/gcc/cgraph.h b/gcc/cgraph.h
+index ecafe63..ce5c7bb 100644
+--- a/gcc/cgraph.h
++++ b/gcc/cgraph.h
+@@ -3070,8 +3070,10 @@ cgraph_node::mark_force_output (void)
+ inline bool
+ cgraph_node::optimize_for_size_p (void)
+ {
++#ifdef OSIZE_CGRAPH_NODE_OPTIMIZE_FOR_SIZE_P
+   if (opt_for_fn (decl, optimize_size))
+     return true;
++#endif
+   if (frequency == NODE_FREQUENCY_UNLIKELY_EXECUTED)
+     return true;
+   else
+diff --git a/gcc/config.in b/gcc/config.in
+index 2deb8ed..a7ab371 100644
+--- a/gcc/config.in
++++ b/gcc/config.in
+@@ -2361,3 +2361,14 @@
+ #undef vfork
+ #endif
+ 
++#define OSIZE_FLAG_DECLONE_CTOR_DTOR
++#define OSIZE_CGRAPH_NODE_DUMP
++#define OSIZE_CGRAPH_NODE_OPTIMIZE_FOR_SIZE_P
++#define OSIZE_DONT_PASS_INSERT_VZEROUPPER
++#define OSIZE_USE_SIZE_COST
++#define OSIZE_CHECK_FOR_X_FLAG_PREFETCH_LOOP_ARRAYS
++#define OSIZE_USE_SIZE_COST2
++#define OSIZE_DECIDE_ALIGNMENT_AS_1
++#define OSIZE_OPTIMIZE_FUNCTION_FOR_SIZE_P
++#define OSIZE_IPA_ICF_CHECK_OPT_FOR_SIZE
++#define OSIZE_IPA_INLINE_CHECK_OPT_FOR_SIZE
+diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
+index c5e5e12..d0fbe17 100644
+--- a/gcc/config/i386/i386.c
++++ b/gcc/config/i386/i386.c
+@@ -4015,7 +4015,11 @@ public:
+     {
+       return TARGET_AVX && !TARGET_AVX512F
+ 	     && TARGET_VZEROUPPER && flag_expensive_optimizations
+-	     && !optimize_size;
++#ifdef OSIZE_DONT_PASS_INSERT_VZEROUPPER
++              && !optimize_size;
++#else
++              ;
++#endif
+     }
+ 
+   virtual unsigned int execute (function *)
+@@ -5483,9 +5487,11 @@ ix86_option_override_internal (bool main_args_p,
+   ix86_tune_cost = processor_target_table[ix86_tune].cost;
+   /* TODO: ix86_cost should be chosen at instruction or function granuality
+      so for cold code we use size_cost even in !optimize_size compilation.  */
++#ifdef OSIZE_USE_SIZE_COST
+   if (opts->x_optimize_size)
+     ix86_cost = &ix86_size_cost;
+   else
++#endif
+     ix86_cost = ix86_tune_cost;
+ 
+   /* Arrange to set up i386_stack_locals for all functions.  */
+@@ -5779,7 +5785,9 @@ ix86_option_override_internal (bool main_args_p,
+   if (opts->x_flag_prefetch_loop_arrays < 0
+       && HAVE_prefetch
+       && (opts->x_optimize >= 3 || opts->x_flag_profile_use)
++#ifdef OSIZE_CHECK_FOR_X_FLAG_PREFETCH_LOOP_ARRAYS
+       && !opts->x_optimize_size
++#endif
+       && TARGET_SOFTWARE_PREFETCHING_BENEFICIAL)
+     opts->x_flag_prefetch_loop_arrays = 1;
+ 
+@@ -6196,9 +6204,11 @@ ix86_function_specific_restore (struct gcc_options *opts,
+   ix86_tune_cost = processor_target_table[ix86_tune].cost;
+   /* TODO: ix86_cost should be chosen at instruction or function granuality
+      so for cold code we use size_cost even in !optimize_size compilation.  */
++#ifdef OSIZE_USE_SIZE_COST2
+   if (opts->x_optimize_size)
+     ix86_cost = &ix86_size_cost;
+   else
++#endif
+     ix86_cost = ix86_tune_cost;
+ 
+   /* Recreate the arch feature tests if the arch changed */
+@@ -26789,9 +26799,10 @@ decide_alignment (int align,
+   if (TARGET_PENTIUMPRO
+       && (alg == rep_prefix_4_byte || alg == rep_prefix_1_byte))
+     desired_align = 8;
+-
++#ifdef OSIZE_DECIDE_ALIGNMENT_AS_1
+   if (optimize_size)
+     desired_align = 1;
++#endif
+   if (desired_align < align)
+     desired_align = align;
+   if (expected_size != -1 && expected_size < 4)
+diff --git a/gcc/ipa-icf.c b/gcc/ipa-icf.c
+index 3c04b5a..a6976a5 100644
+--- a/gcc/ipa-icf.c
++++ b/gcc/ipa-icf.c
+@@ -84,6 +84,12 @@ along with GCC; see the file COPYING3.  If not see
+ #include "stor-layout.h"
+ #include "dbgcnt.h"
+ 
++#ifdef OSIZE_IPA_ICF_CHECK_OPT_FOR_SIZE
++#define opt_for_fn_2(fndecl, opt) (opts_for_fn (fndecl)->x_##opt)
++#else
++#define opt_for_fn_2(fndecl, opt) (0)
++#endif
++
+ using namespace ipa_icf_gimple;
+ 
+ namespace ipa_icf {
+@@ -393,8 +399,8 @@ sem_item::compare_referenced_symbol_properties (symtab_node *used_by,
+ 	 unit has no !optimize_size functions. */
+ 
+       if ((!used_by || address || !is_a <cgraph_node *> (used_by)
+-	   || !opt_for_fn (used_by->decl, optimize_size))
+-	  && !opt_for_fn (n1->decl, optimize_size)
++           || !opt_for_fn_2 (used_by->decl, optimize_size))
++          && !opt_for_fn_2 (n1->decl, optimize_size)
+ 	  && n1->get_availability () > AVAIL_INTERPOSABLE
+ 	  && (!DECL_UNINLINABLE (n1->decl) || !DECL_UNINLINABLE (n2->decl)))
+ 	{
+@@ -466,8 +472,8 @@ sem_item::hash_referenced_symbol_properties (symtab_node *ref,
+ {
+   if (is_a <cgraph_node *> (ref))
+     {
+-      if ((type != FUNC || address || !opt_for_fn (decl, optimize_size))
+-	  && !opt_for_fn (ref->decl, optimize_size)
++      if ((type != FUNC || address || !opt_for_fn_2 (decl, optimize_size))
++          && !opt_for_fn_2 (ref->decl, optimize_size)
+ 	  && !DECL_UNINLINABLE (ref->decl))
+ 	{
+ 	  hstate.add_flag (DECL_DISREGARD_INLINE_LIMITS (ref->decl));
+diff --git a/gcc/ipa-inline.c b/gcc/ipa-inline.c
+index 5c9366a..d247654 100644
+--- a/gcc/ipa-inline.c
++++ b/gcc/ipa-inline.c
+@@ -124,6 +124,12 @@ static int overall_size;
+ static gcov_type max_count;
+ static gcov_type spec_rem;
+ 
++#ifdef OSIZE_IPA_INLINE_CHECK_OPT_FOR_SIZE
++#define opt_for_fn_2(fndecl, opt) (opts_for_fn (fndecl)->x_##opt)
++#else
++#define opt_for_fn_2(fndecl, opt) (0)
++#endif
++
+ /* Pre-computed constants 1/CGRAPH_FREQ_BASE and 1/100. */
+ static sreal cgraph_freq_base_rec, percent_rec;
+ 
+@@ -483,8 +489,8 @@ can_inline_edge_p (struct cgraph_edge *e, bool report,
+ 	 code shrinks or we are in MAX_INLINE_INSNS_SINGLE limit and callee
+ 	 is inline (and thus likely an unified comdat).  This will allow caller
+ 	 to run faster.  */
+-      else if (opt_for_fn (callee->decl, optimize_size)
+-	       > opt_for_fn (caller->decl, optimize_size))
++      else if (opt_for_fn_2 (callee->decl, optimize_size)
++               > opt_for_fn_2 (caller->decl, optimize_size))
+ 	{
+ 	  int growth = estimate_edge_growth (e);
+ 	  if (growth > 0
+@@ -498,8 +504,8 @@ can_inline_edge_p (struct cgraph_edge *e, bool report,
+ 	}
+       /* If callee is more aggressively optimized for performance than caller,
+ 	 we generally want to inline only cheap (runtime wise) functions.  */
+-      else if (opt_for_fn (callee->decl, optimize_size)
+-	       < opt_for_fn (caller->decl, optimize_size)
++      else if (opt_for_fn_2 (callee->decl, optimize_size)
++               < opt_for_fn_2 (caller->decl, optimize_size)
+ 	       || (opt_for_fn (callee->decl, optimize)
+ 		   > opt_for_fn (caller->decl, optimize)))
+ 	{
+@@ -1704,7 +1710,7 @@ bool
+ inline_account_function_p (struct cgraph_node *node)
+ {
+    return (!DECL_EXTERNAL (node->decl)
+-	   && !opt_for_fn (node->decl, optimize_size)
++           && !opt_for_fn_2 (node->decl, optimize_size)
+ 	   && node->frequency != NODE_FREQUENCY_UNLIKELY_EXECUTED);
+ }
+ 
+diff --git a/gcc/predict.c b/gcc/predict.c
+index 7d55ff7..84c2390 100644
+--- a/gcc/predict.c
++++ b/gcc/predict.c
+@@ -272,7 +272,11 @@ bool
+ optimize_function_for_size_p (struct function *fun)
+ {
+   if (!fun || !fun->decl)
++#ifdef OSIZE_OPTIMIZE_FUNCTION_FOR_SIZE_P
+     return optimize_size;
++#else
++    return 0;
++#endif
+   cgraph_node *n = cgraph_node::get (fun->decl);
+   return n && n->optimize_for_size_p ();
+ }
+-- 
+2.9.1
+
diff --git a/mingw-w64-gcc-git/PKGBUILD b/mingw-w64-gcc-git/PKGBUILD
index cc6a86f787..fa44c1eb25 100644
--- a/mingw-w64-gcc-git/PKGBUILD
+++ b/mingw-w64-gcc-git/PKGBUILD
@@ -11,7 +11,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}-git"
          "${MINGW_PACKAGE_PREFIX}-${_realname}-fortran-git"
          "${MINGW_PACKAGE_PREFIX}-${_realname}-ada-git"
          "${MINGW_PACKAGE_PREFIX}-${_realname}-objc-git")
-pkgver=r145817.32dc90f
+pkgver=r146016.f1d38eb
 pkgrel=1
 pkgdesc="GCC for the MinGW-w64"
 arch=('any')
@@ -60,7 +60,9 @@ source=("git://gcc.gnu.org/git/gcc.git#branch=${_branch}"
         "0013-MinGW-w64-Enable-shared-gnat.patch"
         "0014-gcc-5-branch-clone_function_name_1-Retain-any-stdcall-suffix.patch"
         "0014-gcc-6-branch-clone_function_name_1-Retain-any-stdcall-suffix.patch"
-        "0015-Force-linking-to-libgcc_s_dw2-1.dll-deprecated.patch")
+        "0015-Force-linking-to-libgcc_s_dw2-1.dll-deprecated.patch"
+        "0016-gcc-6-branch-PR-c-71092-ICE-with-array-and-constexpr.patch"
+        "9999-gcc-6-branch-Add-defines-to-disable-optimize-for-size-changes.patch")
 sha256sums=('SKIP'
             '49a5e264e611de7f2388f01ba649ec22cf3ae1cde3ba45082a7d72294c2f4fd7'
             '83e9c6f76f728ae3e2f2eabb588b0d6cea7a3eda03cd5e77aed9d613143b7348'
@@ -78,7 +80,9 @@ sha256sums=('SKIP'
             'bab73267116024d0b0d2a9dcb78a0ad839bb6a232f1ebbee7ed8fd54c8d71087'
             'ad4bb777a7f19070e83bdf5046281ee9e359ed039c70179285c4119244cf9093'
             '60a58ed41389691a68ef4b7d47a0328df4d28d26e6c680a6b06b31191481ca65'
-            '262c6fb0f6c9951d69e4c2dcc27949aa8f2cca8e672faf66740a7dbba4a4cd2c')
+            '262c6fb0f6c9951d69e4c2dcc27949aa8f2cca8e672faf66740a7dbba4a4cd2c'
+            '2f422c1c3c90145072c8636cf5ee94419d4f7872741fcff913fa65b3a98df570'
+            'a82eadfbb6a182b1ffeb860e89c89f46373a8b891594280b2268ecac8d7bac88')
 
 _threads="posix"
 
@@ -89,21 +93,24 @@ pkgver() {
 
 prepare() {
   cd ${srcdir}/${_realname}
-  git am "${srcdir}"/0001-${_branch}-gfortran-incorrect-reading-of-values-fr.patch || true
-  git am "${srcdir}"/0002-Relocate-libintl.patch
-  git am "${srcdir}"/0003-Windows-Follow-Posix-dir-exists-semantics-more-close.patch
-  git am "${srcdir}"/0004-Windows-Use-not-in-progpath-and-leave-case-as-is.patch
-  git am "${srcdir}"/0005-Windows-Don-t-ignore-native-system-header-dir.patch
-  git am "${srcdir}"/0006-${_branch}-Windows-New-feature-to-allow-overriding.patch
-  git am "${srcdir}"/0007-Build-EXTRA_GNATTOOLS-for-Ada.patch
-  git am "${srcdir}"/0008-Prettify-linking-no-undefined.patch
-  git am "${srcdir}"/0009-gcc-make-xmmintrin-header-cplusplus-compatible-depre.patch
-  git am "${srcdir}"/0010-Fix-using-large-PCH.patch
-  git am "${srcdir}"/0011-Enable-shared-gnat-implib.patch
-  git am "${srcdir}"/0012-MinGW-w64-Enable-libitm.patch
-  git am "${srcdir}"/0013-MinGW-w64-Enable-shared-gnat.patch
-  git am "${srcdir}"/0014-${_branch}-clone_function_name_1-Retain-any-stdcall-suffix.patch
-  git am "${srcdir}"/0015-Force-linking-to-libgcc_s_dw2-1.dll-deprecated.patch
+  GIT_AM="git am --committer-date-is-author-date"
+  ${GIT_AM} "${srcdir}"/0001-${_branch}-gfortran-incorrect-reading-of-values-fr.patch || true
+  ${GIT_AM} "${srcdir}"/0002-Relocate-libintl.patch
+  ${GIT_AM} "${srcdir}"/0003-Windows-Follow-Posix-dir-exists-semantics-more-close.patch
+  ${GIT_AM} "${srcdir}"/0004-Windows-Use-not-in-progpath-and-leave-case-as-is.patch
+  ${GIT_AM} "${srcdir}"/0005-Windows-Don-t-ignore-native-system-header-dir.patch
+  ${GIT_AM} "${srcdir}"/0006-${_branch}-Windows-New-feature-to-allow-overriding.patch
+  ${GIT_AM} "${srcdir}"/0007-Build-EXTRA_GNATTOOLS-for-Ada.patch
+  ${GIT_AM} "${srcdir}"/0008-Prettify-linking-no-undefined.patch
+  ${GIT_AM} "${srcdir}"/0009-gcc-make-xmmintrin-header-cplusplus-compatible-depre.patch
+  ${GIT_AM} "${srcdir}"/0010-Fix-using-large-PCH.patch
+  ${GIT_AM} "${srcdir}"/0011-Enable-shared-gnat-implib.patch
+  ${GIT_AM} "${srcdir}"/0012-MinGW-w64-Enable-libitm.patch
+  ${GIT_AM} "${srcdir}"/0013-MinGW-w64-Enable-shared-gnat.patch
+  ${GIT_AM} "${srcdir}"/0014-${_branch}-clone_function_name_1-Retain-any-stdcall-suffix.patch
+  ${GIT_AM} "${srcdir}"/0015-Force-linking-to-libgcc_s_dw2-1.dll-deprecated.patch
+  ${GIT_AM} "${srcdir}"/0016-gcc-6-branch-PR-c-71092-ICE-with-array-and-constexpr.patch
+# ${GIT_AM} "${srcdir}"/9999-gcc-6-branch-Add-defines-to-disable-optimize-for-size-changes.patch
 
   # do not expect $prefix/mingw symlink - this should be superceded by
   # 0004-Windows-Don-t-ignore-native-system-header-dir.patch .. but isn't!

From 1ddf75f00e3e2e20b8b6100eb1ac9acf6368b5ea Mon Sep 17 00:00:00 2001
From: oroppas <oroppas@github.com>
Date: Sun, 17 Jul 2016 15:32:06 +0900
Subject: [PATCH 20/22] Removed slash before MINGW_PREFIX

---
 mingw-w64-python-decorator/PKGBUILD           | 4 ++--
 mingw-w64-python-path/PKGBUILD                | 8 ++++----
 mingw-w64-python-pickleshare/PKGBUILD         | 4 ++--
 mingw-w64-python-prompt_toolkit/PKGBUILD      | 6 +++---
 mingw-w64-python-traitlets/PKGBUILD           | 4 ++--
 mingw-w64-python-wcwidth/PKGBUILD             | 4 ++--
 mingw-w64-python-win_unicode_console/PKGBUILD | 4 ++--
 7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/mingw-w64-python-decorator/PKGBUILD b/mingw-w64-python-decorator/PKGBUILD
index a4822e8a17..0ed2eb4716 100644
--- a/mingw-w64-python-decorator/PKGBUILD
+++ b/mingw-w64-python-decorator/PKGBUILD
@@ -38,7 +38,7 @@ package_python3-decorator() {
   cd ${_realname}
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python3 setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1
-  install -D -m644 LICENSE.txt ${pkgdir}/${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE
+  install -D -m644 LICENSE.txt ${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE
 }
 
 package_python2-decorator() {
@@ -47,7 +47,7 @@ package_python2-decorator() {
   cd ${_realname}-py2
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python2 setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1
-  install -D -m644 LICENSE.txt ${pkgdir}/${MINGW_PREFIX}/share/licenses/python2-${_realname}/LICENSE
+  install -D -m644 LICENSE.txt ${pkgdir}${MINGW_PREFIX}/share/licenses/python2-${_realname}/LICENSE
 }
 
 package_mingw-w64-i686-python2-decorator() {
diff --git a/mingw-w64-python-path/PKGBUILD b/mingw-w64-python-path/PKGBUILD
index 2e9d961329..8289833db4 100644
--- a/mingw-w64-python-path/PKGBUILD
+++ b/mingw-w64-python-path/PKGBUILD
@@ -54,8 +54,8 @@ package_python3-path() {
   cd ${srcdir}/${_realname}-${pkgver}
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python3 setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1
-  install -d ${pkgdir}/${MINGW_PREFIX}/share/licenses/python3-${_realname}
-  head -n 21 path.py > ${pkgdir}/${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE
+  install -d ${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}
+  head -n 21 path.py > ${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE
 }
 
 package_python2-path() {
@@ -64,8 +64,8 @@ package_python2-path() {
   cd ${srcdir}/${_realname}-${pkgver}-py2
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python2 setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1
-  install -d ${pkgdir}/${MINGW_PREFIX}/share/licenses/python2-${_realname}
-  head -n 21 path.py > ${pkgdir}/${MINGW_PREFIX}/share/licenses/python2-${_realname}/LICENSE
+  install -d ${pkgdir}${MINGW_PREFIX}/share/licenses/python2-${_realname}
+  head -n 21 path.py > ${pkgdir}${MINGW_PREFIX}/share/licenses/python2-${_realname}/LICENSE
 }
 
 package_mingw-w64-i686-python2-path() {
diff --git a/mingw-w64-python-pickleshare/PKGBUILD b/mingw-w64-python-pickleshare/PKGBUILD
index 864c972976..f118abe704 100644
--- a/mingw-w64-python-pickleshare/PKGBUILD
+++ b/mingw-w64-python-pickleshare/PKGBUILD
@@ -49,7 +49,7 @@ package_python3-pickleshare() {
   cd ${srcdir}/${_realname}-${pkgver}
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python3 setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1
-  install -Dm644 LICENSE ${pkgdir}/${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE
+  install -Dm644 LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE
 }
 
 package_python2-pickleshare() {
@@ -58,7 +58,7 @@ package_python2-pickleshare() {
   cd ${srcdir}/${_realname}-${pkgver}-py2
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python2 setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1
-  install -Dm644 LICENSE ${pkgdir}/${MINGW_PREFIX}/share/licenses/python2-${_realname}/LICENSE
+  install -Dm644 LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/python2-${_realname}/LICENSE
 }
 
 package_mingw-w64-i686-python2-pickleshare() {
diff --git a/mingw-w64-python-prompt_toolkit/PKGBUILD b/mingw-w64-python-prompt_toolkit/PKGBUILD
index 45b55136db..b74b023866 100644
--- a/mingw-w64-python-prompt_toolkit/PKGBUILD
+++ b/mingw-w64-python-prompt_toolkit/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=(
 )
 pkgver=1.0.3
 pkgrel=1
-pkgdesc=""
+pkgdesc="Library for building powerful interactive command lines in Python"
 url="https://github.com/jonathanslenders/python-prompt-toolkit"
 arch=('any')
 license=('BSD')
@@ -53,7 +53,7 @@ package_python3-prompt_toolkit() {
   cd ${srcdir}/python-prompt-toolkit-${pkgver}
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python3 setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1
-  install -Dm644 LICENSE ${pkgdir}/${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE
+  install -Dm644 LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE
 }
 
 package_python2-prompt_toolkit() {
@@ -66,7 +66,7 @@ package_python2-prompt_toolkit() {
   cd ${srcdir}/python-prompt-toolkit-${pkgver}-py2
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python2 setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1
-  install -Dm644 LICENSE ${pkgdir}/${MINGW_PREFIX}/share/licenses/python2-${_realname}/LICENSE
+  install -Dm644 LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/python2-${_realname}/LICENSE
 }
 
 package_mingw-w64-i686-python2-prompt_toolkit() {
diff --git a/mingw-w64-python-traitlets/PKGBUILD b/mingw-w64-python-traitlets/PKGBUILD
index 60e53bbf73..bde65050f3 100644
--- a/mingw-w64-python-traitlets/PKGBUILD
+++ b/mingw-w64-python-traitlets/PKGBUILD
@@ -53,7 +53,7 @@ package_python3-traitlets() {
   cd ${srcdir}/${_realname}-${pkgver}
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python3 setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1
-  install -Dm644 COPYING.md ${pkgdir}/${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE
+  install -Dm644 COPYING.md ${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE
 }
 
 package_python2-traitlets() {
@@ -65,7 +65,7 @@ package_python2-traitlets() {
   cd ${srcdir}/${_realname}-${pkgver}-py2
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python2 setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1
-  install -Dm644 COPYING.md ${pkgdir}/${MINGW_PREFIX}/share/licenses/python2-${_realname}/LICENSE
+  install -Dm644 COPYING.md ${pkgdir}${MINGW_PREFIX}/share/licenses/python2-${_realname}/LICENSE
 }
 
 package_mingw-w64-i686-python2-traitlets() {
diff --git a/mingw-w64-python-wcwidth/PKGBUILD b/mingw-w64-python-wcwidth/PKGBUILD
index 3a09a1777c..d6b3895644 100644
--- a/mingw-w64-python-wcwidth/PKGBUILD
+++ b/mingw-w64-python-wcwidth/PKGBUILD
@@ -49,7 +49,7 @@ package_python3-wcwidth() {
   cd ${srcdir}/${_realname}-${pkgver}
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python3 setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1
-  install -Dm644 LICENSE.txt ${pkgdir}/${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE
+  install -Dm644 LICENSE.txt ${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE
 }
 
 package_python2-wcwidth() {
@@ -58,7 +58,7 @@ package_python2-wcwidth() {
   cd ${srcdir}/${_realname}-${pkgver}-py2
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python2 setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1
-  install -Dm644 LICENSE.txt ${pkgdir}/${MINGW_PREFIX}/share/licenses/python2-${_realname}/LICENSE
+  install -Dm644 LICENSE.txt ${pkgdir}${MINGW_PREFIX}/share/licenses/python2-${_realname}/LICENSE
 }
 
 package_mingw-w64-i686-python2-wcwidth() {
diff --git a/mingw-w64-python-win_unicode_console/PKGBUILD b/mingw-w64-python-win_unicode_console/PKGBUILD
index 3fba3136ed..62b11893c1 100644
--- a/mingw-w64-python-win_unicode_console/PKGBUILD
+++ b/mingw-w64-python-win_unicode_console/PKGBUILD
@@ -37,7 +37,7 @@ package_python3-win_unicode_console() {
   cd ${srcdir}/win-unicode-console-${pkgver}
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python3 setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1
-  install -Dm644 LICENSE ${pkgdir}/${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE
+  install -Dm644 LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE
 }
 
 package_python2-win_unicode_console() {
@@ -46,7 +46,7 @@ package_python2-win_unicode_console() {
   cd ${srcdir}/win-unicode-console-${pkgver}-py2
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python2 setup.py install --root=${pkgdir} --prefix=${MINGW_PREFIX} --optimize=1
-  install -Dm644 LICENSE ${pkgdir}/${MINGW_PREFIX}/share/licenses/python2-${_realname}/LICENSE
+  install -Dm644 LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/python2-${_realname}/LICENSE
 }
 
 package_mingw-w64-i686-python2-win_unicode_console() {

From eed91d3734d9cd99aaa07dfb4723d8e4630e7979 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <vszakats@users.noreply.github.com>
Date: Sun, 17 Jul 2016 13:13:02 +0200
Subject: [PATCH 21/22] fontconfig: bump pkgrel and update url

pkgrel bump for `MSYS2_FC_CONFIG_SKIP` patch to propagate into the distro.
---
 mingw-w64-fontconfig/PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mingw-w64-fontconfig/PKGBUILD b/mingw-w64-fontconfig/PKGBUILD
index cf12d5bdf7..982ef8bfc8 100644
--- a/mingw-w64-fontconfig/PKGBUILD
+++ b/mingw-w64-fontconfig/PKGBUILD
@@ -5,10 +5,10 @@ _realname=fontconfig
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=2.12.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A library for configuring and customizing font access (mingw-w64)"
 arch=('any')
-url="http://www.fontconfig.org/release"
+url="https://wiki.freedesktop.org/www/Software/fontconfig/"
 license=("custom")
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config")
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"

From 937783443c72042d57dd7598ae385063e686d2ee Mon Sep 17 00:00:00 2001
From: mcallegari79 <massimocallegari@yahoo.it>
Date: Sun, 17 Jul 2016 20:15:22 +0200
Subject: [PATCH 22/22] qt5-git: Removed patch 0050

Tested and confirmed to be not needed anymore. The original issue has
been fixed upstream.
---
 .../0050-disable-default-lib-include-detection.patch  | 11 -----------
 mingw-w64-qt5-git/PKGBUILD                            |  5 +----
 2 files changed, 1 insertion(+), 15 deletions(-)
 delete mode 100644 mingw-w64-qt5-git/0050-disable-default-lib-include-detection.patch

diff --git a/mingw-w64-qt5-git/0050-disable-default-lib-include-detection.patch b/mingw-w64-qt5-git/0050-disable-default-lib-include-detection.patch
deleted file mode 100644
index 64475b7e7a..0000000000
--- a/mingw-w64-qt5-git/0050-disable-default-lib-include-detection.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/mkspecs/features/default_pre.prf	2016-06-25 18:44:50.952774100 +0200
-+++ b/mkspecs/features/default_pre.prf	2016-06-25 18:42:00.416181500 +0200
-@@ -29,7 +29,7 @@
-     #
-     # Get default include and library paths from compiler
-     #
--    gcc {
-+    !win32:gcc {
-         equals(QMAKE_DIR_SEP, /) {
-             cmd_prefix = "LC_ALL=C"
-             cmd_suffix = "</dev/null >/dev/null"
diff --git a/mingw-w64-qt5-git/PKGBUILD b/mingw-w64-qt5-git/PKGBUILD
index c100d8949d..fc002999c6 100644
--- a/mingw-w64-qt5-git/PKGBUILD
+++ b/mingw-w64-qt5-git/PKGBUILD
@@ -6,7 +6,7 @@ _qt_git_repo=https://code.qt.io/qt
 #_qt_git_repo=https://github.com/qtproject
 
 # The Qt5 GIT branch to clone and build (replace with 'dev' to build the bleeding edge sources)
-_qt_git_branch=5.7.0
+_qt_git_branch=5.7
 
 # The way Qt5 libraries are built. Possible values are '-release', '-debug' or '-debug_and_release'
 _build_mode=-release
@@ -165,7 +165,6 @@ source=(
 	0046-Revert-Revert-fix-NTFS-mount-points.patch
 	0048-win32-Avoid-platformNativeInterface-segfaults-with-minimal-platform.patch
 	0049-do-not-include-qopengles2ext-h.patch
-	0050-disable-default-lib-include-detection.patch
 	)
 
 pkgver() {
@@ -291,7 +290,6 @@ prepare() {
   pushd qtbase > /dev/null
     patch -p1 -i ${srcdir}/0046-Revert-Revert-fix-NTFS-mount-points.patch
     patch -p1 -i ${srcdir}/0049-do-not-include-qopengles2ext-h.patch
-    patch -p1 -i ${srcdir}/0050-disable-default-lib-include-detection.patch
   popd > /dev/null
   rm -f ${srcdir}/qt5/qtbase/src/gui/opengl/qopengles2ext.h
 
@@ -490,5 +488,4 @@ sha256sums=('609ab74b93ef11f24ef4d7c1bd0a2e81c4280b07fa455dfcf003a2364ab72745'
             'fd6b1cd956730c1a05a7489760afed6b36561a3b0ec5857c3fbe21dcd7a54617'  # 0046-Revert-Revert-fix-NTFS-mount-points.patch
             '3bda25f357a33b122345fea011a14199b5953fd248fab960a5344a2ed9401331'  # 0048-win32-Avoid-platformNativeInterface-segfaults-with-minimal-platform.patch
             '199c08dbf2f1e8596023b484714de8757a8bcf7d78c5dfe64ea271c54a401687'  # 0049-do-not-include-qopengles2ext-h.patch
-            'b40065014631cb1bd2a7662c8e7c3434baa4f3a76dfe075e4c504de040cd6b34'  # 0050-disable-default-lib-include-detection.patch
             )