OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Peter Smej
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 30-Jan-2003 17:02:53
Branch: HEAD Handle: 2003013016025300
Added files:
openpkg-src/expat expat.patch
Modified files:
openpkg-src/expat expat.spec
Log:
Appended a patch for expat.h to get sablotron running
Summary:
Revision Changes Path
1.1 +70 -0 openpkg-src/expat/expat.patch
1.15 +3 -1 openpkg-src/expat/expat.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/expat/expat.patch
============================================================================
$ cvs diff -u -r0 -r1.1 expat.patch
--- /dev/null 2003-01-30 17:02:53.000000000 +0100
+++ expat.patch 2003-01-30 17:02:53.000000000 +0100
@@ -0,0 +1,70 @@
+--- lib/expat.h.orig Thu Jan 30 16:48:34 2003
++++ lib/expat.h Thu Jan 30 16:51:09 2003
+@@ -647,6 +647,34 @@
+ /* Returns the last value set by XML_SetUserData or NULL. */
+ #define XML_GetUserData(parser) (*(void **)(parser))
+
++
++/* Parses some input. Returns XML_STATUS_ERROR if a fatal error is
++ detected. The last call to XML_Parse must have isFinal true; len
++ may be zero for this call (or any other).
++
++ The XML_Status enum gives the possible return values for the
++ XML_Parse and XML_ParseBuffer functions. Though the return values
++ for these functions has always been described as a Boolean value,
++ the implementation, at least for the 1.95.x series, has always
++ returned exactly one of these values. The preprocessor #defines
++ are included so this stanza can be added to code that still needs
++ to support older versions of Expat 1.95.x:
++
++ #ifndef XML_STATUS_OK
++ #define XML_STATUS_OK 1
++ #define XML_STATUS_ERROR 0
++ #endif
++
++ Otherwise, the #define hackery is quite ugly and would have been dropped.
++*/
++enum XML_Status {
++ XML_STATUS_ERROR = 0,
++#define XML_STATUS_ERROR XML_STATUS_ERROR
++ XML_STATUS_OK = 1
++#define XML_STATUS_OK XML_STATUS_OK
++};
++
++
+ /* This is equivalent to supplying an encoding argument to
+ XML_ParserCreate. On success XML_SetEncoding returns non-zero,
+ zero otherwise.
+@@ -712,32 +740,6 @@
+ */
+ XMLPARSEAPI(int)
+ XML_GetIdAttributeIndex(XML_Parser parser);
+-
+-/* Parses some input. Returns XML_STATUS_ERROR if a fatal error is
+- detected. The last call to XML_Parse must have isFinal true; len
+- may be zero for this call (or any other).
+-
+- The XML_Status enum gives the possible return values for the
+- XML_Parse and XML_ParseBuffer functions. Though the return values
+- for these functions has always been described as a Boolean value,
+- the implementation, at least for the 1.95.x series, has always
+- returned exactly one of these values. The preprocessor #defines
+- are included so this stanza can be added to code that still needs
+- to support older versions of Expat 1.95.x:
+-
+- #ifndef XML_STATUS_OK
+- #define XML_STATUS_OK 1
+- #define XML_STATUS_ERROR 0
+- #endif
+-
+- Otherwise, the #define hackery is quite ugly and would have been dropped.
+-*/
+-enum XML_Status {
+- XML_STATUS_ERROR = 0,
+-#define XML_STATUS_ERROR XML_STATUS_ERROR
+- XML_STATUS_OK = 1
+-#define XML_STATUS_OK XML_STATUS_OK
+-};
+
+ XMLPARSEAPI(enum XML_Status)
+ XML_Parse(XML_Parser parser, const char *s, int len, int isFinal);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/expat/expat.spec
============================================================================
$ cvs diff -u -r1.14 -r1.15 expat.spec
--- openpkg-src/expat/expat.spec 26 Jan 2003 08:10:44 -0000 1.14
+++ openpkg-src/expat/expat.spec 30 Jan 2003 16:02:53 -0000 1.15
@@ -33,10 +33,11 @@
Group: Converter
License: MIT/X11-style
Version: 1.95.6
-Release: 20030126
+Release: 20030130
# list of sources
Source0: http://download.sourceforge.net/expat/expat-%{version}.tar.gz
+Patch0: expat.patch
# build information
Prefix: %{l_prefix}
@@ -52,6 +53,7 @@
%prep
%setup -q
+ %patch -p0
%build
CC="%{l_cc}" \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
