From 337b0494ad498b86c470f1860f7f64e8df39297e Mon Sep 17 00:00:00 2001
From: Renato Silva <br.renatosilva@gmail.com>
Date: Tue, 31 Mar 2015 20:21:19 -0300
Subject: [PATCH 1/6] python-pywin32: Build pywintypes and move a bit forward.

---
 .../002-experimental-fixes.patch              | 43 +++++++++++++++++++
 mingw-w64-python-pywin32/PKGBUILD             |  7 ++-
 ...tutils-add-windmc-to-cygwinccompiler.patch | 41 ++++++++++++++++++
 mingw-w64-python2/PKGBUILD                    |  9 +++-
 4 files changed, 96 insertions(+), 4 deletions(-)
 create mode 100644 mingw-w64-python-pywin32/002-experimental-fixes.patch
 create mode 100644 mingw-w64-python2/2000-distutils-add-windmc-to-cygwinccompiler.patch

diff --git a/mingw-w64-python-pywin32/002-experimental-fixes.patch b/mingw-w64-python-pywin32/002-experimental-fixes.patch
new file mode 100644
index 0000000000000..91ad4e2fe505d
--- /dev/null
+++ b/mingw-w64-python-pywin32/002-experimental-fixes.patch
@@ -0,0 +1,43 @@
+diff -aur 001/setup.py 002/setup.py
+--- 001/setup.py	2015-03-31 16:31:40.344437400 -0300
++++ 002/setup.py	2015-03-31 18:14:09.612059600 -0300
+@@ -340,6 +340,8 @@
+         # Some of our swigged files behave differently in distutils vs
+         # MSVC based builds.  Always define DISTUTILS_BUILD so they can tell.
+         define_macros = define_macros or []
++        define_macros.append(("UNICODE", None))
++        define_macros.append(("_UNICODE", None))
+         define_macros.append(("DISTUTILS_BUILD", None))
+         define_macros.append(("_CRT_SECURE_NO_WARNINGS", None))
+         self.pch_header = pch_header
+@@ -865,7 +867,8 @@
+                     log.debug("Looked for %s in %s", lib, look_dirs)
+                     return "No library '%s'" % lib
+                 self.found_libraries[lib.lower()] = found
+-            patched_libs.append(os.path.splitext(os.path.basename(found))[0])
++            lib_name = re.sub(r'^lib(.*)\.a', r'\1', os.path.basename(found))
++            patched_libs.append(os.path.splitext(lib_name)[0])
+ 
+         if ext.platforms and self.plat_name not in ext.platforms:
+             return "Only available on platforms %s" % (ext.platforms,)
+@@ -1226,7 +1229,7 @@
+             # XXX This has to be changed for mingw32
+             # Get the .lib files we need.  This is limited to pywintypes,
+             # pythoncom and win32ui - but the first 2 have special names
+-            extra = self.debug and "_d.lib" or ".lib"
++            extra = self.debug and "_d.def" or ".def"
+             if ext.name in ("pywintypes", "pythoncom"):
+                 # The import libraries are created as PyWinTypes23.lib, but
+                 # are expected to be pywintypes.lib.
+diff -aur 001/win32/src/PerfMon/perfmondata.cpp 002/win32/src/PerfMon/perfmondata.cpp
+--- 001/win32/src/PerfMon/perfmondata.cpp	2011-03-19 10:51:22.000000000 -0300
++++ 002/win32/src/PerfMon/perfmondata.cpp	2015-03-31 18:17:40.378112100 -0300
+@@ -445,7 +445,7 @@
+ --*/
+ {
+     HKEY hAppKey;
+-    TCHAR LogLevelKeyName[] = _T("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Perflib");
++    TCHAR LogLevelKeyName[] = _T("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Perflib");
+ 
+     TCHAR LogLevelValueName[] = _T("EventLogLevel");
+ 	LONG lStatus;
diff --git a/mingw-w64-python-pywin32/PKGBUILD b/mingw-w64-python-pywin32/PKGBUILD
index 9fb0fb03e6709..0fec186ad20cf 100644
--- a/mingw-w64-python-pywin32/PKGBUILD
+++ b/mingw-w64-python-pywin32/PKGBUILD
@@ -14,13 +14,16 @@ pkgname=(${MINGW_PACKAGE_PREFIX}-python2-${_realname} ${MINGW_PACKAGE_PREFIX}-py
 groups=(${MINGW_PACKAGE_PREFIX})
 
 source=("http://prdownloads.sourceforge.net/${_realname}/${_realname}-${pkgver}.zip"
-        001-experimental-fixes.patch)
+        001-experimental-fixes.patch
+        002-experimental-fixes.patch)
 sha1sums=('1eb8039f9e15f53f56a9e1b54f00cd2c0f63ff8e'
-          '3a42fd3d639db7ec3cd1baa130a047dd592a93fe')
+          '3a42fd3d639db7ec3cd1baa130a047dd592a93fe'
+          '25233c64a976605d2a4d83beaf6b0c69be736014')
 
 prepare() {
     cd "${srcdir}/${_realname}-${pkgver}"
     patch -p1 < "${startdir}"/001-experimental-fixes.patch
+    patch -p1 < "${startdir}"/002-experimental-fixes.patch
 }
 
 build() {
diff --git a/mingw-w64-python2/2000-distutils-add-windmc-to-cygwinccompiler.patch b/mingw-w64-python2/2000-distutils-add-windmc-to-cygwinccompiler.patch
new file mode 100644
index 0000000000000..017c9a67b80ea
--- /dev/null
+++ b/mingw-w64-python2/2000-distutils-add-windmc-to-cygwinccompiler.patch
@@ -0,0 +1,41 @@
+diff -aur 1040/Lib/distutils/cygwinccompiler.py 2000/Lib/distutils/cygwinccompiler.py
+--- 1040/Lib/distutils/cygwinccompiler.py	2015-03-31 19:50:52.675374300 -0300
++++ 2000/Lib/distutils/cygwinccompiler.py	2015-03-31 19:57:35.460903800 -0300
+@@ -159,6 +159,28 @@
+                 self.spawn(["windres", "-i", src, "-o", obj])
+             except DistutilsExecError, msg:
+                 raise CompileError, msg
++        elif ext == '.mc':
++            # Adapted from msvc9compiler:
++            #
++            # Compile .MC to .RC file to .RES file.
++            #   * '-h dir' specifies the directory for the generated include file
++            #   * '-r dir' specifies the target directory of the generated RC file and the binary message resource it includes
++            #
++            # For now (since there are no options to change this),
++            # we use the source-directory for the include file and
++            # the build directory for the RC file and message
++            # resources. This works at least for win32all.
++            h_dir = os.path.dirname(src)
++            rc_dir = os.path.dirname(obj)
++            try:
++                # first compile .MC to .RC and .H file
++                self.spawn(['windmc'] + ['-h', h_dir, '-r', rc_dir] + [src])
++                base, _ = os.path.splitext (os.path.basename (src))
++                rc_file = os.path.join (rc_dir, base + '.rc')
++                # then compile .RC to .RES file
++                self.spawn(['windres', '-i', rc_file, '-o', obj])
++            except DistutilsExecError, msg:
++                raise CompileError(msg)
+         else: # for other files use the C-compiler
+             try:
+                 self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+@@ -277,7 +299,7 @@
+             ext_normcase = os.path.normcase(ext)
+             if ext_normcase in ['.rc','.res']:
+                 ext = ext_normcase
+-            if ext not in (self.src_extensions + ['.rc','.res']):
++            if ext not in (self.src_extensions + ['.rc', '.res', '.mc']):
+                 raise UnknownFileError, \
+                       "unknown file type '%s' (from '%s')" % \
+                       (ext, src_name)
diff --git a/mingw-w64-python2/PKGBUILD b/mingw-w64-python2/PKGBUILD
index be8ec587d42aa..4a1cff3d85f62 100644
--- a/mingw-w64-python2/PKGBUILD
+++ b/mingw-w64-python2/PKGBUILD
@@ -102,7 +102,8 @@ source=("http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz"
         1010-ctypes-python-dll.patch
         1020-gdbm-module-includes.patch
         1030-use-gnu_printf-in-format.patch
-        1040-install-msilib.patch)
+        1040-install-msilib.patch
+        2000-distutils-add-windmc-to-cygwinccompiler.patch)
 
 
 prepare() {
@@ -200,6 +201,9 @@ prepare() {
   patch -p1 -i "${srcdir}"/1030-use-gnu_printf-in-format.patch
   patch -p1 -i "${srcdir}"/1040-install-msilib.patch
 
+  plain "Apply Renato Silva's patch to distutils"
+  patch -p1 -i "${srcdir}"/2000-distutils-add-windmc-to-cygwinccompiler.patch
+
   autoreconf -vfi
 
   # Temporary workaround for FS#22322
@@ -417,4 +421,5 @@ sha1sums=('3172f6e957713c2d9fca462cc16068222fd1b9d3'
           'bc7209fd529f03d384f00be22835615a2843a7fa'
           '06ebbcf50d6d30780f47a0d3425f956b2eb8e847'
           '9042c4902ff03ecc12e0b41059aaebd6ad409009'
-          'dc6aa85fa4dc68a6809c1321e4a28a360a242f39')
+          'dc6aa85fa4dc68a6809c1321e4a28a360a242f39'
+          '5c5d9fb5d1fc576251a68c781437d27ea8d7e208')

From fee927e9f474d83d920f3c169c27819d1b850ae5 Mon Sep 17 00:00:00 2001
From: Renato Silva <br.renatosilva@gmail.com>
Date: Tue, 7 Apr 2015 21:53:19 -0300
Subject: [PATCH 2/6] python-pywin32: Build several extensions.

The extensions below are now building. Most of them are Python DLLs (pyd file
extension) except for pywintypes27 and perfmondata which are regular DLLs.
Windows Vista headers (0x0600) are now used. Note that <pdh.h> currently needs
fixing before building win32pdh.

    * pywintypes27
    * mmapfile
    * odbc
    * perfmon
    * perfmondata
    * timer
    * win2kras
    * win32clipboard
    * win32console
    * win32cred
    * win32crypt
    * win32event
    * win32evtlog
    * win32file
    * win32inet
    * win32job
    * win32lz
    * win32net
    * win32pdh
    * win32pipe
    * win32print
    * win32process
    * win32profile
    * win32ras
    * win32security
    * win32service
    * win32trace
    * win32transaction
    * win32ts
    * win32wnet
    * _win32sysloader
---
 .../003-experimental-fixes.patch              | 579 ++++++++++++++++++
 mingw-w64-python-pywin32/PKGBUILD             |   7 +-
 2 files changed, 584 insertions(+), 2 deletions(-)
 create mode 100644 mingw-w64-python-pywin32/003-experimental-fixes.patch

diff --git a/mingw-w64-python-pywin32/003-experimental-fixes.patch b/mingw-w64-python-pywin32/003-experimental-fixes.patch
new file mode 100644
index 0000000000000..551bd3123ce73
--- /dev/null
+++ b/mingw-w64-python-pywin32/003-experimental-fixes.patch
@@ -0,0 +1,579 @@
+diff -aur 002/setup.py 003/setup.py
+--- 002/setup.py	2015-04-04 23:19:27.556464900 -0300
++++ 003/setup.py	2015-04-07 21:23:21.056866600 -0300
+@@ -304,7 +304,7 @@
+                   include_dirs=[],
+                   define_macros=None,
+                   undef_macros=None,
+-                  library_dirs=[],
++                  library_dirs=['build/lib.mingw-2.7/pywin32_system32'],
+                   libraries="",
+                   runtime_library_dirs=None,
+                   extra_objects=None,
+@@ -340,6 +340,7 @@
+         # Some of our swigged files behave differently in distutils vs
+         # MSVC based builds.  Always define DISTUTILS_BUILD so they can tell.
+         define_macros = define_macros or []
++        define_macros.append(("_WIN32_WINNT", 0x0600))
+         define_macros.append(("UNICODE", None))
+         define_macros.append(("_UNICODE", None))
+         define_macros.append(("DISTUTILS_BUILD", None))
+@@ -693,7 +694,7 @@
+ 
+     def finalize_options(self):
+         build_ext.finalize_options(self)
+-        self.windows_h_version = None
++        self.windows_h_version = 0x0600
+         # The pywintypes library is created in the build_temp
+         # directory, so we need to add this to library_dirs
+         self.library_dirs.append(self.build_temp)
+@@ -978,6 +979,9 @@
+             if not self.compiler.initialized:
+                 self.compiler.initialize()
+ 
++        if self.mingw32:
++            self.compiler.shared_lib_extension = '.dll'
++
+         if sdk_dir:
+             self._fixup_sdk_dirs()
+ 
+@@ -1598,7 +1602,7 @@
+             win32/src/win32crypt/PyCRYPTPROV.cpp
+             win32/src/win32crypt/PyCTL_CONTEXT.cpp
+             """),
+-        ("win32file", "", None, 0x0500, """
++        ("win32file", "ws2_32 mswsock", None, 0x0500, """
+               win32/src/win32file.i
+               win32/src/win32file_comm.cpp
+               """),
+@@ -1655,7 +1659,7 @@
+         sources = info[4].split()
+     extra_compile_args = []
+     ext = WinExt_win32(name, 
+-                 libraries=lib_names,
++                 libraries=(lib_names + ' pywintypes27'),
+                  extra_compile_args = extra_compile_args,
+                  windows_h_version = windows_h_ver,
+                  sources = sources,
+@@ -1668,7 +1672,7 @@
+             sources = """
+                 win32\\src\\win32evtlog_messages.mc win32\\src\\win32evtlog.i
+                 """.split(),
+-                libraries="advapi32 oleaut32",
++                libraries="advapi32 oleaut32 pywintypes27",
+                 delay_load_libraries="wevtapi",
+                 windows_h_version=0x0600
+         ),
+@@ -1704,7 +1708,7 @@
+     # winxptheme
+     WinExt_win32("_winxptheme",
+            sources = ["win32/src/_winxptheme.i"],
+-           libraries="gdi32 user32 comdlg32 comctl32 shell32 Uxtheme",
++           libraries="gdi32 user32 comdlg32 comctl32 shell32 Uxtheme pywintypes27",
+            windows_h_version=0x0500,
+         ),
+ ]
+Only in 003/SWIG/swig_lib: 003-experimental-fixes.patch
+diff -aur 002/win32/src/odbc.cpp 003/win32/src/odbc.cpp
+--- 002/win32/src/odbc.cpp	2013-06-13 17:40:32.000000000 -0300
++++ 003/win32/src/odbc.cpp	2015-04-05 03:57:23.758258600 -0300
+@@ -13,6 +13,7 @@
+ #include <math.h>
+ #include <limits.h>
+ #include <string.h>
++#include <algorithm>
+ 
+ #include "PyWinTypes.h"
+ #include "PyWinObjects.h"
+@@ -105,8 +106,8 @@
+ }
+ 
+ static void cursorDealloc(PyObject *self);
+-PyMethodDef cursorMethods[];
+-PyMemberDef cursorMembers[];
++extern PyMethodDef cursorMethods[8];
++extern PyMemberDef cursorMembers[3];
+ 
+ static PyTypeObject Cursor_Type =
+ {
+@@ -152,8 +153,8 @@
+ 
+ 
+ static void connectionDealloc(PyObject *self);
+-PyMethodDef connectionMethods[];
+-PyMemberDef connectionMembers[];
++extern PyMethodDef connectionMethods[6];
++extern PyMemberDef connectionMembers[2];
+ static PyTypeObject Connection_Type =
+ {
+ 	PYWIN_OBJECT_HEAD
+@@ -458,7 +459,7 @@
+ }
+ 
+ /* @object connection|An object representing an ODBC connection */
+-static struct PyMethodDef connectionMethods[] = {
++struct PyMethodDef connectionMethods[] = {
+ 	{ "setautocommit", odbcSetAutoCommit, 1 }, /* @pymeth setautocommit|Sets the autocommit mode. */
+ 	{ "commit", odbcCommit, 1 } , /* @pymeth commit|Commits a transaction. */
+ 	{ "rollback", odbcRollback, 1 } , /* @pymeth rollback|Rollsback a transaction. */
+@@ -467,7 +468,7 @@
+ 	{0,     0}
+ };
+ 
+-static PyMemberDef connectionMembers[] = {
++PyMemberDef connectionMembers[] = {
+ 	{"error", T_OBJECT, offsetof(connectionObject, connectionError), READONLY},
+ 	{NULL}
+ };
+@@ -1192,21 +1193,21 @@
+     case SQL_DATE:
+     case SQL_TIMESTAMP:
+     case SQL_BIT:
+-      return(max(collen, (int)_tcslen(colname)));
++      return(std::max(collen, (int)_tcslen(colname)));
+     case SQL_SMALLINT:
+     case SQL_INTEGER:
+     case SQL_TINYINT:
+-      return(max(collen+1, (int)_tcslen(colname)));
++      return(std::max(collen+1, (int)_tcslen(colname)));
+     case SQL_DECIMAL:
+     case SQL_NUMERIC:
+-      return(max(collen+2, (int)_tcslen(colname)));
++      return(std::max(collen+2, (int)_tcslen(colname)));
+     case SQL_REAL:
+     case SQL_FLOAT:
+     case SQL_DOUBLE:
+-      return(max(20, (int)_tcslen(colname)));
++      return(std::max(20, (int)_tcslen(colname)));
+     case SQL_BINARY:
+     case SQL_VARBINARY:
+-      return(max(2*collen, (int)_tcslen(colname)));
++      return(std::max(2*collen, (int)_tcslen(colname)));
+     case SQL_LONGVARBINARY:
+     case SQL_LONGVARCHAR:
+     default:
+@@ -1797,7 +1798,7 @@
+ }
+ 
+ /* @object cursor|An object representing an ODBC cursor. */
+-static PyMethodDef cursorMethods[] = {
++PyMethodDef cursorMethods[] = {
+   { "close", odbcCurClose, 1} , /* @pymeth close|Closes the cursor */
+   { "execute", odbcCurExec, 1} , /* @pymeth execute|Execute some SQL */
+   { "fetchone", odbcCurFetchOne, 1} , /* @pymeth fetchone|Fetch one row of data */
+@@ -1808,7 +1809,7 @@
+   {0,     0}
+ };
+ 
+-static PyMemberDef cursorMembers[] = {
++PyMemberDef cursorMembers[] = {
+ 	{"description", T_OBJECT, offsetof(cursorObject, description), READONLY},
+ 	{"error", T_OBJECT, offsetof(cursorObject, cursorError), READONLY},
+ 	{NULL}
+diff -aur 002/win32/src/PerfMon/perfmondata.cpp 003/win32/src/PerfMon/perfmondata.cpp
+--- 002/win32/src/PerfMon/perfmondata.cpp	2015-04-04 23:19:27.572089900 -0300
++++ 003/win32/src/PerfMon/perfmondata.cpp	2015-04-04 23:20:04.556532700 -0300
+@@ -89,9 +89,9 @@
+ //      these are used to insure that the data collection functions
+ //      accessed by Perflib will have the correct calling format.
+ //
+-PM_OPEN_PROC   OpenPerformanceData;
+-PM_COLLECT_PROC    CollectPerformanceData;
+-PM_CLOSE_PROC  ClosePerformanceData;
++extern "C" PM_OPEN_PROC   OpenPerformanceData;
++extern "C" PM_COLLECT_PROC    CollectPerformanceData;
++extern "C" PM_CLOSE_PROC  ClosePerformanceData;
+ 
+ TCHAR szFullModulePath[MAX_PATH];
+ TCHAR szModuleName[MAX_PATH]; // will point into the buffer above.
+diff -aur 002/win32/src/PyWinTypes.h 003/win32/src/PyWinTypes.h
+--- 002/win32/src/PyWinTypes.h	2013-06-13 17:40:32.000000000 -0300
++++ 003/win32/src/PyWinTypes.h	2015-04-07 10:14:43.895393100 -0300
+@@ -796,7 +796,7 @@
+ 
+ // A helper for simple exception handling.
+ // try/__try
+-#ifdef MAINWIN
++#if defined(__MINGW32__) || defined(MAINWIN)
+ #define PYWINTYPES_TRY try
+ #else
+ #define PYWINTYPES_TRY __try
+diff -aur 002/win32/src/win32crypt/PyCRYPTPROV.cpp 003/win32/src/win32crypt/PyCRYPTPROV.cpp
+--- 002/win32/src/win32crypt/PyCRYPTPROV.cpp	2014-01-25 15:15:48.000000000 -0200
++++ 003/win32/src/win32crypt/PyCRYPTPROV.cpp	2015-04-05 17:34:27.360286600 -0300
+@@ -1,4 +1,5 @@
+ // @doc
++#include <algorithm>
+ #include "win32crypt.h"
+ 
+ // @object PyCRYPTPROV|Handle to a cryptographic provider, created using <om cryptoapi.CryptAcquireContext>
+@@ -351,7 +352,7 @@
+ 	//initialize buffer with char string if passed if
+ 	ZeroMemory(pbBuffer, dwLen+1);
+ 	if (seeddata != NULL)
+-		memcpy(pbBuffer, seeddata, min(dwLen,seedlen));
++		memcpy(pbBuffer, seeddata, std::min(dwLen,seedlen));
+ 	if (CryptGenRandom(hcryptprov, dwLen, pbBuffer))
+ 		ret=PyString_FromStringAndSize((char *)pbBuffer, dwLen);
+ 	else
+diff -aur 002/win32/src/win32crypt/win32cryptmodule.cpp 003/win32/src/win32crypt/win32cryptmodule.cpp
+--- 002/win32/src/win32crypt/win32cryptmodule.cpp	2014-01-25 15:15:48.000000000 -0200
++++ 003/win32/src/win32crypt/win32cryptmodule.cpp	2015-04-05 22:56:26.696003000 -0300
+@@ -596,44 +596,37 @@
+ 		pvPara=(void *)&cssrp;
+ 		}
+ 	else{
+-		switch((ULONG_PTR)StoreProvider){
+-			case CERT_STORE_PROV_PHYSICAL:
+-			case CERT_STORE_PROV_FILENAME:
+-			case CERT_STORE_PROV_SYSTEM:
+-			case CERT_STORE_PROV_SYSTEM_REGISTRY:
+-			case CERT_STORE_PROV_LDAP:{
+-				if (!PyWinObject_AsWCHAR(obpvPara, (WCHAR **)&pvPara))
+-					return NULL;
+-				free_wchar=TRUE;
+-				break;
+-				}
+-			case CERT_STORE_PROV_REG:{
+-				if (!PyWinObject_AsHKEY(obpvPara, (HKEY *)&pvPara))
+-					return NULL;
+-				break;
+-				}
+-			case CERT_STORE_PROV_FILE:{
+-				if (!PyWinObject_AsHANDLE(obpvPara, (HANDLE *)&pvPara))
+-					return NULL;
+-				break;
+-				}
+-			case CERT_STORE_PROV_SERIALIZED:
+-			case CERT_STORE_PROV_PKCS7:{
+-				if (!PyWinObject_AsReadBuffer(obpvPara, (void **)&crypt_data_blob.pbData, &crypt_data_blob.cbData))
+-					return NULL;
+-				pvPara=(void *)&crypt_data_blob;
+-				break;
+-				}
+-			case CERT_STORE_PROV_MEMORY:{
+-				// pvPara is not used, warn if something passed in
+-				if (obpvPara != Py_None)
+-					PyErr_Warn(PyExc_RuntimeWarning, "Para ignored for CERT_STORE_PROV_MEMORY");
+-				break;
+-				}
+-			default:{
+-				PyErr_SetString(PyExc_NotImplementedError,"Specified store provider type not supported");
++		if (StoreProvider == CERT_STORE_PROV_PHYSICAL ||
++			StoreProvider == CERT_STORE_PROV_FILENAME ||
++			StoreProvider == CERT_STORE_PROV_SYSTEM ||
++			StoreProvider == CERT_STORE_PROV_SYSTEM_REGISTRY ||
++			StoreProvider == CERT_STORE_PROV_LDAP){
++			if (!PyWinObject_AsWCHAR(obpvPara, (WCHAR **)&pvPara))
+ 				return NULL;
+-				}
++			free_wchar=TRUE;
++			}
++		else if (StoreProvider == CERT_STORE_PROV_REG){
++			if (!PyWinObject_AsHKEY(obpvPara, (HKEY *)&pvPara))
++				return NULL;
++			}
++		else if (StoreProvider == CERT_STORE_PROV_FILE){
++			if (!PyWinObject_AsHANDLE(obpvPara, (HANDLE *)&pvPara))
++				return NULL;
++			}
++		else if (StoreProvider == CERT_STORE_PROV_SERIALIZED ||
++				 StoreProvider == CERT_STORE_PROV_PKCS7){
++			if (!PyWinObject_AsReadBuffer(obpvPara, (void **)&crypt_data_blob.pbData, &crypt_data_blob.cbData))
++				return NULL;
++			pvPara=(void *)&crypt_data_blob;
++			}
++		else if (StoreProvider == CERT_STORE_PROV_MEMORY){
++			// pvPara is not used, warn if something passed in
++			if (obpvPara != Py_None)
++				PyErr_Warn(PyExc_RuntimeWarning, "Para ignored for CERT_STORE_PROV_MEMORY");
++			}
++		else{
++			PyErr_SetString(PyExc_NotImplementedError,"Specified store provider type not supported");
++			return NULL;
+ 			}
+ 		}
+ 
+diff -aur 002/win32/src/win32evtlog.i 003/win32/src/win32evtlog.i
+--- 002/win32/src/win32evtlog.i	2014-04-26 15:21:40.000000000 -0300
++++ 003/win32/src/win32evtlog.i	2015-04-07 09:32:48.778717700 -0300
+@@ -997,6 +997,14 @@
+ }
+ PyCFunction pfnPyEvtUpdateBookmark = (PyCFunction) PyEvtUpdateBookmark;
+ 
++#ifndef EVT_VARIANT_TYPE_ARRAY
++#define EVT_VARIANT_TYPE_ARRAY 128
++#endif
++
++#ifndef EVT_VARIANT_TYPE_MASK
++#define EVT_VARIANT_TYPE_MASK 0x7F
++#endif
++
+ PyObject *PyWinObject_FromEVT_VARIANT(PEVT_VARIANT val)
+ {
+ 	if (val->Type & EVT_VARIANT_TYPE_ARRAY){
+diff -aur 002/win32/src/win32file.i 003/win32/src/win32file.i
+--- 002/win32/src/win32file.i	2013-06-13 17:40:32.000000000 -0300
++++ 003/win32/src/win32file.i	2015-04-07 07:46:40.178640500 -0300
+@@ -1404,11 +1404,11 @@
+ 	// the filename is exactly 1 byte!  Not clear the best way to
+ 	// check this, but this works for now - is it at least the size of
+ 	// the *head* of the struct.
+-	if (nbytes < sizeof DWORD*3+2)
++	if (nbytes < sizeof(DWORD)*3+2)
+ 		return ret;
+ 	DWORD nbytes_read = 0;
+ 	while (1) {
+-		PyObject *fname = PyWinObject_FromOLECHAR(p->FileName, p->FileNameLength/sizeof WCHAR);
++		PyObject *fname = PyWinObject_FromOLECHAR(p->FileName, p->FileNameLength/sizeof(WCHAR));
+ 		if (!fname) {
+ 			Py_DECREF(ret);
+ 			return NULL;
+diff -aur 002/win32/src/win32file_comm.cpp 003/win32/src/win32file_comm.cpp
+--- 002/win32/src/win32file_comm.cpp	2011-03-19 10:51:22.000000000 -0300
++++ 003/win32/src/win32file_comm.cpp	2015-04-06 20:20:20.347135800 -0300
+@@ -175,7 +175,7 @@
+ 
+ #define GET_BITFIELD_ENTRY(bitfield_name) \
+ 	else if (strcmp(name, #bitfield_name)==0) { \
+-		return PyInt_FromLong(pydcb->m_DCB.##bitfield_name); \
++		return PyInt_FromLong(pydcb->m_DCB.bitfield_name); \
+ 	} \
+ 
+ PyObject *PyDCB::getattro(PyObject *self, PyObject *obname)
+@@ -210,7 +210,7 @@
+ 			PyErr_Format(PyExc_TypeError, szNeedIntAttr, #bitfield_name); \
+ 			return -1; \
+ 		} \
+-		pydcb->m_DCB.##bitfield_name = PyInt_AsLong(v); \
++		pydcb->m_DCB.bitfield_name = PyInt_AsLong(v); \
+ 		return 0; \
+ 	} \
+ 
+@@ -369,7 +369,7 @@
+ #undef GET_BITFIELD_ENTRY
+ #define GET_BITFIELD_ENTRY(bitfield_name) \
+ 	else if (strcmp(name, #bitfield_name)==0) { \
+-		return PyInt_FromLong(pyCOMSTAT->m_COMSTAT.##bitfield_name); \
++		return PyInt_FromLong(pyCOMSTAT->m_COMSTAT.bitfield_name); \
+ 	} \
+ 
+ PyObject *PyCOMSTAT::getattro(PyObject *self, PyObject *obname)
+@@ -398,7 +398,7 @@
+ 			PyErr_Format(PyExc_TypeError, szNeedIntAttr, #bitfield_name); \
+ 			return -1; \
+ 		} \
+-		pyCOMSTAT->m_COMSTAT.##bitfield_name = PyInt_AsLong(v); \
++		pyCOMSTAT->m_COMSTAT.bitfield_name = PyInt_AsLong(v); \
+ 		return 0; \
+ 	} \
+ 
+diff -aur 002/win32/src/win32inet.i 003/win32/src/win32inet.i
+--- 002/win32/src/win32inet.i	2011-03-19 10:51:22.000000000 -0300
++++ 003/win32/src/win32inet.i	2015-04-07 19:57:38.467340900 -0300
+@@ -4,9 +4,26 @@
+ %{
+ // #define UNICODE
+ // #define _UNICODE
++#include <algorithm>
+ #include "Windows.h"
+ #include "WinInet.h"
+ #undef BOOLAPI // wininet.h defines this!
++
++#ifndef INTERNET_OPTION_CODEPAGE_PATH
++#define INTERNET_OPTION_CODEPAGE_PATH 100
++#endif
++
++#ifndef INTERNET_OPTION_CODEPAGE_EXTRA
++#define INTERNET_OPTION_CODEPAGE_EXTRA 101
++#endif
++
++#ifndef INTERNET_OPTION_IDN
++#define INTERNET_OPTION_IDN 102
++#endif
++
++#ifndef INTERNET_OPTION_HTTP_DECODING
++#define INTERNET_OPTION_HTTP_DECODING 65
++#endif
+ %}
+ 
+ %include "typemaps.i"
+@@ -1835,7 +1852,7 @@
+ 			}
+ 		}
+ 	if (bsuccess && GroupName)
+-		_tcsncpy(GroupInfo->szGroupName, GroupName, min(namelen, GROUPNAME_MAX_LENGTH));
++		_tcsncpy(GroupInfo->szGroupName, GroupName, std::min<DWORD>(namelen, GROUPNAME_MAX_LENGTH));
+ 	Py_DECREF(dummy_tuple);
+ 	PyWinObject_FreeTCHAR(GroupName);
+ 	if (OwnerStorage)
+diff -aur 002/win32/src/win32net/win32net.h 003/win32/src/win32net/win32net.h
+--- 002/win32/src/win32net/win32net.h	2011-03-19 10:51:22.000000000 -0300
++++ 003/win32/src/win32net/win32net.h	2015-04-06 20:45:25.770423400 -0300
+@@ -62,15 +62,15 @@
+ 
+ #if WINVER >= 0x0500
+ typedef NET_API_STATUS (NET_API_FUNCTION *NetValidateNamefunc)(LPCWSTR, LPCWSTR, LPCWSTR, LPCWSTR, NETSETUP_NAME_TYPE);
+-extern NetValidateNamefunc pfnNetValidateName;
++extern "C" NetValidateNamefunc pfnNetValidateName;
+ 
+ typedef NET_API_STATUS (NET_API_FUNCTION *NetGetJoinInformationfunc)(LPCWSTR, LPWSTR *, PNETSETUP_JOIN_STATUS);
+-extern NetGetJoinInformationfunc pfnNetGetJoinInformation;
++extern "C" NetGetJoinInformationfunc pfnNetGetJoinInformation;
+ 
+ typedef NET_API_STATUS (NET_API_FUNCTION *NetValidatePasswordPolicyfunc)(LPCWSTR, LPVOID, NET_VALIDATE_PASSWORD_TYPE, LPVOID, LPVOID *);
+-extern NetValidatePasswordPolicyfunc pfnNetValidatePasswordPolicy;
++extern "C" NetValidatePasswordPolicyfunc pfnNetValidatePasswordPolicy;
+ 
+ typedef NET_API_STATUS (NET_API_FUNCTION *NetValidatePasswordPolicyFreefunc)(LPVOID *);
+-extern NetValidatePasswordPolicyFreefunc pfnNetValidatePasswordPolicyFree;
++extern "C" NetValidatePasswordPolicyFreefunc pfnNetValidatePasswordPolicyFree;
+ 
+ #endif // WINVER
+diff -aur 002/win32/src/win32pdhmodule.cpp 003/win32/src/win32pdhmodule.cpp
+--- 002/win32/src/win32pdhmodule.cpp	2012-06-22 11:08:42.000000000 -0300
++++ 003/win32/src/win32pdhmodule.cpp	2015-04-06 21:19:19.686255800 -0300
+@@ -11,6 +11,7 @@
+ 
+ ******************************************************************/
+ 
++#include <algorithm>
+ #include "PyWinTypes.h"
+ #include "pdh.h"
+ #include "pdhmsg.h"
+@@ -1016,7 +1017,7 @@
+ #define SET_BOOL(r, i) { \
+ 	if (i<seqLen){ \
+ 		PyObject *subItem = PyTuple_GET_ITEM(flags_tuple, i); \
+-		myCfg.cfg.##r = PyObject_IsTrue(subItem); \
++		myCfg.cfg.r = PyObject_IsTrue(subItem); \
+ 	} \
+ }
+ 
+@@ -1082,7 +1083,7 @@
+ 	// Initialize the return buffer if starting path is passed in. (bInitializePath will also be set)
+ 	if (!PyWinObject_AsTCHAR(obInitialPath, &InitialPath, TRUE, &cchInitialPath))
+ 		return NULL;	// Last exit without cleanup
+-	myCfg.cfg.cchReturnPathLength = max(cchInitialPath+1, 1024);
++	myCfg.cfg.cchReturnPathLength = std::max<DWORD>(cchInitialPath+1, 1024);
+ 	myCfg.cfg.szReturnPathBuffer = (TCHAR *)malloc(myCfg.cfg.cchReturnPathLength * sizeof(TCHAR));
+ 	if (myCfg.cfg.szReturnPathBuffer == NULL){
+ 		PyErr_NoMemory();
+diff -aur 002/win32/src/win32popen.cpp 003/win32/src/win32popen.cpp
+--- 002/win32/src/win32popen.cpp	2013-06-13 17:40:32.000000000 -0300
++++ 003/win32/src/win32popen.cpp	2015-04-07 04:17:39.326047200 -0300
+@@ -166,19 +166,27 @@
+ {
+ 	PROCESS_INFORMATION piProcInfo;
+ 	STARTUPINFO siStartInfo;
+-	char *s1,*s2, *s3=" /c ";
++	LPTSTR s1, s2, s3 = TEXT(" /c ");
+ 	DWORD i;
+ 	size_t x;
+ 
+-	if (i = GetEnvironmentVariable("COMSPEC",NULL,0))
++	if (i = GetEnvironmentVariable(TEXT("COMSPEC"),NULL,0))
+     {
+-		s1 = (char *)_alloca(i);
+-		if (!(x = GetEnvironmentVariable("COMSPEC", s1, i)))
++		s1 = (LPTSTR)_alloca(i);
++		if (!(x = GetEnvironmentVariable(TEXT("COMSPEC"), s1, i)))
+ 			return FALSE;
+-		x = i + strlen(s3) + strlen(cmdstring) + 1;
+-		s2 = (char *)_alloca(x);
++#ifdef UNICODE
++		size_t cmdlen = strlen(cmdstring);
++		WCHAR _cmdstring[cmdlen + 1];
++		if (!MultiByteToWideChar(CP_OEMCP, 0, cmdstring, -1, _cmdstring, cmdlen + 1))
++			return FALSE;
++#else
++		char *_cmdstring = cmdstring;
++#endif
++		x = (i + _tcslen(s3) + _tcslen(_cmdstring) + 1) * sizeof(TCHAR);
++		s2 = (LPTSTR)_alloca(x);
+ 		ZeroMemory(s2, x);
+-		sprintf(s2, "%s%s%s", s1, s3, cmdstring);
++		_stprintf(s2, TEXT("%s%s%s"), s1, s3, _cmdstring);
+     }
+ 	// Could be an else here to try cmd.exe / command.com in the path
+ 	// Now we'll just error out..
+diff -aur 002/win32/src/win32rasmodule.cpp 003/win32/src/win32rasmodule.cpp
+--- 002/win32/src/win32rasmodule.cpp	2012-01-02 15:42:24.000000000 -0200
++++ 003/win32/src/win32rasmodule.cpp	2015-04-07 04:46:43.333884000 -0300
+@@ -463,7 +463,7 @@
+ 	if (obCallback==Py_None) {
+ 		pNotification = NULL;
+ 	} else if (PyCallable_Check(obCallback)) {
+-		pNotification = PyRasDialFunc1;
++		pNotification = (LPVOID)PyRasDialFunc1;
+ 		notType = 1;
+ 	} else if (PyInt_Check(obCallback)) {
+ 		if (!PyWinLong_AsVoidPtr(obCallback, &pNotification))
+diff -aur 002/win32/src/win32security.i 003/win32/src/win32security.i
+--- 002/win32/src/win32security.i	2012-09-24 10:17:38.000000000 -0300
++++ 003/win32/src/win32security.i	2015-04-07 05:17:31.777289500 -0300
+@@ -3563,9 +3563,9 @@
+ 		return FALSE;
+ 		}
+ 	static const BOOL none_ok = TRUE; // NULL seems OK anywhere
+-	if (!PyWinObject_AsWCHAR(obUser, &pAuthData->User, none_ok, &pAuthData->UserLength) || \
+-	    !PyWinObject_AsWCHAR(obDomain, &pAuthData->Domain, none_ok, &pAuthData->DomainLength) || \
+-		!PyWinObject_AsWCHAR(obPW, &pAuthData->Password, none_ok, &pAuthData->PasswordLength)) {
++	if (!PyWinObject_AsWCHAR(obUser, (WCHAR**)&pAuthData->User, none_ok, &pAuthData->UserLength) || \
++	    !PyWinObject_AsWCHAR(obDomain, (WCHAR**)&pAuthData->Domain, none_ok, &pAuthData->DomainLength) || \
++		!PyWinObject_AsWCHAR(obPW, (WCHAR**)&pAuthData->Password, none_ok, &pAuthData->PasswordLength)) {
+ 		PyErr_Clear();
+ 		PyErr_SetString(PyExc_TypeError, err_msg);
+ 		return FALSE;
+@@ -3579,11 +3579,11 @@
+ 	if (!pAuthData)
+ 		return;
+ 	if (pAuthData->User)
+-		PyWinObject_FreeWCHAR(pAuthData->User);
++		PyWinObject_FreeWCHAR((WCHAR*)pAuthData->User);
+ 	if (pAuthData->Domain)
+-		PyWinObject_FreeWCHAR(pAuthData->Domain);
++		PyWinObject_FreeWCHAR((WCHAR*)pAuthData->Domain);
+ 	if (pAuthData->Password)
+-		PyWinObject_FreeWCHAR(pAuthData->Password);
++		PyWinObject_FreeWCHAR((WCHAR*)pAuthData->Password);
+ }
+ 
+ %}
+diff -aur 002/win32/src/win32service.i 003/win32/src/win32service.i
+--- 002/win32/src/win32service.i	2012-09-24 10:17:38.000000000 -0300
++++ 003/win32/src/win32service.i	2015-04-07 08:21:56.348455600 -0300
+@@ -57,6 +57,13 @@
+ 		if (fp!=NULL)
+ 			fpEnumServicesStatusEx=(EnumServicesStatusExfunc)fp;
+ 		}
++#ifndef SERVICE_CONTROL_PRESHUTDOWN
++#define SERVICE_CONTROL_PRESHUTDOWN 0x0000000F
++#endif
++
++#ifndef SERVICE_ACCEPT_PRESHUTDOWN
++#define SERVICE_ACCEPT_PRESHUTDOWN 0x00000100
++#endif
+ %}
+ 
+ %{
+diff -aur 002/win32/src/win32trace.cpp 003/win32/src/win32trace.cpp
+--- 002/win32/src/win32trace.cpp	2011-03-19 10:51:22.000000000 -0300
++++ 003/win32/src/win32trace.cpp	2015-04-07 06:33:18.264396500 -0300
+@@ -30,6 +30,7 @@
+ 
+ */
+ 
++#include <algorithm>
+ #include "PyWinTypes.h"
+ #include "PyWinObjects.h"
+ 
+@@ -341,7 +342,7 @@
+     Py_BEGIN_ALLOW_THREADS
+     const char *data_this = data;
+     while (len) {
+-        unsigned len_this = min(len, BUFFER_SIZE/2);
++        unsigned len_this = std::min<unsigned long>(len, BUFFER_SIZE/2);
+         BOOL ok = GetMyMutex();
+         if (ok) {
+             // must use types with identical size on win32 and win64
diff --git a/mingw-w64-python-pywin32/PKGBUILD b/mingw-w64-python-pywin32/PKGBUILD
index 0fec186ad20cf..7d6f8fa911862 100644
--- a/mingw-w64-python-pywin32/PKGBUILD
+++ b/mingw-w64-python-pywin32/PKGBUILD
@@ -15,15 +15,18 @@ groups=(${MINGW_PACKAGE_PREFIX})
 
 source=("http://prdownloads.sourceforge.net/${_realname}/${_realname}-${pkgver}.zip"
         001-experimental-fixes.patch
-        002-experimental-fixes.patch)
+        002-experimental-fixes.patch
+        003-experimental-fixes.patch)
 sha1sums=('1eb8039f9e15f53f56a9e1b54f00cd2c0f63ff8e'
           '3a42fd3d639db7ec3cd1baa130a047dd592a93fe'
-          '25233c64a976605d2a4d83beaf6b0c69be736014')
+          '25233c64a976605d2a4d83beaf6b0c69be736014'
+          '44f19d4ae37e32baf00f8e0a9de7f91928aa8e50')
 
 prepare() {
     cd "${srcdir}/${_realname}-${pkgver}"
     patch -p1 < "${startdir}"/001-experimental-fixes.patch
     patch -p1 < "${startdir}"/002-experimental-fixes.patch
+    patch -p1 < "${startdir}"/003-experimental-fixes.patch
 }
 
 build() {

From d716f19b9b7a5d64e06359b8896b17e23a0cf478 Mon Sep 17 00:00:00 2001
From: Renato Silva <br.renatosilva@gmail.com>
Date: Thu, 9 Apr 2015 21:12:01 -0300
Subject: [PATCH 3/6] python-pywin32: Reorganize the patches.

---
 ...atch => 001-compile-and-setup-fixes.patch} | 234 +++++++++++++-----
 .../001-experimental-fixes.patch              |  86 -------
 .../002-experimental-fixes.patch              |  43 ----
 mingw-w64-python-pywin32/PKGBUILD             |  13 +-
 4 files changed, 176 insertions(+), 200 deletions(-)
 rename mingw-w64-python-pywin32/{003-experimental-fixes.patch => 001-compile-and-setup-fixes.patch} (67%)
 delete mode 100644 mingw-w64-python-pywin32/001-experimental-fixes.patch
 delete mode 100644 mingw-w64-python-pywin32/002-experimental-fixes.patch

diff --git a/mingw-w64-python-pywin32/003-experimental-fixes.patch b/mingw-w64-python-pywin32/001-compile-and-setup-fixes.patch
similarity index 67%
rename from mingw-w64-python-pywin32/003-experimental-fixes.patch
rename to mingw-w64-python-pywin32/001-compile-and-setup-fixes.patch
index 551bd3123ce73..c0411322d74e0 100644
--- a/mingw-w64-python-pywin32/003-experimental-fixes.patch
+++ b/mingw-w64-python-pywin32/001-compile-and-setup-fixes.patch
@@ -1,6 +1,24 @@
-diff -aur 002/setup.py 003/setup.py
---- 002/setup.py	2015-04-04 23:19:27.556464900 -0300
-+++ 003/setup.py	2015-04-07 21:23:21.056866600 -0300
+diff -aur 000/setup.py 001/setup.py
+--- 000/setup.py	2015-04-09 21:00:48.725278100 -0300
++++ 001/setup.py	2015-04-09 21:02:02.350399800 -0300
+@@ -224,7 +224,7 @@
+ # languishing and will probably never be fixed for Python 2.6...
+ if sys.version_info > (2,6):
+     from distutils.spawn import spawn
+-    from distutils.msvc9compiler import MSVCCompiler
++    from distutils.msvccompiler import MSVCCompiler
+     MSVCCompiler._orig_spawn = MSVCCompiler.spawn
+     MSVCCompiler._orig_link = MSVCCompiler.link
+ 
+@@ -293,7 +293,7 @@
+     MSVCCompiler.link = monkeypatched_link
+ 
+ 
+-sdk_dir = find_platform_sdk_dir()
++sdk_dir = find_platform_sdk_dir() or ''
+ 
+ class WinExt (Extension):
+     # Base class for all win32 extensions, with some predefined
 @@ -304,7 +304,7 @@
                    include_dirs=[],
                    define_macros=None,
@@ -10,15 +28,17 @@ diff -aur 002/setup.py 003/setup.py
                    libraries="",
                    runtime_library_dirs=None,
                    extra_objects=None,
-@@ -340,6 +340,7 @@
+@@ -340,6 +340,9 @@
          # Some of our swigged files behave differently in distutils vs
          # MSVC based builds.  Always define DISTUTILS_BUILD so they can tell.
          define_macros = define_macros or []
 +        define_macros.append(("_WIN32_WINNT", 0x0600))
-         define_macros.append(("UNICODE", None))
-         define_macros.append(("_UNICODE", None))
++        define_macros.append(("UNICODE", None))
++        define_macros.append(("_UNICODE", None))
          define_macros.append(("DISTUTILS_BUILD", None))
-@@ -693,7 +694,7 @@
+         define_macros.append(("_CRT_SECURE_NO_WARNINGS", None))
+         self.pch_header = pch_header
+@@ -691,7 +694,7 @@
  
      def finalize_options(self):
          build_ext.finalize_options(self)
@@ -27,7 +47,17 @@ diff -aur 002/setup.py 003/setup.py
          # The pywintypes library is created in the build_temp
          # directory, so we need to add this to library_dirs
          self.library_dirs.append(self.build_temp)
-@@ -978,6 +979,9 @@
+@@ -865,7 +868,8 @@
+                     log.debug("Looked for %s in %s", lib, look_dirs)
+                     return "No library '%s'" % lib
+                 self.found_libraries[lib.lower()] = found
+-            patched_libs.append(os.path.splitext(os.path.basename(found))[0])
++            lib_name = re.sub(r'^lib(.*)\.a', r'\1', os.path.basename(found))
++            patched_libs.append(os.path.splitext(lib_name)[0])
+ 
+         if ext.platforms and self.plat_name not in ext.platforms:
+             return "Only available on platforms %s" % (ext.platforms,)
+@@ -975,6 +979,9 @@
              if not self.compiler.initialized:
                  self.compiler.initialize()
  
@@ -37,7 +67,16 @@ diff -aur 002/setup.py 003/setup.py
          if sdk_dir:
              self._fixup_sdk_dirs()
  
-@@ -1598,7 +1602,7 @@
+@@ -1226,7 +1233,7 @@
+             # XXX This has to be changed for mingw32
+             # Get the .lib files we need.  This is limited to pywintypes,
+             # pythoncom and win32ui - but the first 2 have special names
+-            extra = self.debug and "_d.lib" or ".lib"
++            extra = self.debug and "_d.def" or ".def"
+             if ext.name in ("pywintypes", "pythoncom"):
+                 # The import libraries are created as PyWinTypes23.lib, but
+                 # are expected to be pywintypes.lib.
+@@ -1595,7 +1602,7 @@
              win32/src/win32crypt/PyCRYPTPROV.cpp
              win32/src/win32crypt/PyCTL_CONTEXT.cpp
              """),
@@ -46,7 +85,7 @@ diff -aur 002/setup.py 003/setup.py
                win32/src/win32file.i
                win32/src/win32file_comm.cpp
                """),
-@@ -1655,7 +1659,7 @@
+@@ -1652,7 +1659,7 @@
          sources = info[4].split()
      extra_compile_args = []
      ext = WinExt_win32(name, 
@@ -55,7 +94,7 @@ diff -aur 002/setup.py 003/setup.py
                   extra_compile_args = extra_compile_args,
                   windows_h_version = windows_h_ver,
                   sources = sources,
-@@ -1668,7 +1672,7 @@
+@@ -1665,7 +1672,7 @@
              sources = """
                  win32\\src\\win32evtlog_messages.mc win32\\src\\win32evtlog.i
                  """.split(),
@@ -64,7 +103,7 @@ diff -aur 002/setup.py 003/setup.py
                  delay_load_libraries="wevtapi",
                  windows_h_version=0x0600
          ),
-@@ -1704,7 +1708,7 @@
+@@ -1701,7 +1708,7 @@
      # winxptheme
      WinExt_win32("_winxptheme",
             sources = ["win32/src/_winxptheme.i"],
@@ -73,10 +112,9 @@ diff -aur 002/setup.py 003/setup.py
             windows_h_version=0x0500,
          ),
  ]
-Only in 003/SWIG/swig_lib: 003-experimental-fixes.patch
-diff -aur 002/win32/src/odbc.cpp 003/win32/src/odbc.cpp
---- 002/win32/src/odbc.cpp	2013-06-13 17:40:32.000000000 -0300
-+++ 003/win32/src/odbc.cpp	2015-04-05 03:57:23.758258600 -0300
+diff -aur 000/win32/src/odbc.cpp 001/win32/src/odbc.cpp
+--- 000/win32/src/odbc.cpp	2015-04-09 21:00:49.053401800 -0300
++++ 001/win32/src/odbc.cpp	2015-04-09 21:02:02.366025800 -0300
 @@ -13,6 +13,7 @@
  #include <math.h>
  #include <limits.h>
@@ -170,9 +208,9 @@ diff -aur 002/win32/src/odbc.cpp 003/win32/src/odbc.cpp
  	{"description", T_OBJECT, offsetof(cursorObject, description), READONLY},
  	{"error", T_OBJECT, offsetof(cursorObject, cursorError), READONLY},
  	{NULL}
-diff -aur 002/win32/src/PerfMon/perfmondata.cpp 003/win32/src/PerfMon/perfmondata.cpp
---- 002/win32/src/PerfMon/perfmondata.cpp	2015-04-04 23:19:27.572089900 -0300
-+++ 003/win32/src/PerfMon/perfmondata.cpp	2015-04-04 23:20:04.556532700 -0300
+diff -aur 000/win32/src/PerfMon/perfmondata.cpp 001/win32/src/PerfMon/perfmondata.cpp
+--- 000/win32/src/PerfMon/perfmondata.cpp	2015-04-09 21:00:48.772153700 -0300
++++ 001/win32/src/PerfMon/perfmondata.cpp	2015-04-09 21:02:02.366025800 -0300
 @@ -89,9 +89,9 @@
  //      these are used to insure that the data collection functions
  //      accessed by Perflib will have the correct calling format.
@@ -186,9 +224,71 @@ diff -aur 002/win32/src/PerfMon/perfmondata.cpp 003/win32/src/PerfMon/perfmondat
  
  TCHAR szFullModulePath[MAX_PATH];
  TCHAR szModuleName[MAX_PATH]; // will point into the buffer above.
-diff -aur 002/win32/src/PyWinTypes.h 003/win32/src/PyWinTypes.h
---- 002/win32/src/PyWinTypes.h	2013-06-13 17:40:32.000000000 -0300
-+++ 003/win32/src/PyWinTypes.h	2015-04-07 10:14:43.895393100 -0300
+@@ -445,7 +445,7 @@
+ --*/
+ {
+     HKEY hAppKey;
+-    TCHAR LogLevelKeyName[] = _T("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Perflib");
++    TCHAR LogLevelKeyName[] = _T("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Perflib");
+ 
+     TCHAR LogLevelValueName[] = _T("EventLogLevel");
+ 	LONG lStatus;
+diff -aur 000/win32/src/PySECURITY_DESCRIPTOR.cpp 001/win32/src/PySECURITY_DESCRIPTOR.cpp
+--- 000/win32/src/PySECURITY_DESCRIPTOR.cpp	2015-04-09 21:00:48.819029400 -0300
++++ 001/win32/src/PySECURITY_DESCRIPTOR.cpp	2015-04-09 21:01:55.881645000 -0300
+@@ -5,6 +5,7 @@
+ #include "PyWinObjects.h"
+ #include "PySecurityObjects.h"
+ #include "structmember.h"
++#include <algorithm>
+ 
+ #ifndef NO_PYWINTYPES_SECURITY
+ BOOL (WINAPI *setsecuritydescriptorcontrol)(PSECURITY_DESCRIPTOR, SECURITY_DESCRIPTOR_CONTROL, SECURITY_DESCRIPTOR_CONTROL)=NULL;
+@@ -786,7 +787,7 @@
+ {
+ 	ob_type = &PySECURITY_DESCRIPTORType;
+ 	_Py_NewReference(this);
+-	cb = max(cb, SECURITY_DESCRIPTOR_MIN_LENGTH);
++	cb = std::max((long long unsigned int)cb, SECURITY_DESCRIPTOR_MIN_LENGTH);
+ 	PSECURITY_DESCRIPTOR psd = malloc(cb);
+ 	this->m_psd=NULL;
+ 	if (::InitializeSecurityDescriptor(psd, SECURITY_DESCRIPTOR_REVISION))
+diff -aur 000/win32/src/PySecurityObjects.h 001/win32/src/PySecurityObjects.h
+--- 000/win32/src/PySecurityObjects.h	2015-04-09 21:00:48.850278300 -0300
++++ 001/win32/src/PySecurityObjects.h	2015-04-09 21:01:55.881645000 -0300
+@@ -121,7 +121,7 @@
+ 	static PyObject *GetSubAuthorityCount(PyObject *self, PyObject *args);
+ 	static PyObject *GetSubAuthority(PyObject *self, PyObject *args);
+ 	static PyObject *GetSidIdentifierAuthority(PyObject *self, PyObject *args);
+-	static struct PyMethodDef PySID::methods[];
++	static struct PyMethodDef methods[];
+ 
+ protected:
+ 	PSID m_psid;
+@@ -159,7 +159,7 @@
+ 	/* Python support */
+ 	int compare(PyObject *ob);
+ 	static void deallocFunc(PyObject *ob);
+-	static struct PyMethodDef PyACL::methods[];
++	static struct PyMethodDef methods[];
+ 
+ 	static PyObject *Initialize(PyObject *self, PyObject *args);
+ 	static PyObject *IsValid(PyObject *self, PyObject *args);
+diff -aur 000/win32/src/PyWinObjects.h 001/win32/src/PyWinObjects.h
+--- 000/win32/src/PyWinObjects.h	2015-04-09 21:00:48.881528000 -0300
++++ 001/win32/src/PyWinObjects.h	2015-04-09 21:01:55.881645000 -0300
+@@ -52,7 +52,7 @@
+ 	PyObject *str();
+ 	PyObject *repr();
+ 	int compare(PyObject *ob);
+-	PyObject *PyTime::richcompare(PyObject *other, int op);
++	PyObject *richcompare(PyObject *other, int op);
+ 
+ 	int print(FILE *fp, int flags);
+ 	Py_hash_t hash(void);
+diff -aur 000/win32/src/PyWinTypes.h 001/win32/src/PyWinTypes.h
+--- 000/win32/src/PyWinTypes.h	2015-04-09 21:00:48.944027900 -0300
++++ 001/win32/src/PyWinTypes.h	2015-04-09 21:02:02.381651500 -0300
 @@ -796,7 +796,7 @@
  
  // A helper for simple exception handling.
@@ -198,9 +298,21 @@ diff -aur 002/win32/src/PyWinTypes.h 003/win32/src/PyWinTypes.h
  #define PYWINTYPES_TRY try
  #else
  #define PYWINTYPES_TRY __try
-diff -aur 002/win32/src/win32crypt/PyCRYPTPROV.cpp 003/win32/src/win32crypt/PyCRYPTPROV.cpp
---- 002/win32/src/win32crypt/PyCRYPTPROV.cpp	2014-01-25 15:15:48.000000000 -0200
-+++ 003/win32/src/win32crypt/PyCRYPTPROV.cpp	2015-04-05 17:34:27.360286600 -0300
+diff -aur 000/win32/src/PyWinTypesmodule.cpp 001/win32/src/PyWinTypesmodule.cpp
+--- 000/win32/src/PyWinTypesmodule.cpp	2015-04-09 21:00:48.990903200 -0300
++++ 001/win32/src/PyWinTypesmodule.cpp	2015-04-09 21:01:55.897264900 -0300
+@@ -1139,7 +1139,7 @@
+ }
+ 
+ // Function to format a python traceback into a character string.
+-#define GPEM_ERROR(what) {errorMsg = "<Error getting traceback - " ## what ## ">";goto done;}
++#define GPEM_ERROR(what) {errorMsg = "<Error getting traceback - " what ">";goto done;}
+ char *GetPythonTraceback(PyObject *exc_type, PyObject *exc_value, PyObject *exc_tb)
+ {
+ 	// Sleep (30000); // Time enough to attach the debugger (barely)
+diff -aur 000/win32/src/win32crypt/PyCRYPTPROV.cpp 001/win32/src/win32crypt/PyCRYPTPROV.cpp
+--- 000/win32/src/win32crypt/PyCRYPTPROV.cpp	2015-04-09 21:00:49.100277500 -0300
++++ 001/win32/src/win32crypt/PyCRYPTPROV.cpp	2015-04-09 21:02:02.381651500 -0300
 @@ -1,4 +1,5 @@
  // @doc
 +#include <algorithm>
@@ -216,9 +328,9 @@ diff -aur 002/win32/src/win32crypt/PyCRYPTPROV.cpp 003/win32/src/win32crypt/PyCR
  	if (CryptGenRandom(hcryptprov, dwLen, pbBuffer))
  		ret=PyString_FromStringAndSize((char *)pbBuffer, dwLen);
  	else
-diff -aur 002/win32/src/win32crypt/win32cryptmodule.cpp 003/win32/src/win32crypt/win32cryptmodule.cpp
---- 002/win32/src/win32crypt/win32cryptmodule.cpp	2014-01-25 15:15:48.000000000 -0200
-+++ 003/win32/src/win32crypt/win32cryptmodule.cpp	2015-04-05 22:56:26.696003000 -0300
+diff -aur 000/win32/src/win32crypt/win32cryptmodule.cpp 001/win32/src/win32crypt/win32cryptmodule.cpp
+--- 000/win32/src/win32crypt/win32cryptmodule.cpp	2015-04-09 21:00:49.194027800 -0300
++++ 001/win32/src/win32crypt/win32cryptmodule.cpp	2015-04-09 21:02:02.397275800 -0300
 @@ -596,44 +596,37 @@
  		pvPara=(void *)&cssrp;
  		}
@@ -294,9 +406,9 @@ diff -aur 002/win32/src/win32crypt/win32cryptmodule.cpp 003/win32/src/win32crypt
  			}
  		}
  
-diff -aur 002/win32/src/win32evtlog.i 003/win32/src/win32evtlog.i
---- 002/win32/src/win32evtlog.i	2014-04-26 15:21:40.000000000 -0300
-+++ 003/win32/src/win32evtlog.i	2015-04-07 09:32:48.778717700 -0300
+diff -aur 000/win32/src/win32evtlog.i 001/win32/src/win32evtlog.i
+--- 000/win32/src/win32evtlog.i	2015-04-09 21:00:49.256528100 -0300
++++ 001/win32/src/win32evtlog.i	2015-04-09 21:02:02.397275800 -0300
 @@ -997,6 +997,14 @@
  }
  PyCFunction pfnPyEvtUpdateBookmark = (PyCFunction) PyEvtUpdateBookmark;
@@ -312,9 +424,9 @@ diff -aur 002/win32/src/win32evtlog.i 003/win32/src/win32evtlog.i
  PyObject *PyWinObject_FromEVT_VARIANT(PEVT_VARIANT val)
  {
  	if (val->Type & EVT_VARIANT_TYPE_ARRAY){
-diff -aur 002/win32/src/win32file.i 003/win32/src/win32file.i
---- 002/win32/src/win32file.i	2013-06-13 17:40:32.000000000 -0300
-+++ 003/win32/src/win32file.i	2015-04-07 07:46:40.178640500 -0300
+diff -aur 000/win32/src/win32file.i 001/win32/src/win32file.i
+--- 000/win32/src/win32file.i	2015-04-09 21:00:49.459654600 -0300
++++ 001/win32/src/win32file.i	2015-04-09 21:02:02.412900800 -0300
 @@ -1404,11 +1404,11 @@
  	// the filename is exactly 1 byte!  Not clear the best way to
  	// check this, but this works for now - is it at least the size of
@@ -329,9 +441,9 @@ diff -aur 002/win32/src/win32file.i 003/win32/src/win32file.i
  		if (!fname) {
  			Py_DECREF(ret);
  			return NULL;
-diff -aur 002/win32/src/win32file_comm.cpp 003/win32/src/win32file_comm.cpp
---- 002/win32/src/win32file_comm.cpp	2011-03-19 10:51:22.000000000 -0300
-+++ 003/win32/src/win32file_comm.cpp	2015-04-06 20:20:20.347135800 -0300
+diff -aur 000/win32/src/win32file_comm.cpp 001/win32/src/win32file_comm.cpp
+--- 000/win32/src/win32file_comm.cpp	2015-04-09 21:00:49.490903600 -0300
++++ 001/win32/src/win32file_comm.cpp	2015-04-09 21:02:02.412900800 -0300
 @@ -175,7 +175,7 @@
  
  #define GET_BITFIELD_ENTRY(bitfield_name) \
@@ -368,9 +480,9 @@ diff -aur 002/win32/src/win32file_comm.cpp 003/win32/src/win32file_comm.cpp
  		return 0; \
  	} \
  
-diff -aur 002/win32/src/win32inet.i 003/win32/src/win32inet.i
---- 002/win32/src/win32inet.i	2011-03-19 10:51:22.000000000 -0300
-+++ 003/win32/src/win32inet.i	2015-04-07 19:57:38.467340900 -0300
+diff -aur 000/win32/src/win32inet.i 001/win32/src/win32inet.i
+--- 000/win32/src/win32inet.i	2015-04-09 21:00:49.569028200 -0300
++++ 001/win32/src/win32inet.i	2015-04-09 21:02:02.428526500 -0300
 @@ -4,9 +4,26 @@
  %{
  // #define UNICODE
@@ -407,9 +519,9 @@ diff -aur 002/win32/src/win32inet.i 003/win32/src/win32inet.i
  	Py_DECREF(dummy_tuple);
  	PyWinObject_FreeTCHAR(GroupName);
  	if (OwnerStorage)
-diff -aur 002/win32/src/win32net/win32net.h 003/win32/src/win32net/win32net.h
---- 002/win32/src/win32net/win32net.h	2011-03-19 10:51:22.000000000 -0300
-+++ 003/win32/src/win32net/win32net.h	2015-04-06 20:45:25.770423400 -0300
+diff -aur 000/win32/src/win32net/win32net.h 001/win32/src/win32net/win32net.h
+--- 000/win32/src/win32net/win32net.h	2015-04-09 21:00:49.600278800 -0300
++++ 001/win32/src/win32net/win32net.h	2015-04-09 21:02:02.428526500 -0300
 @@ -62,15 +62,15 @@
  
  #if WINVER >= 0x0500
@@ -430,9 +542,9 @@ diff -aur 002/win32/src/win32net/win32net.h 003/win32/src/win32net/win32net.h
 +extern "C" NetValidatePasswordPolicyFreefunc pfnNetValidatePasswordPolicyFree;
  
  #endif // WINVER
-diff -aur 002/win32/src/win32pdhmodule.cpp 003/win32/src/win32pdhmodule.cpp
---- 002/win32/src/win32pdhmodule.cpp	2012-06-22 11:08:42.000000000 -0300
-+++ 003/win32/src/win32pdhmodule.cpp	2015-04-06 21:19:19.686255800 -0300
+diff -aur 000/win32/src/win32pdhmodule.cpp 001/win32/src/win32pdhmodule.cpp
+--- 000/win32/src/win32pdhmodule.cpp	2015-04-09 21:00:49.662779100 -0300
++++ 001/win32/src/win32pdhmodule.cpp	2015-04-09 21:02:02.444150800 -0300
 @@ -11,6 +11,7 @@
  
  ******************************************************************/
@@ -459,9 +571,9 @@ diff -aur 002/win32/src/win32pdhmodule.cpp 003/win32/src/win32pdhmodule.cpp
  	myCfg.cfg.szReturnPathBuffer = (TCHAR *)malloc(myCfg.cfg.cchReturnPathLength * sizeof(TCHAR));
  	if (myCfg.cfg.szReturnPathBuffer == NULL){
  		PyErr_NoMemory();
-diff -aur 002/win32/src/win32popen.cpp 003/win32/src/win32popen.cpp
---- 002/win32/src/win32popen.cpp	2013-06-13 17:40:32.000000000 -0300
-+++ 003/win32/src/win32popen.cpp	2015-04-07 04:17:39.326047200 -0300
+diff -aur 000/win32/src/win32popen.cpp 001/win32/src/win32popen.cpp
+--- 000/win32/src/win32popen.cpp	2015-04-09 21:00:49.709655500 -0300
++++ 001/win32/src/win32popen.cpp	2015-04-09 21:02:02.444150800 -0300
 @@ -166,19 +166,27 @@
  {
  	PROCESS_INFORMATION piProcInfo;
@@ -497,9 +609,9 @@ diff -aur 002/win32/src/win32popen.cpp 003/win32/src/win32popen.cpp
      }
  	// Could be an else here to try cmd.exe / command.com in the path
  	// Now we'll just error out..
-diff -aur 002/win32/src/win32rasmodule.cpp 003/win32/src/win32rasmodule.cpp
---- 002/win32/src/win32rasmodule.cpp	2012-01-02 15:42:24.000000000 -0200
-+++ 003/win32/src/win32rasmodule.cpp	2015-04-07 04:46:43.333884000 -0300
+diff -aur 000/win32/src/win32rasmodule.cpp 001/win32/src/win32rasmodule.cpp
+--- 000/win32/src/win32rasmodule.cpp	2015-04-09 21:00:49.756528400 -0300
++++ 001/win32/src/win32rasmodule.cpp	2015-04-09 21:02:02.459777500 -0300
 @@ -463,7 +463,7 @@
  	if (obCallback==Py_None) {
  		pNotification = NULL;
@@ -509,9 +621,9 @@ diff -aur 002/win32/src/win32rasmodule.cpp 003/win32/src/win32rasmodule.cpp
  		notType = 1;
  	} else if (PyInt_Check(obCallback)) {
  		if (!PyWinLong_AsVoidPtr(obCallback, &pNotification))
-diff -aur 002/win32/src/win32security.i 003/win32/src/win32security.i
---- 002/win32/src/win32security.i	2012-09-24 10:17:38.000000000 -0300
-+++ 003/win32/src/win32security.i	2015-04-07 05:17:31.777289500 -0300
+diff -aur 000/win32/src/win32security.i 001/win32/src/win32security.i
+--- 000/win32/src/win32security.i	2015-04-09 21:00:49.912778600 -0300
++++ 001/win32/src/win32security.i	2015-04-09 21:02:02.459777500 -0300
 @@ -3563,9 +3563,9 @@
  		return FALSE;
  		}
@@ -540,9 +652,9 @@ diff -aur 002/win32/src/win32security.i 003/win32/src/win32security.i
  }
  
  %}
-diff -aur 002/win32/src/win32service.i 003/win32/src/win32service.i
---- 002/win32/src/win32service.i	2012-09-24 10:17:38.000000000 -0300
-+++ 003/win32/src/win32service.i	2015-04-07 08:21:56.348455600 -0300
+diff -aur 000/win32/src/win32service.i 001/win32/src/win32service.i
+--- 000/win32/src/win32service.i	2015-04-09 21:00:49.990904900 -0300
++++ 001/win32/src/win32service.i	2015-04-09 21:02:02.475400700 -0300
 @@ -57,6 +57,13 @@
  		if (fp!=NULL)
  			fpEnumServicesStatusEx=(EnumServicesStatusExfunc)fp;
@@ -557,9 +669,9 @@ diff -aur 002/win32/src/win32service.i 003/win32/src/win32service.i
  %}
  
  %{
-diff -aur 002/win32/src/win32trace.cpp 003/win32/src/win32trace.cpp
---- 002/win32/src/win32trace.cpp	2011-03-19 10:51:22.000000000 -0300
-+++ 003/win32/src/win32trace.cpp	2015-04-07 06:33:18.264396500 -0300
+diff -aur 000/win32/src/win32trace.cpp 001/win32/src/win32trace.cpp
+--- 000/win32/src/win32trace.cpp	2015-04-09 21:00:50.022154900 -0300
++++ 001/win32/src/win32trace.cpp	2015-04-09 21:02:02.475400700 -0300
 @@ -30,6 +30,7 @@
  
  */
diff --git a/mingw-w64-python-pywin32/001-experimental-fixes.patch b/mingw-w64-python-pywin32/001-experimental-fixes.patch
deleted file mode 100644
index 4ec99903b610f..0000000000000
--- a/mingw-w64-python-pywin32/001-experimental-fixes.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff --strip-trailing-cr -aur old/setup.py 001/setup.py
---- old/setup.py	2014-05-03 11:37:18.000000000 -0300
-+++ 001/setup.py	2015-03-25 23:28:00.347036000 -0300
-@@ -224,7 +224,7 @@
- # languishing and will probably never be fixed for Python 2.6...
- if sys.version_info > (2,6):
-     from distutils.spawn import spawn
--    from distutils.msvc9compiler import MSVCCompiler
-+    from distutils.msvccompiler import MSVCCompiler
-     MSVCCompiler._orig_spawn = MSVCCompiler.spawn
-     MSVCCompiler._orig_link = MSVCCompiler.link
- 
-@@ -293,7 +293,7 @@
-     MSVCCompiler.link = monkeypatched_link
- 
- 
--sdk_dir = find_platform_sdk_dir()
-+sdk_dir = find_platform_sdk_dir() or ''
- 
- class WinExt (Extension):
-     # Base class for all win32 extensions, with some predefined
-diff --strip-trailing-cr -aur old/win32/src/PySECURITY_DESCRIPTOR.cpp 001/win32/src/PySECURITY_DESCRIPTOR.cpp
---- old/win32/src/PySECURITY_DESCRIPTOR.cpp	2011-03-19 10:51:22.000000000 -0300
-+++ 001/win32/src/PySECURITY_DESCRIPTOR.cpp	2015-03-25 23:35:09.176365400 -0300
-@@ -5,6 +5,7 @@
- #include "PyWinObjects.h"
- #include "PySecurityObjects.h"
- #include "structmember.h"
-+#include <algorithm>
- 
- #ifndef NO_PYWINTYPES_SECURITY
- BOOL (WINAPI *setsecuritydescriptorcontrol)(PSECURITY_DESCRIPTOR, SECURITY_DESCRIPTOR_CONTROL, SECURITY_DESCRIPTOR_CONTROL)=NULL;
-@@ -786,7 +787,7 @@
- {
- 	ob_type = &PySECURITY_DESCRIPTORType;
- 	_Py_NewReference(this);
--	cb = max(cb, SECURITY_DESCRIPTOR_MIN_LENGTH);
-+	cb = std::max((long long unsigned int)cb, SECURITY_DESCRIPTOR_MIN_LENGTH);
- 	PSECURITY_DESCRIPTOR psd = malloc(cb);
- 	this->m_psd=NULL;
- 	if (::InitializeSecurityDescriptor(psd, SECURITY_DESCRIPTOR_REVISION))
-diff --strip-trailing-cr -aur old/win32/src/PySecurityObjects.h 001/win32/src/PySecurityObjects.h
---- old/win32/src/PySecurityObjects.h	2011-03-19 10:51:22.000000000 -0300
-+++ 001/win32/src/PySecurityObjects.h	2015-03-25 23:29:45.425492600 -0300
-@@ -121,7 +121,7 @@
- 	static PyObject *GetSubAuthorityCount(PyObject *self, PyObject *args);
- 	static PyObject *GetSubAuthority(PyObject *self, PyObject *args);
- 	static PyObject *GetSidIdentifierAuthority(PyObject *self, PyObject *args);
--	static struct PyMethodDef PySID::methods[];
-+	static struct PyMethodDef methods[];
- 
- protected:
- 	PSID m_psid;
-@@ -159,7 +159,7 @@
- 	/* Python support */
- 	int compare(PyObject *ob);
- 	static void deallocFunc(PyObject *ob);
--	static struct PyMethodDef PyACL::methods[];
-+	static struct PyMethodDef methods[];
- 
- 	static PyObject *Initialize(PyObject *self, PyObject *args);
- 	static PyObject *IsValid(PyObject *self, PyObject *args);
-diff --strip-trailing-cr -aur old/win32/src/PyWinObjects.h 001/win32/src/PyWinObjects.h
---- old/win32/src/PyWinObjects.h	2011-03-19 10:51:22.000000000 -0300
-+++ 001/win32/src/PyWinObjects.h	2015-03-25 23:29:25.800392400 -0300
-@@ -52,7 +52,7 @@
- 	PyObject *str();
- 	PyObject *repr();
- 	int compare(PyObject *ob);
--	PyObject *PyTime::richcompare(PyObject *other, int op);
-+	PyObject *richcompare(PyObject *other, int op);
- 
- 	int print(FILE *fp, int flags);
- 	Py_hash_t hash(void);
-diff --strip-trailing-cr -aur old/win32/src/PyWinTypesmodule.cpp 001/win32/src/PyWinTypesmodule.cpp
---- old/win32/src/PyWinTypesmodule.cpp	2012-09-24 10:17:36.000000000 -0300
-+++ 001/win32/src/PyWinTypesmodule.cpp	2015-03-25 23:38:45.812576700 -0300
-@@ -1139,7 +1139,7 @@
- }
- 
- // Function to format a python traceback into a character string.
--#define GPEM_ERROR(what) {errorMsg = "<Error getting traceback - " ## what ## ">";goto done;}
-+#define GPEM_ERROR(what) {errorMsg = "<Error getting traceback - " what ">";goto done;}
- char *GetPythonTraceback(PyObject *exc_type, PyObject *exc_value, PyObject *exc_tb)
- {
- 	// Sleep (30000); // Time enough to attach the debugger (barely)
diff --git a/mingw-w64-python-pywin32/002-experimental-fixes.patch b/mingw-w64-python-pywin32/002-experimental-fixes.patch
deleted file mode 100644
index 91ad4e2fe505d..0000000000000
--- a/mingw-w64-python-pywin32/002-experimental-fixes.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -aur 001/setup.py 002/setup.py
---- 001/setup.py	2015-03-31 16:31:40.344437400 -0300
-+++ 002/setup.py	2015-03-31 18:14:09.612059600 -0300
-@@ -340,6 +340,8 @@
-         # Some of our swigged files behave differently in distutils vs
-         # MSVC based builds.  Always define DISTUTILS_BUILD so they can tell.
-         define_macros = define_macros or []
-+        define_macros.append(("UNICODE", None))
-+        define_macros.append(("_UNICODE", None))
-         define_macros.append(("DISTUTILS_BUILD", None))
-         define_macros.append(("_CRT_SECURE_NO_WARNINGS", None))
-         self.pch_header = pch_header
-@@ -865,7 +867,8 @@
-                     log.debug("Looked for %s in %s", lib, look_dirs)
-                     return "No library '%s'" % lib
-                 self.found_libraries[lib.lower()] = found
--            patched_libs.append(os.path.splitext(os.path.basename(found))[0])
-+            lib_name = re.sub(r'^lib(.*)\.a', r'\1', os.path.basename(found))
-+            patched_libs.append(os.path.splitext(lib_name)[0])
- 
-         if ext.platforms and self.plat_name not in ext.platforms:
-             return "Only available on platforms %s" % (ext.platforms,)
-@@ -1226,7 +1229,7 @@
-             # XXX This has to be changed for mingw32
-             # Get the .lib files we need.  This is limited to pywintypes,
-             # pythoncom and win32ui - but the first 2 have special names
--            extra = self.debug and "_d.lib" or ".lib"
-+            extra = self.debug and "_d.def" or ".def"
-             if ext.name in ("pywintypes", "pythoncom"):
-                 # The import libraries are created as PyWinTypes23.lib, but
-                 # are expected to be pywintypes.lib.
-diff -aur 001/win32/src/PerfMon/perfmondata.cpp 002/win32/src/PerfMon/perfmondata.cpp
---- 001/win32/src/PerfMon/perfmondata.cpp	2011-03-19 10:51:22.000000000 -0300
-+++ 002/win32/src/PerfMon/perfmondata.cpp	2015-03-31 18:17:40.378112100 -0300
-@@ -445,7 +445,7 @@
- --*/
- {
-     HKEY hAppKey;
--    TCHAR LogLevelKeyName[] = _T("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Perflib");
-+    TCHAR LogLevelKeyName[] = _T("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Perflib");
- 
-     TCHAR LogLevelValueName[] = _T("EventLogLevel");
- 	LONG lStatus;
diff --git a/mingw-w64-python-pywin32/PKGBUILD b/mingw-w64-python-pywin32/PKGBUILD
index 7d6f8fa911862..416a074afa3b5 100644
--- a/mingw-w64-python-pywin32/PKGBUILD
+++ b/mingw-w64-python-pywin32/PKGBUILD
@@ -12,21 +12,14 @@ pkgrel=1
 makedepends=(${MINGW_PACKAGE_PREFIX}-python2 ${MINGW_PACKAGE_PREFIX}-python3 rsync)
 pkgname=(${MINGW_PACKAGE_PREFIX}-python2-${_realname} ${MINGW_PACKAGE_PREFIX}-python3-${_realname})
 groups=(${MINGW_PACKAGE_PREFIX})
-
 source=("http://prdownloads.sourceforge.net/${_realname}/${_realname}-${pkgver}.zip"
-        001-experimental-fixes.patch
-        002-experimental-fixes.patch
-        003-experimental-fixes.patch)
+        001-compile-and-setup-fixes.patch)
 sha1sums=('1eb8039f9e15f53f56a9e1b54f00cd2c0f63ff8e'
-          '3a42fd3d639db7ec3cd1baa130a047dd592a93fe'
-          '25233c64a976605d2a4d83beaf6b0c69be736014'
-          '44f19d4ae37e32baf00f8e0a9de7f91928aa8e50')
+          '24ee63ecc8914d05a9ae4035d5c854517ff260a9')
 
 prepare() {
     cd "${srcdir}/${_realname}-${pkgver}"
-    patch -p1 < "${startdir}"/001-experimental-fixes.patch
-    patch -p1 < "${startdir}"/002-experimental-fixes.patch
-    patch -p1 < "${startdir}"/003-experimental-fixes.patch
+    patch -p1 < "${startdir}"/001-compile-and-setup-fixes.patch
 }
 
 build() {

From 2ac695750147883378d64cc89969ba2bc204fc30 Mon Sep 17 00:00:00 2001
From: Renato Silva <br.renatosilva@gmail.com>
Date: Thu, 9 Apr 2015 21:19:00 -0300
Subject: [PATCH 4/6] libmongoose: New package.

---
 mingw-w64-libmongoose-git/PKGBUILD | 39 ++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 mingw-w64-libmongoose-git/PKGBUILD

diff --git a/mingw-w64-libmongoose-git/PKGBUILD b/mingw-w64-libmongoose-git/PKGBUILD
new file mode 100644
index 0000000000000..c5f8f3b41706b
--- /dev/null
+++ b/mingw-w64-libmongoose-git/PKGBUILD
@@ -0,0 +1,39 @@
+# Maintainer: Renato Silva <br.renatosilva@gmail.com>
+
+_realname='libmongoose'
+url='https://github.com/cesanta/mongoose'
+pkgdesc=' Embedded web server for C/C++ (mingw-w64)'
+license=('GPL2')
+arch=('any')
+pkgver=r1764.eef70aa
+pkgrel=1
+
+pkgname=(${MINGW_PACKAGE_PREFIX}-${_realname}-git)
+provides=(${MINGW_PACKAGE_PREFIX}-${_realname})
+conflicts=(${MINGW_PACKAGE_PREFIX}-${_realname})
+makedepends=(${MINGW_PACKAGE_PREFIX}-gcc)
+source=(${_realname}::'git+https://github.com/cesanta/mongoose')
+sha1sums=('SKIP')
+
+pkgver() {
+    cd "${srcdir}/${_realname}"
+    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
+
+build() {
+    cd "${srcdir}/${_realname}"
+    # See https://github.com/cesanta/mongoose/issues/326
+    # See https://github.com/cesanta/mongoose/issues/506
+    gcc -c -DFD_SETSIZE=1024 mongoose.c -o mongoose.o
+    ar rcs libmongoose.a mongoose.o
+    gcc -shared -o libmongoose.dll mongoose.o -Wl,--out-implib,libmongoose.dll.a -lws2_32
+}
+
+package() {
+    cd "${srcdir}/${_realname}"
+    install -D -m644 mongoose.h        "${pkgdir}${MINGW_PREFIX}/include/mongoose.h"
+    install -D -m644 libmongoose.a     "${pkgdir}${MINGW_PREFIX}/lib/libmongoose.a"
+    install -D -m644 libmongoose.dll.a "${pkgdir}${MINGW_PREFIX}/lib/libmongoose.dll.a"
+    install -D -m755 libmongoose.dll   "${pkgdir}${MINGW_PREFIX}/bin/libmongoose.dll"
+    install -D -m644 LICENSE           "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
+}

From 3f5b8e2d69503c403f83f872bff5d6901b1aca62 Mon Sep 17 00:00:00 2001
From: Alexpux <alexey.pawlow@gmail.com>
Date: Fri, 10 Apr 2015 09:25:02 +0300
Subject: [PATCH 5/6] gnutls: Update to 3.4.0

---
 .../0001-add-missing-define.patch             | 11 ++++++
 .../0002-fix-duplicate-entries.patch          | 36 +++++++++++++++++++
 mingw-w64-gnutls/PKGBUILD                     | 29 ++++++++++-----
 3 files changed, 67 insertions(+), 9 deletions(-)
 create mode 100644 mingw-w64-gnutls/0001-add-missing-define.patch
 create mode 100644 mingw-w64-gnutls/0002-fix-duplicate-entries.patch

diff --git a/mingw-w64-gnutls/0001-add-missing-define.patch b/mingw-w64-gnutls/0001-add-missing-define.patch
new file mode 100644
index 0000000000000..b76a180d40f6f
--- /dev/null
+++ b/mingw-w64-gnutls/0001-add-missing-define.patch
@@ -0,0 +1,11 @@
+--- gnutls-3.4.0/lib/includes/gnutls/gnutls.h.in.orig	2015-04-09 23:38:42.018400000 +0300
++++ gnutls-3.4.0/lib/includes/gnutls/gnutls.h.in	2015-04-09 23:39:31.860400000 +0300
+@@ -67,6 +67,8 @@
+ #define GNUTLS_CIPHER_RIJNDAEL_CBC GNUTLS_CIPHER_AES_128_CBC
+ #define GNUTLS_CIPHER_ARCFOUR GNUTLS_CIPHER_ARCFOUR_128
+ 
++#define GNUTLS_INTERNAL_BUILD 1
++
+ #if !defined(GNUTLS_INTERNAL_BUILD) && defined(_WIN32)
+ # define _SYM_EXPORT __declspec(dllimport)
+ #else
diff --git a/mingw-w64-gnutls/0002-fix-duplicate-entries.patch b/mingw-w64-gnutls/0002-fix-duplicate-entries.patch
new file mode 100644
index 0000000000000..2b76db5ca3e4c
--- /dev/null
+++ b/mingw-w64-gnutls/0002-fix-duplicate-entries.patch
@@ -0,0 +1,36 @@
+From 7e63027a5caafa55dcca65c5b9bff3bf76c5a41c Mon Sep 17 00:00:00 2001
+From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
+Date: Thu, 9 Apr 2015 16:00:43 +0200
+Subject: [PATCH] remove duplicate entries from manpages Makefile
+
+---
+ doc/manpages/Makefile.am | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
+index 8e793d3..68de757 100644
+--- a/doc/manpages/Makefile.am
++++ b/doc/manpages/Makefile.am
+@@ -134,11 +134,8 @@ APIMANS += gnutls_certificate_get_peers.3
+ APIMANS += gnutls_certificate_get_peers_subkey_id.3
+ APIMANS += gnutls_certificate_get_trust_list.3
+ APIMANS += gnutls_certificate_get_verify_flags.3
+-APIMANS += gnutls_certificate_get_verify_flags.3
+-APIMANS += gnutls_certificate_get_x509_crt.3
+ APIMANS += gnutls_certificate_get_x509_crt.3
+ APIMANS += gnutls_certificate_get_x509_key.3
+-APIMANS += gnutls_certificate_get_x509_key.3
+ APIMANS += gnutls_certificate_send_x509_rdn_sequence.3
+ APIMANS += gnutls_certificate_server_set_request.3
+ APIMANS += gnutls_certificate_set_dh_params.3
+@@ -1101,7 +1098,7 @@ compare-makefile:
+ 	@echo "******************************************************************************"
+ 	@echo "If the following step fails copy $(srcdir)/doc/manpages/tmp-compare-makefile to doc/manpages/Makefile.am"
+ 	@echo "******************************************************************************"
+-	FUNCS=`cat $(top_srcdir)/lib/includes/gnutls/*.h | $(top_srcdir)/doc/scripts/getfuncs.pl|sort -d`; \
++	FUNCS=`cat $(top_srcdir)/lib/includes/gnutls/*.h | $(top_srcdir)/doc/scripts/getfuncs.pl|sort -d|uniq`; \
+ 	MANS=""; \
+ 	for i in $$FUNCS; do \
+ 		MANS="$$MANS\nAPIMANS += $$i.3"; \
+--
+libgit2 0.21.4
diff --git a/mingw-w64-gnutls/PKGBUILD b/mingw-w64-gnutls/PKGBUILD
index a0caf18dc8eeb..b34114cf1a717 100644
--- a/mingw-w64-gnutls/PKGBUILD
+++ b/mingw-w64-gnutls/PKGBUILD
@@ -2,7 +2,7 @@
 
 _realname=gnutls
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=3.3.14
+pkgver=3.4.0
 pkgrel=1
 pkgdesc="A library which provides a secure layer over a reliable transport layer (mingw-w64)"
 arch=('any')
@@ -13,35 +13,45 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
         "${MINGW_PACKAGE_PREFIX}-libtasn1"
         "${MINGW_PACKAGE_PREFIX}-gmp"
         "${MINGW_PACKAGE_PREFIX}-zlib"
-        "${MINGW_PACKAGE_PREFIX}-nettle"
-        "${MINGW_PACKAGE_PREFIX}-p11-kit"
+        "${MINGW_PACKAGE_PREFIX}-nettle>=3.1"
+        "${MINGW_PACKAGE_PREFIX}-p11-kit>=0.23.1"
         "${MINGW_PACKAGE_PREFIX}-libgnurx"
         #"${MINGW_PACKAGE_PREFIX}-unbound"
         )
+
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc")
-source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/${_realname}-${pkgver}.tar.xz{,.sig}
+# Need remove "autogen" package before building.
+source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v${pkgver%.*}/${_realname}-${pkgver}.tar.xz{,.sig}
+        0001-add-missing-define.patch
+        0002-fix-duplicate-entries.patch
         0004-fix-gtkdoc.all.patch
         0005-fix-strtok-conflict.mingw.patch)
-md5sums=('7f4465f8c564cf9cb8f5cb38b909f7ca'
+md5sums=('aa015c2666b031044edfb01b01980d84'
          'SKIP'
+         '807a79513358a9f4123f62111f1eed59'
+         '516c3b60e5c2878a0af9f243fd4dac30'
          '86cfab6e7c2ccfcfd1dad9d5024627e3'
          '77287dc835afbb8cc4e9c4aa6b7adb7b')
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
+  patch -p1 -i ${srcdir}/0001-add-missing-define.patch
+  patch -p1 -i ${srcdir}/0002-fix-duplicate-entries.patch
   #patch -p1 -i ${srcdir}/0004-fix-gtkdoc.all.patch
   #patch -p1 -i ${srcdir}/0005-fix-strtok-conflict.mingw.patch
 
-  #WANT_AUTOMAKE=latest autoreconf -fi -I m4
+  WANT_AUTOMAKE=latest autoreconf -fi -I m4
 }
 
 build() {
-  # Woraround for localtime_r functions
-  #CFLAGS+=" -DGNULIB_PORTCHECK=1"
-  #CXXFLAGS+=" -DGNULIB_PORTCHECK=1"
+  # Workaround for localtime_r functions
+  CFLAGS+=" -D_POSIX_C_SOURCE"
+  CXXFLAGS+=" -D_POSIX_C_SOURCE"
 
+  [[ -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} \
     --build=${MINGW_CHOST} \
@@ -58,6 +68,7 @@ build() {
     --enable-local-libopts \
     --disable-guile \
     --disable-libdane \
+    --disable-tests \
     gl_cv_double_slash_root=yes
   
   make

From f080890e4bd0840ab2d467ca7770c0e49f9daf13 Mon Sep 17 00:00:00 2001
From: Alexpux <alexey.pawlow@gmail.com>
Date: Fri, 10 Apr 2015 09:26:01 +0300
Subject: [PATCH 6/6] gst-plugins-bad: Rebuild with nettle-3.1, gnutls-3.4.0

---
 mingw-w64-gst-plugins-bad/PKGBUILD | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mingw-w64-gst-plugins-bad/PKGBUILD b/mingw-w64-gst-plugins-bad/PKGBUILD
index c44596d032437..e0db39a18db68 100644
--- a/mingw-w64-gst-plugins-bad/PKGBUILD
+++ b/mingw-w64-gst-plugins-bad/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=gst-plugins-bad
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.4.5
-pkgrel=2
+pkgrel=3
 pkgdesc="GStreamer Multimedia Framework Bad Plugins (mingw-w64)"
 arch=('any')
 url="http://gstreamer.freedesktop.org/"
@@ -86,12 +86,13 @@ build() {
     --enable-experimental \
     --disable-gtk-doc \
     --with-gtk=3.0
+
   make
 }
 
 package() {
   cd "${srcdir}/build-${MINGW_CHOST}"
   make -j1 DESTDIR="$pkgdir" install
-  find "${pkgdir}${MINGW_PREFIX}" -name '*.def' -o -name '*.exp' | xargs -rtl1 rm
+  
   rm -f ${pkgdir}${MINGW_PREFIX}/lib/gstreamer*/*.a
 }