Fix required for older W32API in Fedora 10.

diff --git a/qt-win/mingw32-qt-4.4.3-subauth.patch b/qt-win/mingw32-qt-4.4.3-subauth.patch
new file mode 100644 (file)
index 0000000..7871d51
--- /dev/null
+++ b/qt-win/mingw32-qt-4.4.3-subauth.patch
@@ -0,0 +1,11 @@
+diff -ur qt-win-opensource-src-4.4.3.orig/src/corelib/io/qfsfileengine_win.cpp qt-win-opensource-src-4.4.3/src/corelib/io/qfsfileengine_win.cpp
+--- qt-win-opensource-src-4.4.3.orig/src/corelib/io/qfsfileengine_win.cpp      2008-09-27 10:00:55.000000000 +0100
++++ qt-win-opensource-src-4.4.3/src/corelib/io/qfsfileengine_win.cpp   2009-02-06 16:39:50.000000000 +0000
+@@ -65,6 +65,7 @@
+ #include <ctype.h>\r
+ #include <limits.h>\r
+ #define SECURITY_WIN32\r
++#include <subauth.h>\r
+ #include <security.h>\r
+ \r
+ #ifndef _INTPTR_T_DEFINED\r

diff --git a/qt-win/mingw32-qt-win.spec b/qt-win/mingw32-qt-win.spec
index f683582..2d37cd6 100644 (file)
--- a/qt-win/mingw32-qt-win.spec
+++ b/qt-win/mingw32-qt-win.spec
@@ -17,7 +17,7 @@
 
 Name:           mingw32-qt-win
 Version:        4.4.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Qt for Windows
 
 License:        GPLv2+
@@ -51,6 +51,9 @@ Patch10:        mingw32-qt-4.4.3-atomic-volatile.patch
 Patch11:        mingw32-qt-4.4.3-no-fpu-functions.patch
 Patch12:        mingw32-qt-4.4.3-wininput.patch
 
+# http://lists-archives.org/mingw-users/11845-problem-compile-qt-4-4-2-with-latest-w32api.html
+Patch20:        mingw32-qt-4.4.3-subauth.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -87,6 +90,8 @@ Fedora Windows cross-compiler.
 %patch11 -p1
 %patch12 -p1
 
+%patch20 -p1
+
 for f in changes-%{version} LICENSE.GPL2 LICENSE.GPL3 GPL_EXCEPTION_ADDENDUM.TXT GPL_EXCEPTION.TXT OPENSOURCE-NOTICE.TXT README; do
   dos2unix --keepdate $f
 done
@@ -179,5 +184,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Feb  6 2009 Richard W.M. Jones <rjones@redhat.com> - 4.4.3-3
+- Fix required for older W32API in Fedora 10.
+
 * Sun Feb  1 2009 Richard W.M. Jones <rjones@redhat.com> - 4.4.3-2
 - Initial RPM release.