diff --git a/mingw-w64-headers-1.0b.20100818-namelessunion.patch b/mingw-w64-headers-1.0b.20100818-namelessunion.patch deleted file mode 100644 index ae3059e..0000000 --- a/mingw-w64-headers-1.0b.20100818-namelessunion.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- include/winnt.h (revision 3516) -+++ include/winnt.h (revision 3517) -@@ -3121,7 +3121,7 @@ - __MINGW_EXTENSION union { - PVOID FiberData; - DWORD Version; -- } DUMMYUNIONNAME; -+ }; - PVOID ArbitraryUserPointer; - struct _NT_TIB *Self; - } NT_TIB; diff --git a/mingw-w64-headers-1.0b.20100818-uow.patch b/mingw-w64-headers-1.0b.20100818-uow.patch deleted file mode 100644 index 43ef03d..0000000 --- a/mingw-w64-headers-1.0b.20100818-uow.patch +++ /dev/null @@ -1,80 +0,0 @@ ---- mingw-w64-headers-1.0b.20100818/ddk/include/ddk/wdm.h 2010-08-16 22:18:25.000000000 +0200 -+++ mingw-w64-headers-1.0b.20100818/ddk/include/ddk/wdm.h 2010-09-06 09:06:31.000000000 +0200 -@@ -56,7 +56,11 @@ - #endif /* _MAC */ - - #ifndef _KTMTYPES_ -+#ifdef _MSC_VER - typedef GUID UOW, *PUOW; -+#else -+typedef GUID *PUOW; -+#endif - #endif - - typedef GUID *PGUID; -@@ -14960,10 +14964,10 @@ - } ENLISTMENT_INFORMATION_CLASS; - - typedef struct _TRANSACTION_LIST_ENTRY { --#if defined(__cplusplus) -- ::UOW UOW; --#else -+#ifdef _MSC_VER - UOW UOW; -+#else -+ GUID UOW; - #endif - } TRANSACTION_LIST_ENTRY, *PTRANSACTION_LIST_ENTRY; - ---- mingw-w64-headers-1.0b.20100818/include/ktmtypes.h 2010-08-17 10:51:42.000000000 +0200 -+++ mingw-w64-headers-1.0b.20100818/include/ktmtypes.h 2010-09-06 09:06:31.000000000 +0200 -@@ -92,7 +92,11 @@ - #define MAX_RESOURCEMANAGER_DESCRIPTION_LENGTH 64 - - #ifndef _WDMDDK_ -+#ifdef _MSC_VER - typedef GUID UOW, *PUOW; -+#else -+typedef GUID *PUOW; -+#endif - #endif - - typedef GUID CRM_PROTOCOL_ID, *PCRM_PROTOCOL_ID; -@@ -126,7 +130,11 @@ - - typedef struct _TRANSACTION_NOTIFICATION_PROPAGATE_ARGUMENT { - ULONG PropagationCookie; -+#ifdef _MSC_VER -+ UOW UOW; -+#else - GUID UOW; -+#endif - GUID TmIdentity; - ULONG BufferLength; - } TRANSACTION_NOTIFICATION_PROPAGATE_ARGUMENT, *PTRANSACTION_NOTIFICATION_PROPAGATE_ARGUMENT, -@@ -134,7 +142,11 @@ - - typedef struct _TRANSACTION_NOTIFICATION_MARSHAL_ARGUMENT { - ULONG MarshalCookie; -+#ifdef _MSC_VER -+ UOW UOW; -+#else - GUID UOW; -+#endif - } TRANSACTION_NOTIFICATION_MARSHAL_ARGUMENT, *PTRANSACTION_NOTIFICATION_MARSHAL_ARGUMENT; - - typedef struct _KCRM_MARSHAL_HEADER { -@@ -145,10 +157,10 @@ - } KCRM_MARSHAL_HEADER, *PKCRM_MARSHAL_HEADER, *RESTRICTED_POINTER PRKCRM_MARSHAL_HEADER; - - typedef struct _KCRM_TRANSACTION_BLOB { --#if defined(__cplusplus) -- ::UOW UOW; --#else -+#ifdef _MSC_VER - UOW UOW; -+#else -+ GUID UOW; - #endif - GUID TmIdentity; - ULONG IsolationLevel; diff --git a/mingw-w64-headers-1.0b.20100818.tar.bz2 b/mingw-w64-headers-1.0b.20100818.tar.bz2 deleted file mode 100644 index 10355be..0000000 --- a/mingw-w64-headers-1.0b.20100818.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d838ed451a5c5f0ea10a4476129eb7e2a83fea25538f6b67cc6467cb0875aeb7 -size 3224850 diff --git a/mingw-w64-headers-1.0b.20110505.tar.bz2 b/mingw-w64-headers-1.0b.20110505.tar.bz2 new file mode 100644 index 0000000..44d1c32 --- /dev/null +++ b/mingw-w64-headers-1.0b.20110505.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cba9abd79cca788bd8306056343a258be402a7a17fc7af2b006c5b426d26adb0 +size 3288915 diff --git a/mingw64-headers.spec b/mingw64-headers.spec index b1bb0ea..3204dcd 100644 --- a/mingw64-headers.spec +++ b/mingw64-headers.spec @@ -1,7 +1,7 @@ %define __os_install_post /usr/lib/rpm/brp-compress %{nil} Name: mingw64-headers -Version: 1.0b.20100818 +Version: 1.0b.20110505 Release: 0 Summary: MinGW-W64 headers for win32 and win64 @@ -11,8 +11,6 @@ URL: http://www.mingw.org/ Source0: mingw-w64-headers-%{version}.tar.bz2 Source1000: %{name}-rpmlintrc -Patch0: mingw-w64-headers-1.0b.20100818-uow.patch -Patch1: mingw-w64-headers-1.0b.20100818-namelessunion.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -27,8 +25,6 @@ MinGW Win64 headers. %prep %setup -q -n mingw-w64-headers-%{version} -%patch0 -p1 -%patch1 -p0 %build ./configure --host=%{_mingw64_target} \