diff options
Diffstat (limited to 'libs/files')
| -rw-r--r-- | libs/files/domc-0.7.0.tar.gz | bin | 118510 -> 0 bytes | |||
| -rw-r--r-- | libs/files/domc-0.7.1.tar.gz | bin | 0 -> 120156 bytes | |||
| -rw-r--r-- | libs/files/domc-library.patch | 631 | ||||
| -rw-r--r-- | libs/files/libmba-0.7.0.tar.gz | bin | 166909 -> 0 bytes | |||
| -rw-r--r-- | libs/files/libmba-0.8.10.tar.gz | bin | 0 -> 259427 bytes | |||
| -rw-r--r-- | libs/files/libmba-library.patch | 78 |
6 files changed, 175 insertions, 534 deletions
diff --git a/libs/files/domc-0.7.0.tar.gz b/libs/files/domc-0.7.0.tar.gz Binary files differdeleted file mode 100644 index 1886fde..0000000 --- a/libs/files/domc-0.7.0.tar.gz +++ /dev/null diff --git a/libs/files/domc-0.7.1.tar.gz b/libs/files/domc-0.7.1.tar.gz Binary files differnew file mode 100644 index 0000000..94ffa6e --- /dev/null +++ b/libs/files/domc-0.7.1.tar.gz diff --git a/libs/files/domc-library.patch b/libs/files/domc-library.patch index 02a076e..f9133a5 100644 --- a/libs/files/domc-library.patch +++ b/libs/files/domc-library.patch @@ -1,480 +1,151 @@ -diff -r -C2 domc-0.7.0/Makefile domc/Makefile -*** domc-0.7.0/Makefile 2003-03-22 17:08:50.000000000 -0700 ---- domc/Makefile 2004-07-29 17:05:29.000000000 -0600 -*************** -*** 1,6 **** -! prefix = /usr/local -! includedir = $(prefix)/include -! libdir = $(prefix)/lib -! mandir = $(prefix)/man - CC = gcc - LIBNAME = domc ---- 1,7 ---- -! _EXTRA = -I../libmba/src/ -L../libmba/ -! prefix = ./ -! includedir = $(prefix) -! libdir = $(prefix) -! mandir = $(prefix) - CC = gcc - LIBNAME = domc -*************** -*** 12,16 **** - DISTRO = $(LIBNAME)-$(MINVERSION) - RPM_OPT_FLAGS = -O2 -! CFLAGS = -Wall -W -DMSGNO $(RPM_OPT_FLAGS) -I$(includedir) -L$(libdir) - #CFLAGS = -Wall -W -DMSGNO -I$(includedir) -L$(libdir) $(RPM_OPT_FLAGS) -ansi -pedantic -Wbad-function-cast -Wcast-align -Wcast-qual -Wchar-subscripts -Winline -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wredundant-decls -Wshadow -Wstrict-prototypes -Wwrite-strings -Wtraditional -Wconversion -Waggregate-return -Wno-parentheses - OBJS = src/expatls.o src/events.o src/node.o src/nodelist.o src/namednodemap.o src/dom.o src/timestamp.o src/wcwidth.o ---- 13,17 ---- - DISTRO = $(LIBNAME)-$(MINVERSION) - RPM_OPT_FLAGS = -O2 -! CFLAGS = -Wall -W -DMSGNO $(RPM_OPT_FLAGS) $(_EXTRA) -I$(includedir) -L$(libdir) - #CFLAGS = -Wall -W -DMSGNO -I$(includedir) -L$(libdir) $(RPM_OPT_FLAGS) -ansi -pedantic -Wbad-function-cast -Wcast-align -Wcast-qual -Wchar-subscripts -Winline -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wredundant-decls -Wshadow -Wstrict-prototypes -Wwrite-strings -Wtraditional -Wconversion -Waggregate-return -Wno-parentheses - OBJS = src/expatls.o src/events.o src/node.o src/nodelist.o src/namednodemap.o src/dom.o src/timestamp.o src/wcwidth.o -*************** -*** 20,24 **** - - $(SONAME): $(OBJS) -! $(CC) -shared $(OBJS) -L$(libdir) -lmba -lexpat -Wl,-h,$(SOVERSION) -o $(SONAME) - - .c.a: ---- 21,25 ---- - - $(SONAME): $(OBJS) -! $(CC) -shared $(OBJS) $(_EXTRA) -L$(libdir) -lmba -Wl,-h,$(SOVERSION) -o $(SONAME) - - .c.a: -*************** -*** 48,51 **** - clean: - rm -f $(OBJS) $(ARNAME) $(SONAME) $(includedir)/domc.h $(libdir)/$(ARNAME) $(libdir)/$(SONAME) $(libdir)/$(SOVERSION) $(libdir)/lib$(LIBNAME).so $(DISTRO).zip -! cd $(mandir)/man3 && rm -f $(MAN) - ---- 49,52 ---- - clean: - rm -f $(OBJS) $(ARNAME) $(SONAME) $(includedir)/domc.h $(libdir)/$(ARNAME) $(libdir)/$(SONAME) $(libdir)/$(SOVERSION) $(libdir)/lib$(LIBNAME).so $(DISTRO).zip -! # cd $(mandir)/man3 && rm -f $(MAN) - -diff -r -C2 domc-0.7.0/Makefile.msvc domc/Makefile.msvc -*** domc-0.7.0/Makefile.msvc 2003-03-22 16:44:29.000000000 -0700 ---- domc/Makefile.msvc 2004-07-29 19:55:06.000000000 -0600 -*************** -*** 1,15 **** - !include <win32.mak> -! LIBMBA=..\libmba-0.5.0 -! EXPAT=..\Expat-1.95.5 - # For i18n support in domc the encdec library is required. - # Specify were the encdec library is below, change HAVE_ENCDEC to 1 - # in src\defines.h and add /LIBPATH:$(ENCDEC) encdec.lib to the - # .dll link command. -! ENCDEC=..\encdec-0.3.7 - OBJS=src\expatls.obj src\events.obj src\timestamp.obj src\dom.obj src\node.obj src\namednodemap.obj src\nodelist.obj src\wcwidth.obj - - -! domc.dll: $(OBJS) -! $(link) /INCREMENTAL:NO /NOLOGO /LIBPATH:$(EXPAT)\Libs /LIBPATH:$(LIBMBA) /LIBPATH:$(ENCDEC) libexpat.lib libmba.lib encdec.lib /DEF:domc.def /OUT:domc.dll -entry:_DllMainCRTStartup@12 -dll $(OBJS) - - domc.lib: $(OBJS) ---- 1,19 ---- - !include <win32.mak> -! LIBMBA=..\libmba -! # EXPAT=..\Expat-1.95.5 - # For i18n support in domc the encdec library is required. - # Specify were the encdec library is below, change HAVE_ENCDEC to 1 - # in src\defines.h and add /LIBPATH:$(ENCDEC) encdec.lib to the - # .dll link command. -! # ENCDEC=..\encdec-0.3.7 - OBJS=src\expatls.obj src\events.obj src\timestamp.obj src\dom.obj src\node.obj src\namednodemap.obj src\nodelist.obj src\wcwidth.obj - -+ # Debug flags -+ cflags=$(cflags) /MLd /GZ /Gm /ZI /Od /D_DEBUG - -! all: domc.lib -! -! # domc.dll: $(OBJS) -! # $(link) $(lflags) /INCREMENTAL:NO /NOLOGO /LIBPATH:$(LIBMBA) libmba.lib /DEF:domc.def /OUT:domc.dll -entry:_DllMainCRTStartup@12 -dll $(OBJS) - - domc.lib: $(OBJS) -*************** -*** 17,21 **** - - .c.obj: -! $(cc) $(cflags) /I$(EXPAT)\Source\lib /I$(ENCDEC)\src /I$(LIBMBA)\src /Fo$@ $*.c - - clean: ---- 21,25 ---- - - .c.obj: -! $(cc) $(cflags) /I$(LIBMBA)\src /Fo$@ $*.c - - clean: -diff -r -C2 domc-0.7.0/src/defines.h domc/src/defines.h -*** domc-0.7.0/src/defines.h 2003-03-22 16:35:36.000000000 -0700 ---- domc/src/defines.h 2004-07-29 17:05:29.000000000 -0600 -*************** -*** 22,26 **** - #define HAVE_STRDUP 1 - #define HAVE_STRNLEN 0 -! #define HAVE_EXPAT 195 - #define HAVE_MBSTATE 0 - #define HAVE_WCWIDTH 0 ---- 22,26 ---- - #define HAVE_STRDUP 1 - #define HAVE_STRNLEN 0 -! #define HAVE_EXPAT 0 - #define HAVE_MBSTATE 0 - #define HAVE_WCWIDTH 0 -*************** -*** 36,40 **** - #define HAVE_STRDUP 1 - #define HAVE_STRNLEN 1 -! #define HAVE_EXPAT 195 - #define HAVE_MBSTATE 1 - #define HAVE_WCWIDTH 1 ---- 36,40 ---- - #define HAVE_STRDUP 1 - #define HAVE_STRNLEN 1 -! #define HAVE_EXPAT 0 - #define HAVE_MBSTATE 1 - #define HAVE_WCWIDTH 1 -diff -r -C2 domc-0.7.0/src/dom.c domc/src/dom.c -*** domc-0.7.0/src/dom.c 2003-03-21 01:50:28.000000000 -0700 ---- domc/src/dom.c 2004-07-29 19:38:46.000000000 -0600 -*************** -*** 183,188 **** - { - DOM_Document *doc; - -! namespaceURI = NULL; qualifiedName = NULL; - - msgno_add_codes(dom_codes); ---- 183,189 ---- - { - DOM_Document *doc; -+ DOM_Element *el; - -! namespaceURI = NULL; - - msgno_add_codes(dom_codes); -*************** -*** 197,200 **** ---- 198,210 ---- - } - -+ if (qualifiedName && *qualifiedName) { -+ if ((el = DOM_Document_createElement(doc, qualifiedName)) == NULL) { -+ AMSG(""); -+ DOM_Document_destroyNode(doc, doc); -+ return NULL; -+ } -+ DOM_Node_appendChild(doc, el); -+ } -+ - return doc; - } -*************** -*** 281,293 **** - - attr = DOM_NamedNodeMap_removeNamedItem(element->attributes, name); - -! DOM_MutationEvent_initMutationEvent(&evt, "DOMAttrModified", 1, 0, -! attr, attr->nodeValue, NULL, attr->nodeName, DOM_MUTATION_EVENT_REMOVAL); -! DOM_EventTarget_dispatchEvent(element, &evt); - -! updateCommonParent(element->parentNode); - -! if (attr) { -! DOM_Document_destroyNode(attr->ownerDocument, attr); - } - } ---- 291,307 ---- - - attr = DOM_NamedNodeMap_removeNamedItem(element->attributes, name); -+ -+ /* removeAttribute doesn't throw exceptions on NOT_FOUND_ERR */ -+ if (DOM_Exception == DOM_NOT_FOUND_ERR) -+ DOM_Exception = 0; - -! if (attr) { -! DOM_MutationEvent_initMutationEvent(&evt, "DOMAttrModified", 1, 0, -! attr, attr->nodeValue, NULL, attr->nodeName, DOM_MUTATION_EVENT_REMOVAL); -! DOM_EventTarget_dispatchEvent(element, &evt); - -! updateCommonParent(element->parentNode); - -! DOM_Document_destroyNode(attr->ownerDocument, attr); - } - } -diff -r -C2 domc-0.7.0/src/domc.h domc/src/domc.h -*** domc-0.7.0/src/domc.h 2003-03-22 16:46:46.000000000 -0700 ---- domc/src/domc.h 2004-07-29 17:05:29.000000000 -0600 -*************** -*** 186,189 **** ---- 186,191 ---- - } ProcessingInstruction; - } u; -+ unsigned int rtfxRefCount; /* Reference counting added for RTFX */ -+ void* userData; /* User data added for RTFX */ - }; - -*************** -*** 213,216 **** ---- 215,220 ---- - unsigned short filter; - struct DOM_NodeList *list; /* Used for entities and notations */ -+ /* Reference counting added for RTFX */ -+ unsigned int rtfxRefCount; - }; - -*************** -*** 287,293 **** - */ - - int DOM_DocumentLS_load(DOM_DocumentLS *this, const char *uri); -- int DOM_DocumentLS_save(DOM_DocumentLS *this, const char *uri, const DOM_Node *node); - int DOM_DocumentLS_fread(DOM_DocumentLS *this, FILE *stream); - int DOM_DocumentLS_fwrite(const DOM_DocumentLS *this, FILE *stream); - ---- 291,299 ---- - */ - -+ #if HAVE_EXPAT > 0 - int DOM_DocumentLS_load(DOM_DocumentLS *this, const char *uri); - int DOM_DocumentLS_fread(DOM_DocumentLS *this, FILE *stream); -+ #endif /* HAVE_EXPAT */ -+ int DOM_DocumentLS_save(DOM_DocumentLS *this, const char *uri, const DOM_Node *node); - int DOM_DocumentLS_fwrite(const DOM_DocumentLS *this, FILE *stream); - -diff -r -C2 domc-0.7.0/src/expatls.c domc/src/expatls.c -*** domc-0.7.0/src/expatls.c 2003-03-21 02:20:24.000000000 -0700 ---- domc/src/expatls.c 2004-08-02 16:58:41.000000000 -0600 -*************** -*** 128,131 **** ---- 128,133 ---- - } - -+ #if HAVE_EXPAT > 0 -+ - static void - xmldecl_fn(void *userData, const XML_Char *version, const XML_Char *encoding, int standalone) -*************** -*** 708,711 **** ---- 710,753 ---- - } - -+ #endif /* HAVE_EXPAT */ -+ -+ static void -+ fputds_encoded(const DOM_String *s, FILE *stream) -+ { -+ size_t l; -+ -+ while (*s) { -+ l = strcspn(s, "<>&\"'"); -+ if (l > 0) { -+ fwrite((void*)s, 1, sizeof(DOM_String) * l, stream); -+ s += l; -+ } -+ switch (*s) { -+ case '\0': -+ break; -+ case '<': -+ fputs("<", stream); -+ break; -+ case '>': -+ fputs(">", stream); -+ break; -+ case '&': -+ fputs("'", stream); -+ break; -+ case '"': -+ fputs(""", stream); -+ break; -+ case '\'': -+ fputs("&squot;", stream); -+ break; -+ default: -+ AMSG(""); -+ break; -+ }; -+ if(*s) -+ ++s; -+ } -+ } -+ - int - DOM_DocumentLS_fwrite(const DOM_DocumentLS *node, FILE *stream) -*************** -*** 732,736 **** - fputds(e->node->nodeName, stream); - fputs("=\"", stream); -! fputds(e->node->nodeValue, stream); - fputc('"', stream); - } ---- 774,778 ---- - fputds(e->node->nodeName, stream); - fputs("=\"", stream); -! fputds_encoded(e->node->nodeValue, stream); - fputc('"', stream); - } -*************** -*** 753,757 **** - break; - case DOM_TEXT_NODE: -! fputds(node->nodeValue, stream); - break; - case DOM_CDATA_SECTION_NODE: ---- 795,799 ---- - break; - case DOM_TEXT_NODE: -! fputds_encoded(node->nodeValue, stream); - break; - case DOM_CDATA_SECTION_NODE: -*************** -*** 761,803 **** - case DOM_NOTATION_NODE: - fputs(" <!NOTATION ", stream); -! fputs(node->nodeName, stream); - if (node->u.Entity.publicId) { - fputs(" PUBLIC \"", stream); -! fputs(node->u.Entity.publicId, stream); - fputs("\" \"", stream); -! fputs(node->u.Entity.systemId, stream); - fputc('"', stream); - } else if (node->u.Entity.systemId) { - fputs(" SYSTEM \"", stream); -! fputs(node->u.Entity.systemId, stream); - fputc('"', stream); - } -! fputs(">"NL, stream); - break; - case DOM_ENTITY_NODE: - fputs(" <!ENTITY ", stream); -! fputs(node->nodeName, stream); - if (node->nodeValue) { - fputc('"', stream); -! fputs(node->nodeValue, stream); - fputc('"', stream); - } else { - if (node->u.Entity.publicId) { - fputs(" PUBLIC \"", stream); -! fputs(node->u.Entity.publicId, stream); - fputs("\" \"", stream); -! fputs(node->u.Entity.systemId, stream); - fputc('"', stream); - } else if (node->u.Entity.systemId) { - fputs(" SYSTEM \"", stream); -! fputs(node->u.Entity.systemId, stream); - fputc('"', stream); - } - if (node->u.Entity.notationName) { - fputs(" NDATA ", stream); -! fputs(node->u.Entity.notationName, stream); - } - } -! fputs(">"NL, stream); - break; - case DOM_PROCESSING_INSTRUCTION_NODE: ---- 803,845 ---- - case DOM_NOTATION_NODE: - fputs(" <!NOTATION ", stream); -! fputds(node->nodeName, stream); - if (node->u.Entity.publicId) { - fputs(" PUBLIC \"", stream); -! fputds(node->u.Entity.publicId, stream); - fputs("\" \"", stream); -! fputds(node->u.Entity.systemId, stream); - fputc('"', stream); - } else if (node->u.Entity.systemId) { - fputs(" SYSTEM \"", stream); -! fputds(node->u.Entity.systemId, stream); - fputc('"', stream); - } -! fputs(">", stream); - break; - case DOM_ENTITY_NODE: - fputs(" <!ENTITY ", stream); -! fputds(node->nodeName, stream); - if (node->nodeValue) { - fputc('"', stream); -! fputds(node->nodeValue, stream); - fputc('"', stream); - } else { - if (node->u.Entity.publicId) { - fputs(" PUBLIC \"", stream); -! fputds(node->u.Entity.publicId, stream); - fputs("\" \"", stream); -! fputds(node->u.Entity.systemId, stream); - fputc('"', stream); - } else if (node->u.Entity.systemId) { - fputs(" SYSTEM \"", stream); -! fputds(node->u.Entity.systemId, stream); - fputc('"', stream); - } - if (node->u.Entity.notationName) { - fputs(" NDATA ", stream); -! fputds(node->u.Entity.notationName, stream); - } - } -! fputs(">", stream); - break; - case DOM_PROCESSING_INSTRUCTION_NODE: -*************** -*** 805,823 **** - fputds(node->u.ProcessingInstruction.target, stream); - fputc(' ', stream); -! fputds(node->u.ProcessingInstruction.data, stream); - fputs("?>", stream); - break; - case DOM_COMMENT_NODE: - fputs("<!--", stream); -! fputds(node->nodeValue, stream); - fputs("-->", stream); - break; - case DOM_DOCUMENT_NODE: - fputs("<?xml", stream); -! if (node->u.Document.version) { -! fputs(" version=\"", stream); -! fputs(node->u.Document.version, stream); -! fputc('\"', stream); -! } - #ifdef CODESET - fputs(" encoding=\"", stream); ---- 847,863 ---- - fputds(node->u.ProcessingInstruction.target, stream); - fputc(' ', stream); -! fputds_encoded(node->u.ProcessingInstruction.data, stream); - fputs("?>", stream); - break; - case DOM_COMMENT_NODE: - fputs("<!--", stream); -! fputds_encoded(node->nodeValue, stream); - fputs("-->", stream); - break; - case DOM_DOCUMENT_NODE: - fputs("<?xml", stream); -! fputs(" version=\"", stream); -! fputds(node->u.Document.version ? node->u.Document.version : "1.0", stream); -! fputc('\"', stream); - #ifdef CODESET - fputs(" encoding=\"", stream); -*************** -*** 825,834 **** - fputc('\"', stream); - #endif -! if (node->u.Document.standalone == 0) { -! printf(" standalone=\"no\""); -! } else if (node->u.Document.standalone == 1) { -! printf(" standalone=\"yes\""); - } -! fputs("?>"NL NL, stream); - for (c = node->firstChild; c != NULL; c = c->nextSibling) { - if (DOM_DocumentLS_fwrite(c, stream) == -1) { ---- 865,872 ---- - fputc('\"', stream); - #endif -! if (node->u.Document.standalone != 0) { -! fputs(" standalone=\"yes\"", stream); - } -! fputs("?>"NL, stream); - for (c = node->firstChild; c != NULL; c = c->nextSibling) { - if (DOM_DocumentLS_fwrite(c, stream) == -1) { +diff -r -U3 domc-0.7.1/Makefile domc/Makefile +--- domc-0.7.1/Makefile 2004-08-05 22:32:24.000000000 -0600 ++++ domc/Makefile 2004-08-31 17:05:22.326058272 -0600 +@@ -1,7 +1,8 @@ +-prefix = /usr/local +-includedir = $(prefix)/include +-libdir = $(prefix)/lib +-mandir = $(prefix)/man ++_EXTRA = -I../libmba/src/ -L../libmba/ ++prefix = ./ ++includedir = $(prefix) ++libdir = $(prefix) ++mandir = $(prefix) + CC = gcc + LIBNAME = domc + MAJVERSION = 0.7 +@@ -11,7 +12,7 @@ + SOVERSION = lib$(LIBNAME).so.$(MAJVERSION) + DISTRO = $(LIBNAME)-$(MINVERSION) + RPM_OPT_FLAGS = -O2 +-CFLAGS = -Wall -W -DMSGNO $(RPM_OPT_FLAGS) -I$(includedir) -L$(libdir) ++CFLAGS = -Wall -W -DMSGNO $(RPM_OPT_FLAGS) $(_EXTRA) -I$(includedir) -L$(libdir) + #CFLAGS = -Wall -W -DMSGNO -I$(includedir) -L$(libdir) $(RPM_OPT_FLAGS) -ansi -pedantic -Wbad-function-cast -Wcast-align -Wcast-qual -Wchar-subscripts -Winline -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wredundant-decls -Wshadow -Wstrict-prototypes -Wwrite-strings -Wtraditional -Wconversion -Waggregate-return -Wno-parentheses + OBJS = src/expatls.o src/events.o src/node.o src/nodelist.o src/namednodemap.o src/dom.o src/timestamp.o src/wcwidth.o src/mbs.o + MAN = DOM_CharacterData.3m.gz DOM_Document.3m.gz DOM_Element.3m.gz DOM_Implementation.3m.gz DOM_NamedNodeMap.3m.gz DOM_Node.3m.gz DOM_NodeList.3m.gz DOM_Text.3m.gz +@@ -19,7 +20,7 @@ + all: $(ARNAME)($(OBJS)) $(SONAME) src/defines.h + + $(SONAME): $(OBJS) +- $(CC) -shared $(OBJS) -L$(libdir) -lmba -lexpat -Wl,-h,$(SOVERSION) -o $(SONAME) ++ $(CC) -shared $(OBJS) $(_EXTRA) -L$(libdir) -lmba -Wl,-h,$(SOVERSION) -o $(SONAME) + + .c.a: + $(CC) $(CFLAGS) -c -o $*.o $< +@@ -47,5 +48,5 @@ + + clean: + rm -f $(OBJS) $(ARNAME) $(SONAME) $(includedir)/domc.h $(libdir)/$(ARNAME) $(libdir)/$(SONAME) $(libdir)/$(SOVERSION) $(libdir)/lib$(LIBNAME).so $(DISTRO).zip +- cd $(mandir)/man3 && rm -f $(MAN) ++ # cd $(mandir)/man3 && rm -f $(MAN) + +diff -r -U3 domc-0.7.1/Makefile.msvc domc/Makefile.msvc +--- domc-0.7.1/Makefile.msvc 2004-08-04 17:20:02.000000000 -0600 ++++ domc/Makefile.msvc 2004-08-31 17:07:15.622292073 -0600 +@@ -1,22 +1,26 @@ + !include <win32.mak> +-LIBMBA=..\libmba-0.8.9 +-EXPAT=..\Expat-1.95.5 ++LIBMBA=..\libmba ++# EXPAT=..\Expat-1.95.5 + # For i18n support in domc the encdec library is required. + # Specify were the encdec library is below, change HAVE_ENCDEC to 1 + # in src\defines.h and add /LIBPATH:$(ENCDEC) encdec.lib to the + # .dll link command. +-ENCDEC=..\encdec-0.3.7 ++# ENCDEC=..\encdec-0.3.7 + OBJS=src\expatls.obj src\events.obj src\timestamp.obj src\dom.obj src\node.obj src\namednodemap.obj src\nodelist.obj src\wcwidth.obj + ++# Debug flags ++cflags=$(cflags) /MLd /GZ /Gm /ZI /Od /D_DEBUG + +-domc.dll: $(OBJS) +- $(link) /INCREMENTAL:NO /NOLOGO /LIBPATH:$(EXPAT)\Libs /LIBPATH:$(LIBMBA) /LIBPATH:$(ENCDEC) libexpat.lib libmba.lib encdec.lib /DEF:domc.def /OUT:domc.dll -entry:_DllMainCRTStartup@12 -dll $(OBJS) ++all: domc.lib ++ ++# domc.dll: $(OBJS) ++# $(link) /INCREMENTAL:NO /NOLOGO /LIBPATH:$(EXPAT)\Libs /LIBPATH:$(LIBMBA) /LIBPATH:$(ENCDEC) libexpat.lib libmba.lib encdec.lib /DEF:domc.def /OUT:domc.dll -entry:_DllMainCRTStartup@12 -dll $(OBJS) + + domc.lib: $(OBJS) + $(implib) -machine:$(CPU) -out:domc.lib $(OBJS) + + .c.obj: +- $(cc) $(cflags) /I$(EXPAT)\Source\lib /I$(ENCDEC)\src /I$(LIBMBA)\src /Fo$@ $*.c ++ $(cc) $(cflags) /I$(LIBMBA)\src /Fo$@ $*.c + + clean: + del domc.dll domc.lib domc.exp $(OBJS) +diff -r -U3 domc-0.7.1/src/defines.h domc/src/defines.h +--- domc-0.7.1/src/defines.h 2003-03-22 16:35:36.000000000 -0700 ++++ domc/src/defines.h 2004-08-31 17:07:36.699545018 -0600 +@@ -7,7 +7,7 @@ + #define HAVE_ENCDEC 0 + #define HAVE_STRDUP 1 + #define HAVE_STRNLEN 0 +-#define HAVE_EXPAT 195 ++#define HAVE_EXPAT 0 + #define HAVE_MBSTATE 0 + #define HAVE_WCWIDTH 1 + #define HAVE_SNPRINTF 1 +@@ -21,7 +21,7 @@ + #define HAVE_ENCDEC 0 + #define HAVE_STRDUP 1 + #define HAVE_STRNLEN 0 +-#define HAVE_EXPAT 195 ++#define HAVE_EXPAT 0 + #define HAVE_MBSTATE 0 + #define HAVE_WCWIDTH 0 + #define HAVE_SNPRINTF 0 +@@ -35,7 +35,7 @@ + #define HAVE_ENCDEC 0 + #define HAVE_STRDUP 1 + #define HAVE_STRNLEN 1 +-#define HAVE_EXPAT 195 ++#define HAVE_EXPAT 0 + #define HAVE_MBSTATE 1 + #define HAVE_WCWIDTH 1 + #define HAVE_SNPRINTF 1 +diff -r -U3 domc-0.7.1/src/domc.h domc/src/domc.h +--- domc-0.7.1/src/domc.h 2004-08-04 17:32:30.000000000 -0600 ++++ domc/src/domc.h 2004-08-31 17:11:39.228935518 -0600 +@@ -185,6 +185,8 @@ + DOM_String *data; + } ProcessingInstruction; + } u; ++ unsigned int rtfxRefCount; /* Reference counting added for RTFX */ ++ void* userData; /* User data added for RTFX */ + }; + + DOM_Node *DOM_Node_insertBefore(DOM_Node *node, DOM_Node *newChild, DOM_Node *refChild); +@@ -212,6 +214,7 @@ + NodeEntry *last; + unsigned short filter; + struct DOM_NodeList *list; /* Used for entities and notations */ ++ unsigned int rtfxRefCount; /* Reference counting added for RTFX */ + }; + + DOM_Node *DOM_NodeList_item(const DOM_NodeList *nl, int index); +@@ -286,8 +289,10 @@ + * described in the latest W3C drafts at all. + */ + ++#if HAVE_EXPAT > 0 + int DOM_DocumentLS_load(DOM_DocumentLS *this, const char *uri); + int DOM_DocumentLS_fread(DOM_DocumentLS *this, FILE *stream); ++#endif + int DOM_DocumentLS_save(DOM_DocumentLS *this, const char *uri, const DOM_Node *node); + int DOM_DocumentLS_fwrite(const DOM_DocumentLS *this, FILE *stream); + +diff -r -U3 domc-0.7.1/src/expatls.c domc/src/expatls.c +--- domc-0.7.1/src/expatls.c 2004-08-04 17:28:49.000000000 -0600 ++++ domc/src/expatls.c 2004-08-31 17:12:25.887854337 -0600 +@@ -731,9 +731,6 @@ + case '"': + fputs(""", stream); + break; +- case '\'': +- fputs("&squot;", stream); +- break; + default: + AMSG(""); + break; diff --git a/libs/files/libmba-0.7.0.tar.gz b/libs/files/libmba-0.7.0.tar.gz Binary files differdeleted file mode 100644 index fe2f752..0000000 --- a/libs/files/libmba-0.7.0.tar.gz +++ /dev/null diff --git a/libs/files/libmba-0.8.10.tar.gz b/libs/files/libmba-0.8.10.tar.gz Binary files differnew file mode 100644 index 0000000..3475caf --- /dev/null +++ b/libs/files/libmba-0.8.10.tar.gz diff --git a/libs/files/libmba-library.patch b/libs/files/libmba-library.patch index 207dde7..3873843 100644 --- a/libs/files/libmba-library.patch +++ b/libs/files/libmba-library.patch @@ -1,54 +1,24 @@ -diff -r -C3 libmba-0.7.0/Makefile libmba/Makefile -*** libmba-0.7.0/Makefile 2003-10-15 02:56:32.000000000 -0600 ---- libmba/Makefile 2004-07-29 12:47:27.532270825 -0600 -*************** -*** 1,7 **** -! prefix = /usr/local -! includedir = $(prefix)/include -! libdir = $(prefix)/lib -! mandir = $(prefix)/man - CC = gcc - LIBNAME = mba - MAJVERSION = 0.7 ---- 1,7 ---- -! prefix = ./ -! includedir = $(prefix) -! libdir = $(prefix) -! mandir = $(prefix) - CC = gcc - LIBNAME = mba - MAJVERSION = 0.7 -*************** -*** 23,29 **** - all: $(ARNAME)($(OBJS)) $(SONAME) - - $(SONAME): $(ARNAME)($(OBJS)) $(OBJS) -! $(CC) -shared $(OBJS) -L$(libdir) -lc -lexpat -lutil -Wl,-h,$(SOVERSION) -o $(SONAME) - - .c.a: - $(CC) $(CFLAGS) -c $< -o $*.o ---- 23,29 ---- - all: $(ARNAME)($(OBJS)) $(SONAME) - - $(SONAME): $(ARNAME)($(OBJS)) $(OBJS) -! $(CC) -shared $(OBJS) -L$(libdir) -lc -lutil -Wl,-h,$(SOVERSION) -o $(SONAME) - - .c.a: - $(CC) $(CFLAGS) -c $< -o $*.o -*************** -*** 53,59 **** - clean: - rm -rf $(includedir)/mba - rm -f $(OBJS) $(ARNAME) $(SONAME) $(libdir)/$(ARNAME) $(libdir)/$(SONAME) $(libdir)/$(SOVERSION) $(libdir)/lib$(LIBNAME).so $(DISTRO).zip -! cd $(mandir)/man3 && rm -f $(MAN) - - sho: src/shellout.c src/mba/shellout.h - gcc -Wall -W -DTEST -DMSGNO -lmba -lutil -o sho src/shellout.c ---- 53,59 ---- - clean: - rm -rf $(includedir)/mba - rm -f $(OBJS) $(ARNAME) $(SONAME) $(libdir)/$(ARNAME) $(libdir)/$(SONAME) $(libdir)/$(SOVERSION) $(libdir)/lib$(LIBNAME).so $(DISTRO).zip -! # cd $(mandir)/man3 && rm -f $(MAN) - - sho: src/shellout.c src/mba/shellout.h - gcc -Wall -W -DTEST -DMSGNO -lmba -lutil -o sho src/shellout.c +diff -r -U3 libmba-0.8.10/Makefile libmba/Makefile +--- libmba-0.8.10/Makefile 2004-08-27 22:59:43.000000000 -0600 ++++ libmba/Makefile 2004-08-31 16:58:36.732920304 -0600 +@@ -1,7 +1,7 @@ +-prefix = /usr/local +-includedir = $(prefix)/include +-libdir = $(prefix)/lib +-mandir = $(prefix)/man ++prefix = ./ ++includedir = $(prefix) ++libdir = $(prefix) ++mandir = $(prefix) + CC = gcc + LIBNAME = mba + MAJVERSION = 0.8 +@@ -60,7 +60,7 @@ + clean: + rm -rf $(includedir)/mba + rm -f $(OBJS) $(ARNAME) $(SONAME) $(libdir)/$(ARNAME) $(libdir)/$(SONAME) $(libdir)/$(SOVERSION) $(libdir)/lib$(LIBNAME).so $(DISTRO).zip +- cd $(mandir)/man3 && rm -f $(MAN) ++ # cd $(mandir)/man3 && rm -f $(MAN) + + sho: src/shellout.c src/mba/shellout.h + gcc -Wall -W -DTEST -DMSGNO -lmba -lutil -o sho src/shellout.c |