Re: stupid gconf patch

[Martin Baulig <martin home-of-linux org>]

Hi,

this is "a bit wrong" what you're doing here. I have a working
patch for this somewhere, must search it. AFAIK it is in that
gnome-libs/patches/gconf-gtk-2.0.patch, but together with other
stuff.

Basically, what the patch should do is:

1.) Require libxml 1.8.8 in configure.in

2.) Use <libxml/tree.h>, not <tree.h>

3.) use LIBXML_CHECK_VERSION (but AFAIK this is already in)

4.) Do the s/childs/xmlChildNode/, s/root/xmlRootNode/ thing.

So gnome-xml/doc/upgrade.html (in gnome-xml HEAD) for details.

Martin


Mathieu Lacage <mathieu eazel com> writes:

> Index: backends/xml-backend.c
> ===================================================================
> RCS file: /cvs/gnome/gconf/backends/xml-backend.c,v
> retrieving revision 1.73
> diff -u -r1.73 xml-backend.c
> --- backends/xml-backend.c	2000/09/25 03:10:15	1.73
> +++ backends/xml-backend.c	2000/12/11 22:31:44
> @@ -26,8 +26,8 @@
>  #include "xml-cache.h"
>  
>  
> -#include <gnome-xml/tree.h>
> -#include <gnome-xml/parser.h>
> +#include <tree.h> /* libxml */
> +#include <parser.h> /* libxml */
>  
>  #include <stdio.h>
>  #include <time.h>
> Index: backends/xml-cache.h
> ===================================================================
> RCS file: /cvs/gnome/gconf/backends/xml-cache.h,v
> retrieving revision 1.5
> diff -u -r1.5 xml-cache.h
> --- backends/xml-cache.h	2000/08/31 21:25:04	1.5
> +++ backends/xml-cache.h	2000/12/11 22:31:44
> @@ -21,7 +21,7 @@
>  #define GCONF_XML_CACHE_H
>  
>  #include <gconf/gconf.h>
> -#include <gnome-xml/tree.h>
> +#include <tree.h> /* libxml */
>  #include "xml-dir.h"
>  
>  typedef struct _Cache Cache;
> Index: backends/xml-dir.c
> ===================================================================
> RCS file: /cvs/gnome/gconf/backends/xml-dir.c,v
> retrieving revision 1.17
> diff -u -r1.17 xml-dir.c
> --- backends/xml-dir.c	2000/09/25 03:10:15	1.17
> +++ backends/xml-dir.c	2000/12/11 22:31:44
> @@ -20,7 +20,7 @@
>  #include "xml-dir.h"
>  #include "xml-entry.h"
>  
> -#include <gnome-xml/parser.h>
> +#include <parser.h> /* libxml */
>  
>  #include <stdio.h>
>  #include <time.h>
> Index: backends/xml-dir.h
> ===================================================================
> RCS file: /cvs/gnome/gconf/backends/xml-dir.h,v
> retrieving revision 1.6
> diff -u -r1.6 xml-dir.h
> --- backends/xml-dir.h	2000/08/31 21:25:04	1.6
> +++ backends/xml-dir.h	2000/12/11 22:31:44
> @@ -21,7 +21,7 @@
>  #define GCONF_XML_DIR_H
>  
>  #include <gconf/gconf.h>
> -#include <gnome-xml/tree.h>
> +#include <tree.h> /* libxml */
>  
>  /* Dir stores the information about a given directory */
>  
> Index: backends/xml-entry.c
> ===================================================================
> RCS file: /cvs/gnome/gconf/backends/xml-entry.c,v
> retrieving revision 1.19
> diff -u -r1.19 xml-entry.c
> --- backends/xml-entry.c	2000/09/13 17:49:40	1.19
> +++ backends/xml-entry.c	2000/12/11 22:31:44
> @@ -20,7 +20,7 @@
>  #include "xml-entry.h"
>  #include <gconf/gconf-internals.h>
>  #include <stdlib.h>
> -#include <gnome-xml/entities.h>
> +#include <entities.h> /*libxml */
>  
>  static void
>  entry_sync_if_needed(Entry* e, GConfValue* val);
> Index: backends/xml-entry.h
> ===================================================================
> RCS file: /cvs/gnome/gconf/backends/xml-entry.h,v
> retrieving revision 1.5
> diff -u -r1.5 xml-entry.h
> --- backends/xml-entry.h	2000/08/31 21:25:04	1.5
> +++ backends/xml-entry.h	2000/12/11 22:31:44
> @@ -21,7 +21,7 @@
>  #define GCONF_XML_ENTRY_H
>  
>  #include <gconf/gconf.h>
> -#include <gnome-xml/tree.h>
> +#include <tree.h> /* libxml */
>  
>  /* Entry stores all the information about a given key */
>  
> Index: gconf/gconftool.c
> ===================================================================
> RCS file: /cvs/gnome/gconf/gconf/gconftool.c,v
> retrieving revision 1.51
> diff -u -r1.51 gconftool.c
> --- gconf/gconftool.c	2000/10/10 04:30:18	1.51
> +++ gconf/gconftool.c	2000/12/11 22:31:44
> @@ -22,8 +22,8 @@
>  #include <stdio.h>
>  #include <unistd.h>
>  #include <popt.h>
> -#include <gnome-xml/tree.h>
> -#include <gnome-xml/parser.h>
> +#include <tree.h> /* libxml */
> +#include <parser.h> /* libxml */
>  #include <stdlib.h>
>  #include <errno.h>
> 
> -- 
> Mathieu Lacage <mathieu eazel com>
> 
> 
> _______________________________________________
> gnome-hackers mailing list
> gnome-hackers gnome org
> http://mail.gnome.org/mailman/listinfo/gnome-hackers
> 
> 

-- 
Martin Baulig
martin gnome org (private)
baulig suse de (work)