diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE index 38889df91..c9ae56d1f 100644 --- a/Documentation/Developers/CHANGELOG-RENE +++ b/Documentation/Developers/CHANGELOG-RENE @@ -3,6 +3,7 @@ - Valentin Ziegler: added ROCK Net DNS module - fixed librsvg to not install gimp plugin (which is also included in gimp) + - fixed libxml2 to not overwrite a libxml doc file *) 2003-11-23 (2.0.0-rc3 - 2.0.0-rc4) diff --git a/package/rene/libxml2/gtkdoc-module-name.patch b/package/rene/libxml2/gtkdoc-module-name.patch new file mode 100644 index 000000000..33b37c973 --- /dev/null +++ b/package/rene/libxml2/gtkdoc-module-name.patch @@ -0,0 +1,56 @@ +# --- ROCK-COPYRIGHT-NOTE-BEGIN --- +# +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# Please add additional copyright information _after_ the line containing +# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +# +# ROCK Linux: rock-src/package/rene/libxml2/gtkdoc-module-name.patch +# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. A copy of the GNU General Public +# License can be found at Documentation/COPYING. +# +# Many people helped and are helping developing ROCK Linux. Please +# have a look at http://www.rocklinux.org/ and the Documentation/TEAM +# file for details. +# +# --- ROCK-COPYRIGHT-NOTE-END --- + + +We need to patch the module name since libxml already uses libxml ... + + - Rene Rebe + +--- libxml2-2.5.10/doc/Makefile.inorig 2003-08-15 02:33:22.000000000 +0200 ++++ libxml2-2.5.10/doc/Makefile.in 2003-11-24 17:12:15.000000000 +0100 +@@ -392,14 +392,14 @@ + -@(xsltproc --nonet xmlcatalog_man.xml) + + scan: +- -gtkdoc-scan --module=libxml --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="acconfig.h config.h win32config.h trio.h triostr.h triop.h config-mac.h XMLTestPrefix2.h XMLTestPrefix.h triodef.h trionan.h xlink.h libxml.h libxml2-py.h libxml_wrap.h" ++ -gtkdoc-scan --module=libxml2 --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="acconfig.h config.h win32config.h trio.h triostr.h triop.h config-mac.h XMLTestPrefix2.h XMLTestPrefix.h triodef.h trionan.h xlink.h libxml.h libxml2-py.h libxml_wrap.h" + + templates: scan +- -gtkdoc-mktmpl --module=libxml ++ -gtkdoc-mktmpl --module=libxml2 + + xml: templates + if test -d xml ; then rm -f xml/* ; else mkdir xml ; fi +- -gtkdoc-mkdb --module=libxml --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --main-sgml-file=$(DOC_MAIN_XML_FILE) ++ -gtkdoc-mkdb --module=libxml2 --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --main-sgml-file=$(DOC_MAIN_XML_FILE) + + libxml2-api.xml: apibuild.py ../include/libxml/*.h + -(./apibuild.py) +@@ -433,7 +433,7 @@ + -@INSTALL@ -m 0644 $(srcdir)/xml.html $(srcdir)/encoding.html $(srcdir)/FAQ.html $(srcdir)/structure.gif $(srcdir)/DOM.gif $(srcdir)/smallfootonly.gif $(srcdir)/redhat.gif $(srcdir)/libxml.gif $(srcdir)/w3c.png $(srcdir)/Libxml2-Logo-180x168.gif $(srcdir)/Libxml2-Logo-90x34.gif $(DESTDIR)$(TARGET_DIR) + -@INSTALL@ -m 0644 $(srcdir)/html/*.html $(DESTDIR)$(TARGET_DIR) + -@INSTALL@ -m 0644 $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) +- -(cd $(DESTDIR); gtkdoc-fixxref --module=libxml --html-dir=$(HTML_DIR)) ++ -(cd $(DESTDIR); gtkdoc-fixxref --module=libxml2 --html-dir=$(HTML_DIR)) + -@(tar cf - tutorial | (cd $(DESTDIR)$(TARGET_DIR) && tar xvf -)) + + .PHONY : html xml templates scan