[mingw-headers/f17] Backport upstream commit 5451 as it is needed to build mingw-qt5-qtbase

[Erik van Pienbroek]

commit 18b5fe46618138ab43c3590d79e4acd18e998a2d
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Mon Jan 28 12:51:33 2013 +0100

    Backport upstream commit 5451 as it is needed to build mingw-qt5-qtbase

 mingw-headers.spec                     |   11 ++++++++++-
 mingw-w64-commit-5451-dwrite-fix.patch |   23 +++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletions(-)
---
diff --git a/mingw-headers.spec b/mingw-headers.spec
index 75ec899..29b5946 100644
--- a/mingw-headers.spec
+++ b/mingw-headers.spec
@@ -13,7 +13,7 @@
 
 Name:           mingw-headers
 Version:        2.0.999
-Release:        0.8.%{branch}.%{snapshot_date}%{?dist}
+Release:        0.9.%{branch}.%{snapshot_date}%{?dist}
 Summary:        Win32/Win64 header files
 
 License:        Public Domain and LGPLv2+ and ZPLv2.1
@@ -28,6 +28,10 @@ Source0:        mingw-w64-%{branch}-snapshot-%{snapshot_date}.tar.gz
 Source0:        http://downloads.sourceforge.net/mingw-w64/mingw-w64-v%{version}.tar.gz
 %endif
 
+# Backport upstream commit 5451 which contains a fix
+# which is needed to get mingw-qt5-qtbase built
+Patch0:         mingw-w64-commit-5451-dwrite-fix.patch
+
 BuildArch:      noarch
 
 BuildRequires:  mingw32-filesystem >= 95
@@ -73,6 +77,8 @@ tar -xf %{S:0}
 %setup -q -n mingw-w64-v%{version}
 %endif
 
+%patch0 -p1
+
 
 %build
 pushd mingw-w64-headers
@@ -104,6 +110,9 @@ rm -f $RPM_BUILD_ROOT%{mingw64_includedir}/pthread_unistd.h
 
 
 %changelog
+* Mon Jan 28 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.0.999-0.9.trunk.20121016
+- Backport upstream commit 5451 as it is needed to build mingw-qt5-qtbase
+
 * Wed Oct 24 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.0.999-0.8.trunk.20121016
 - Update to 20121016 snapshot (contains full Cygwin support)
 - Eliminated various manual kludges as upstream now installs their
diff --git a/mingw-w64-commit-5451-dwrite-fix.patch b/mingw-w64-commit-5451-dwrite-fix.patch
new file mode 100644
index 0000000..cba280a
--- /dev/null
+++ b/mingw-w64-commit-5451-dwrite-fix.patch
@@ -0,0 +1,23 @@
+--- trunk/mingw-w64-headers/include/dwrite.h	2012/11/05 13:45:41	5450
++++ trunk/mingw-w64-headers/include/dwrite.h	2012/11/10 13:36:35	5451
+@@ -2207,12 +2207,20 @@
+ #define IDWriteTypography_GetFontFeatureCount() (This)->lpVtbl->GetFontFeatureCount(This)
+ #endif /*COBJMACROS*/
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ DWRITEAPI HRESULT WINAPI DWriteCreateFactory(
+   DWRITE_FACTORY_TYPE factoryType,
+   REFIID iid,
+   IUnknown **factory
+ );
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ __CRT_UUID_DECL(IDWriteBitmapRenderTarget, 0x5e5a32a3,0x8dff,0x4773,0x9f,0xf6,0x06,0x96,0xea,0xb7,0x72,0x67);
+ __CRT_UUID_DECL(IDWriteFactory, 0xb859ee5a,0xd838,0x4b5b,0xa2,0xe8,0x1a,0xdc,0x7d,0x93,0xdb,0x48);
+ __CRT_UUID_DECL(IDWriteFont, 0xacd16696,0x8c14,0x4f5d,0x87,0x7e,0xfe,0x3f,0xc1,0xd3,0x27,0x37);