[Commits] (morgen) Per Andi, rolling back a version
commits at osafoundation.org
commits at osafoundation.org
Tue Apr 27 19:17:21 PDT 2004
Commit by: morgen
Modified files:
external/persistence/libxml2/patches 1.3 1.4
Log message:
Per Andi, rolling back a version
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/external/persistence/libxml2/patches.diff?r1=text&tr1=1.3&r2=text&tr2=1.4
Index: external/persistence/libxml2/patches
diff -u external/persistence/libxml2/patches:1.3 external/persistence/libxml2/patches:1.4
--- external/persistence/libxml2/patches:1.3 Tue Apr 27 16:11:18 2004
+++ external/persistence/libxml2/patches Tue Apr 27 19:16:50 2004
@@ -1,50 +1,51 @@
---- libxml2-2.6.9/Makefile.in Tue Apr 27 15:54:30 2004
-+++ libxml2-2.6.9-patched/Makefile.in Tue Apr 27 15:54:26 2004
-@@ -418,8 +418,8 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+--- libxml2-2.6.3/parser.c Mon Dec 8 01:57:00 2003
++++ libxml2-2.6.3-patched/parser.c Fri Dec 12 12:42:37 2003
+@@ -11533,6 +11533,7 @@
+ }
+ xmlDetectSAX2(ctxt);
+ if (data!=NULL) {
++ ctxt->userData = data;
+ ctxt->_private = data;
+ }
+
+@@ -11803,6 +11804,7 @@
+ }
+ xmlDetectSAX2(ctxt);
+ if (data!=NULL) {
++ ctxt->userData=data;
+ ctxt->_private=data;
+ }
+
+--- libxml2-2.6.3/Makefile.in Wed Dec 10 03:56:54 2003
++++ libxml2-2.6.3-patched/Makefile.in Fri Dec 12 13:30:54 2003
+@@ -184,9 +184,9 @@
+ install_sh = @install_sh@
+ pythondir = @pythondir@
+
-SUBDIRS = include . doc example @PYTHON_SUBDIR@
--DIST_SUBDIRS = include . doc example python
+SUBDIRS = include . @PYTHON_SUBDIR@
+
+-DIST_SUBDIRS = include . doc example python
+DIST_SUBDIRS = include . python
+
INCLUDES = -I$(top_builddir)/include -I at srcdir@/include @THREAD_CFLAGS@ @Z_CFLAGS@
- bin_SCRIPTS = xml2-config
- lib_LTLIBRARIES = libxml2.la
-@@ -530,43 +530,46 @@
- .SUFFIXES: .c .lo .o .obj
- am--refresh:
- @:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-- @for dep in $?; do \
-- case '$(am__configure_deps)' in \
-- *$$dep*) \
-- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
-- cd $(srcdir) && $(AUTOMAKE) --gnu \
-- && exit 0; \
-- exit 1;; \
-- esac; \
-- done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
+
+@@ -470,25 +470,29 @@
+
+ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu Makefile
--.PRECIOUS: Makefile
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- @case '$?' in \
-- *config.status*) \
-- echo ' $(SHELL) ./config.status'; \
-- $(SHELL) ./config.status;; \
-- *) \
-- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-- esac;
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
-
--$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- $(SHELL) ./config.status --recheck
--
--$(top_srcdir)/configure: $(am__configure_deps)
+-$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
- cd $(srcdir) && $(AUTOCONF)
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+-
+-$(ACLOCAL_M4): configure.in acinclude.m4
- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.h: stamp-h1
@@ -52,39 +53,22 @@
- rm -f stamp-h1; \
- $(MAKE) stamp-h1; \
- else :; fi
++
+# This is commented out for Chandler build since it causes
+# configure to be regenerated
+#
-+#$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+# @for dep in $?; do \
-+# case '$(am__configure_deps)' in \
-+# *$$dep*) \
-+# echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
-+# cd $(srcdir) && $(AUTOMAKE) --gnu \
-+# && exit 0; \
-+# exit 1;; \
-+# esac; \
-+# done; \
-+# echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
++#$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+# cd $(top_srcdir) && \
+# $(AUTOMAKE) --gnu Makefile
-+#.PRECIOUS: Makefile
-+#Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+# @case '$?' in \
-+# *config.status*) \
-+# echo ' $(SHELL) ./config.status'; \
-+# $(SHELL) ./config.status;; \
-+# *) \
-+# echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-+# cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-+# esac;
++#Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++# cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
+#
-+#$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++#$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+# $(SHELL) ./config.status --recheck
-+#
-+#$(top_srcdir)/configure: $(am__configure_deps)
++#$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+# cd $(srcdir) && $(AUTOCONF)
-+#$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++#
++#$(ACLOCAL_M4): configure.in acinclude.m4
+# cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+#
+#config.h: stamp-h1
@@ -95,7 +79,7 @@
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
-@@ -1334,7 +1337,7 @@
+@@ -1187,7 +1191,7 @@
#testOOM_DEPENDENCIES = $(DEPS)
#testOOM_LDADD= $(LDADDS)
@@ -104,59 +88,34 @@
testall : tests SVGtests SAXtests
---- libxml2-2.6.9/configure Tue Apr 27 15:54:30 2004
-+++ libxml2-2.6.9-patched/configure Tue Apr 27 15:54:26 2004
-@@ -26330,6 +26330,10 @@
- then
- echo Found python in $with_python/bin/python
- PYTHON="$with_python/bin/python"
-+ elif test -x "$with_python/bin/python_d"
-+ then
-+ echo Found python in $with_python/bin/python_d
-+ PYTHON="$with_python/bin/python_d"
- else
- if test -x "$with_python"
- then
-
---- libxml2-2.6.9/parser.c Tue Apr 27 15:54:30 2004
-+++ libxml2-2.6.9-patched/parser.c Tue Apr 27 15:54:26 2004
-@@ -11554,9 +11554,13 @@
- if (sax != NULL) {
- ctxt->sax = sax;
- ctxt->userData = NULL;
-- }
-- xmlDetectSAX2(ctxt);
--
-+ }
-+ xmlDetectSAX2(ctxt);
-+ if (data!=NULL) {
-+ ctxt->userData=data;
-+ ctxt->_private=data;
-+ }
-+
- xmlParseDocument(ctxt);
- if ((ctxt->wellFormed) || recovery) ret = ctxt->myDoc;
- else {
-
---- libxml2-2.6.9/python/Makefile.in Tue Apr 27 15:54:28 2004
-+++ libxml2-2.6.9-patched/python/Makefile.in Tue Apr 27 15:54:24 2004
-@@ -279,9 +279,10 @@
-
+--- libxml2-2.6.3/python/Makefile.in Wed Dec 10 03:56:54 2003
++++ libxml2-2.6.3-patched/python/Makefile.in Sun Dec 14 17:51:10 2003
+@@ -187,10 +187,11 @@
# Makefile for libxml2 python library
AUTOMAKE_OPTIONS = 1.4 foreign
+
-SUBDIRS = . tests
+SUBDIRS = .
+
INCLUDES = \
-I$(PYTHON_INCLUDES) \
-+ -l../include \
++ -I../include \
-I$(top_srcdir)/include
- DOCS_DIR = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)
-@@ -690,10 +691,9 @@
+
+@@ -206,7 +207,6 @@
+ generator.py \
+ libxml_wrap.h \
+ libxml.py \
+- drv_libxml2.py \
+ libxml2-python-api.xml \
+ $(DOCS)
+
+@@ -584,10 +584,9 @@
@WITH_PYTHON_TRUE at install-data-local:
@WITH_PYTHON_TRUE@ $(mkinstalldirs) $(DESTDIR)$(pythondir)
@WITH_PYTHON_TRUE@ @INSTALL@ -m 0644 libxml2.py $(DESTDIR)$(pythondir)
-- at WITH_PYTHON_TRUE@ @INSTALL@ -m 0644 $(srcdir)/drv_libxml2.py $(DESTDIR)$(pythondir)
+- at WITH_PYTHON_TRUE@ @INSTALL@ -m 0644 drv_libxml2.py $(DESTDIR)$(pythondir)
- at WITH_PYTHON_TRUE@ $(mkinstalldirs) $(DESTDIR)$(DOCS_DIR)
- at WITH_PYTHON_TRUE@ @(for doc in $(DOCS) ; \
- at WITH_PYTHON_TRUE@ do @INSTALL@ -m 0644 $$doc $(DESTDIR)$(DOCS_DIR) ; done)
@@ -166,58 +125,22 @@
@WITH_PYTHON_TRUE@$(GENERATED): gen_prog
---- libxml2-2.6.9/win32/Makefile.msvc Tue Apr 27 15:54:29 2004
-+++ libxml2-2.6.9-patched/win32/Makefile.msvc Tue Apr 27 15:54:25 2004
-@@ -15,7 +15,9 @@
- # There should never be a need to modify anything below this line.
- # ----------------------------------------------------------------
-
--AUTOCONF = .\config.msvc
-+BUILD_VERSION=.
-+
-+AUTOCONF = $(BUILD_VERSION)\config.msvc
- !include $(AUTOCONF)
-
- # Names of various input and output components.
-@@ -27,10 +29,10 @@
- XML_A = $(XML_BASENAME)_a.lib
-
- # Place where we let the compiler put its output.
--BINDIR = bin.msvc
--XML_INTDIR = int.msvc
--XML_INTDIR_A = int.a.msvc
--UTILS_INTDIR = int.utils.msvc
-+BINDIR = $(BUILD_VERSION)\bin.msvc
-+XML_INTDIR = $(BUILD_VERSION)\int.msvc
-+XML_INTDIR_A = $(BUILD_VERSION)\int.a.msvc
-+UTILS_INTDIR = $(BUILD_VERSION)\int.utils.msvc
-
- # The preprocessor and its options.
- CPP = cl.exe /EP
-@@ -39,6 +41,10 @@
- CPPFLAGS = $(CPPFLAGS) /D "_REENTRANT"
- !endif
-
-+!if "$(DEBUG)" == "1"
-+CRUNTIME = $(CRUNTIME)d
-+!endif
-+
- # The compiler and its options.
- CC = cl.exe
- CFLAGS = /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" /W1 $(CRUNTIME)
-@@ -223,7 +229,7 @@
- copy $(BINDIR)\$(XML_A) $(LIBPREFIX)
- copy $(BINDIR)\$(XML_IMP) $(LIBPREFIX)
- copy $(BINDIR)\*.exe $(BINPREFIX)
-- -copy $(BINDIR)\*.pdb $(BINPREFIX)
-+ if exist $(BINDIR)\*.pdb copy $(BINDIR)\*.pdb $(BINPREFIX)
-
- # This is a target for me, to make a binary distribution. Not for the public use,
- # keep your hands off :-)
-
---- libxml2-2.6.9/win32/configure.js Tue Apr 27 15:54:29 2004
-+++ libxml2-2.6.9-patched/win32/configure.js Tue Apr 27 15:54:25 2004
-@@ -54,6 +54,7 @@
+--- libxml2-2.6.3/configure Wed Dec 10 03:56:59 2003
++++ libxml2-2.6.3-patched/configure Fri Dec 12 13:37:55 2003
+@@ -25174,6 +25174,10 @@
+ then
+ echo Found python in $with_python/bin/python
+ PYTHON="$with_python/bin/python"
++ elif test -x "$with_python/bin/python_d"
++ then
++ echo Found python in $with_python/bin/python_d
++ PYTHON="$with_python/bin/python_d"
+ else
+ if test -x "$with_python"
+ then
+--- libxml2-2.6.3/win32/configure.js 2003-12-02 02:25:40.000000000 -0800
++++ libxml2-2.6.3-patched/win32/configure.js 2003-12-12 15:49:02.000000000 -0800
+@@ -53,6 +53,7 @@
var withSax1 = true;
var withLegacy = true;
var withOutput = true;
@@ -225,7 +148,7 @@
var withPython = false;
/* Win32 build options. */
var dirSep = "\\";
-@@ -160,17 +161,17 @@
+@@ -158,17 +159,17 @@
/* Discovers the version we are working with by reading the apropriate
configuration file. Despite its name, this also writes the configuration
file included by our makefile. */
@@ -247,7 +170,7 @@
vf = fso.CreateTextFile(versionFile, true);
vf.WriteLine("# " + versionFile);
vf.WriteLine("# This file is generated automatically by " + WScript.ScriptName + ".");
-@@ -319,6 +320,8 @@
+@@ -314,6 +315,8 @@
of.WriteLine(s.replace(/\@WITH_LEGACY\@/, withLegacy? "1" : "0"));
} else if (s.search(/\@WITH_OUTPUT\@/) != -1) {
of.WriteLine(s.replace(/\@WITH_OUTPUT\@/, withOutput? "1" : "0"));
@@ -256,7 +179,7 @@
} else
of.WriteLine(ln);
}
-@@ -328,8 +331,8 @@
+@@ -323,8 +326,8 @@
/* Configures Python bindings. Otherwise identical to the above */
function configureLibxmlPy()
{
@@ -267,7 +190,7 @@
var fso, ofi, of, ln, s;
fso = new ActiveXObject("Scripting.FileSystemObject");
ofi = fso.OpenTextFile(pyOptsFileIn, 1);
-@@ -539,7 +542,7 @@
+@@ -532,7 +535,7 @@
buildSoPrefix = "$(PREFIX)" + dirSep + "lib";
// Discover the version.
@@ -276,3 +199,51 @@
if (error != 0) {
WScript.Echo("Version discovery failed, aborting.");
WScript.Quit(error);
+--- libxml2-2.6.3/win32/Makefile.msvc 2003-11-28 23:58:21.000000000 -0800
++++ libxml2-2.6.3-patched/win32/Makefile.msvc 2004-01-28 18:02:11.000000000 -0800
+@@ -15,7 +15,9 @@
+ # There should never be a need to modify anything below this line.
+ # ----------------------------------------------------------------
+
+-AUTOCONF = .\config.msvc
++BUILD_VERSION=.
++
++AUTOCONF = $(BUILD_VERSION)\config.msvc
+ !include $(AUTOCONF)
+
+ # Names of various input and output components.
+@@ -27,10 +29,10 @@
+ XML_A = $(XML_BASENAME)_a.lib
+
+ # Place where we let the compiler put its output.
+-BINDIR = bin.msvc
+-XML_INTDIR = int.msvc
+-XML_INTDIR_A = int.a.msvc
+-UTILS_INTDIR = int.utils.msvc
++BINDIR = $(BUILD_VERSION)\bin.msvc
++XML_INTDIR = $(BUILD_VERSION)\int.msvc
++XML_INTDIR_A = $(BUILD_VERSION)\int.a.msvc
++UTILS_INTDIR = $(BUILD_VERSION)\int.utils.msvc
+
+ # The preprocessor and its options.
+ CPP = cl.exe /EP
+@@ -39,6 +41,10 @@
+ CPPFLAGS = $(CPPFLAGS) /D "_REENTRANT"
+ !endif
+
++!if "$(DEBUG)" == "1"
++CRUNTIME = $(CRUNTIME)d
++!endif
++
+ # The compiler and its options.
+ CC = cl.exe
+ CFLAGS = /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" /W1 $(CRUNTIME)
+@@ -217,7 +223,7 @@
+ copy $(BINDIR)\$(XML_A) $(LIBPREFIX)
+ copy $(BINDIR)\$(XML_IMP) $(LIBPREFIX)
+ copy $(BINDIR)\*.exe $(BINPREFIX)
+- -copy $(BINDIR)\*.pdb $(BINPREFIX)
++ if exist $(BINDIR)\*.pdb copy $(BINDIR)\*.pdb $(BINPREFIX)
+
+ # This is a target for me, to make a binary distribution. Not for the public use,
+ # keep your hands off :-)
More information about the Commits
mailing list