Attempt to fix XQilla build (NOT WORKING).

diff --git a/xqilla/mingw32-xqilla.spec b/xqilla/mingw32-xqilla.spec
index 1b4f8f6..fb0f506 100644 (file)
--- a/xqilla/mingw32-xqilla.spec
+++ b/xqilla/mingw32-xqilla.spec
@@ -6,7 +6,7 @@
 
 Name:           mingw32-xqilla
 Version:        2.2.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        XQilla is an XQuery and XPath 2.0 library, built on top of Xerces-C
 
 License:        ASL 2.0
@@ -27,6 +27,9 @@ Patch1001:      xqilla-xmark-test-win32.patch
 # implib.  The patch disables those sample programs.
 Patch1002:      xqilla-no-xqc-tests.patch
 
+# XQLexer uses EOF symbol from stdio.
+Patch1003:      xqilla-lexer-cstdio.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -57,6 +60,7 @@ popd
 
 %patch1001 -p1
 %patch1002 -p1
+%patch1003 -p1
 
 
 %build
@@ -127,7 +131,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Feb 20 2009 Richard W.M. Jones <rjones@redhat.com> - 2.2.0-2
+* Sat Feb 21 2009 Richard W.M. Jones <rjones@redhat.com> - 2.2.0-3
 - Rebuild for mingw32-gcc 4.4
 
 * Wed Feb 18 2009 Richard W.M. Jones <rjones@redhat.com> - 2.2.0-1

diff --git a/xqilla/xqilla-lexer-cstdio.patch b/xqilla/xqilla-lexer-cstdio.patch
new file mode 100644 (file)
index 0000000..1766ac5
--- /dev/null
+++ b/xqilla/xqilla-lexer-cstdio.patch
@@ -0,0 +1,20 @@
+diff -ur XQilla-2.2.0/src/lexer/XQLexer.cpp XQilla-2.2.0.mingw/src/lexer/XQLexer.cpp
+--- XQilla-2.2.0/src/lexer/XQLexer.cpp 2008-08-18 01:43:07.000000000 +0100
++++ XQilla-2.2.0.mingw/src/lexer/XQLexer.cpp   2009-02-21 09:51:41.000000000 +0000
+@@ -1,3 +1,5 @@
++#include <cstdio>
++
+ #define yyFlexLexer xqFlexLexer
+ 
+ #line 4 "../src/lexer/XQLexer.cpp"
+diff -ur XQilla-2.2.0/src/lexer/XQLexer.l XQilla-2.2.0.mingw/src/lexer/XQLexer.l
+--- XQilla-2.2.0/src/lexer/XQLexer.l   2008-08-18 01:42:59.000000000 +0100
++++ XQilla-2.2.0.mingw/src/lexer/XQLexer.l     2009-02-21 09:51:56.000000000 +0000
+@@ -21,6 +21,7 @@
+ 
+ %{
+ 
++#include <cstdio>
+ #include <sstream>
+ #include <xqilla/utils/UTF8Str.hpp>
+ #include "XQLexer.hpp"