diff --git a/.gitignore b/.gitignore index b6b4606..ed2d801 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,4 @@ /mingw-w64-mingw-w64-dadc8f83c38992fa4e55e9c90d673c194df70686.zip /mingw-w64-mingw-w64-f7337bdf0d70809e720b4e2671758e0c10c16f60.zip /mingw-w64-v4.0-rc1.tar.bz2 +/mingw-w64-v4.0-rc3.tar.bz2 diff --git a/0001-Use-a-Guard-defined-by-the-spec-and-not-_POSIX.-This.patch b/0001-Use-a-Guard-defined-by-the-spec-and-not-_POSIX.-This.patch deleted file mode 100644 index 87d01c4..0000000 --- a/0001-Use-a-Guard-defined-by-the-spec-and-not-_POSIX.-This.patch +++ /dev/null @@ -1,35 +0,0 @@ -From c239923641ae52e6c99011c57bc35e86b38f6872 Mon Sep 17 00:00:00 2001 -From: martell -Date: Wed, 28 Jan 2015 20:54:58 +0000 -Subject: [PATCH] Use a Guard defined by the spec and not _POSIX. This should - also guard from windows programs that assume the functions are unavailable - ---- - mingw-w64-headers/crt/time.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/mingw-w64-headers/crt/time.h b/mingw-w64-headers/crt/time.h -index b551a27..7b43fd8 100644 ---- a/mingw-w64-headers/crt/time.h -+++ b/mingw-w64-headers/crt/time.h -@@ -261,7 +261,7 @@ struct timezone { - - #pragma pack(pop) - --#if defined(_POSIX) || defined(_POSIX_THREAD_SAFE_FUNCTIONS) -+#if defined(_POSIX_C_SOURCE) || defined(_POSIX_THREAD_SAFE_FUNCTIONS) - __forceinline struct tm *__cdecl localtime_r(const time_t *_Time, struct tm *_Tm) { - return localtime_s(_Tm, _Time) ? NULL : _Tm; - } -@@ -274,7 +274,7 @@ __forceinline char *__cdecl ctime_r(const time_t *_Time, char *_Str) { - __forceinline char *__cdecl asctime_r(const struct tm *_Tm, char * _Str) { - return asctime_s(_Str, 0x7fffffff, _Tm) ? NULL : _Str; - } --#endif /* _POSIX */ -+#endif /* _POSIX_C_SOURCE */ - - /* Adding timespec definition. */ - #include --- -2.2.2 - diff --git a/mingw-headers.spec b/mingw-headers.spec index a2bd2d5..fbf9b16 100644 --- a/mingw-headers.spec +++ b/mingw-headers.spec @@ -3,7 +3,7 @@ #%%global snapshot_rev_short %(echo %snapshot_rev | cut -c1-6) #%%global branch trunk -%global pre rc1 +%global pre rc3 # The mingw-w64-headers provide the headers pthread_time.h # and pthread_unistd.h by default and are dummy headers. @@ -22,7 +22,7 @@ Name: mingw-headers Version: 4.0 -Release: 0.2.%{pre}%{?dist} +Release: 0.3.%{pre}%{?dist} Summary: Win32/Win64 header files License: Public Domain and LGPLv2+ and ZPLv2.1 @@ -46,9 +46,6 @@ Source0: http://downloads.sourceforge.net/mingw-w64/mingw-w64-v%{version} # happening as the .idl files shouldn't be used by default Patch0: mingw-headers-no-widl.patch -# Fix localtime_s and asctime_s compatibility issue -Patch1: 0001-Use-a-Guard-defined-by-the-spec-and-not-_POSIX.-This.patch - BuildArch: noarch BuildRequires: mingw32-filesystem >= 95 @@ -95,7 +92,6 @@ unzip %{S:0} %endif %patch0 -p0 -b .idl -%patch1 -p1 -b .posix_time %build @@ -130,6 +126,9 @@ rm -f $RPM_BUILD_ROOT%{mingw64_includedir}/pthread_unistd.h %changelog +* Sat Mar 7 2015 Erik van Pienbroek - 4.0-0.3.rc3 +- Update to 4.0rc3 + * Wed Jan 28 2015 Erik van Pienbroek - 4.0-0.2.rc1 - Fix localtime_s and asctime_s compatibility issue diff --git a/sources b/sources index 892e169..d88edfe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -67d489701040c624c0d5d6a10248df0d mingw-w64-v4.0-rc1.tar.bz2 +76eac541947e33614c6014905bce5de5 mingw-w64-v4.0-rc3.tar.bz2