From: Richard W.M. Jones <rjones@redhat.com> <"Richard W.M. Jones <rjones@redhat.com>">
Date: Thu, 16 Oct 2008 17:01:08 +0000 (+0100)
Subject: mingw32-runtime to version 3.15.1, requires a small patch.
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=63ab96d4dbd3adb8ae288d3d1f8413c0e4d3cec1;p=fedora-mingw.git

mingw32-runtime to version 3.15.1, requires a small patch.
---

diff --git a/.hgignore b/.hgignore
index df8d2a3..55f494b 100644
--- a/.hgignore
+++ b/.hgignore
@@ -50,6 +50,7 @@ python/Python-2.5.2.tar.bz2
 readline/readline-5.2.tar.gz
 runtime-bootstrap/mingw-runtime-3.14.tar.gz
 runtime/mingw-runtime-3.14-src.tar.gz
+runtime/mingwrt-3.15.1-mingw32-src.tar.gz
 sqlite/sqlite-3.5.9.tar.gz
 termcap/termcap-1.3.1.tar.gz
 w32api-bootstrap/w32api-3.11.tar.gz
diff --git a/runtime/mingw32-runtime-3.15.1-useconds_t.patch b/runtime/mingw32-runtime-3.15.1-useconds_t.patch
new file mode 100644
index 0000000..1d46f03
--- /dev/null
+++ b/runtime/mingw32-runtime-3.15.1-useconds_t.patch
@@ -0,0 +1,14 @@
+--- mingwrt-3.15.1-mingw32/mingwex/usleep.c	2008-05-04 13:15:41.000000000 +0100
++++ mingwrt-3.15.1-mingw32.usleep/mingwex/usleep.c	2008-10-16 17:58:36.000000000 +0100
+@@ -26,6 +26,11 @@
+ #define WIN32_LEAN_AND_MEAN
+ #include <windows.h>
+ 
++/* RWMJ: This is defined in our local sys/types.h but for some reason
++ * isn't picked up.
++ */
++typedef unsigned int useconds_t;
++
+ int __cdecl usleep(useconds_t useconds)
+ {
+     if(useconds == 0)
diff --git a/runtime/mingw32-runtime.spec b/runtime/mingw32-runtime.spec
index fa54df1..6d397eb 100644
--- a/runtime/mingw32-runtime.spec
+++ b/runtime/mingw32-runtime.spec
@@ -5,16 +5,18 @@
 %define __find_provides %{_mingw32_findprovides}
 
 Name:           mingw32-runtime
-Version:        3.14
-Release:        6%{?dist}
+Version:        3.15.1
+Release:        1%{?dist}
 Summary:        MinGW Windows cross-compiler runtime and root filesystem
 
 License:        Public Domain
 Group:          Development/Libraries
 URL:            http://www.mingw.org/
-Source0:        http://dl.sourceforge.net/sourceforge/mingw/mingw-runtime-%{version}-src.tar.gz
+Source0:        http://dl.sourceforge.net/sourceforge/mingw/mingwrt-%{version}-mingw32-src.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:         mingw32-runtime-3.15.1-useconds_t.patch
+
 BuildArch:	noarch
 
 BuildRequires:  mingw32-filesystem >= 26
@@ -39,7 +41,8 @@ MinGW Windows cross-compiler runtime, base libraries.
 
 
 %prep
-%setup -q -n mingw-runtime-%{version}
+%setup -q -n mingwrt-%{version}-mingw32
+%patch0 -p1
 
 
 %build