Re: Yet another Gnome 2.0 build report

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

Jens Finke <jens triq net> writes:

> I've reworked the patch. So may I commit this one?

Looks good.

> 
>    Jens
> 
> Index: ChangeLog
> ===================================================================
> RCS file: /cvs/gnome/libgnomecanvas/libgnomecanvas/ChangeLog,v
> retrieving revision 1.30
> diff -u -r1.30 ChangeLog
> --- ChangeLog	2001/06/20 07:23:22	1.30
> +++ ChangeLog	2001/06/21 20:33:50
> @@ -1,3 +1,14 @@
> +2001-06-21  Jens Finke <jens gnome org>
> +
> +	* gnome-canvas-bpath.h, gnome-canvas-clipgroup.h,
> +	gnome-canvas-line.h, gnome-canvas-path-def.h,
> +	gnome-canvas-pixbuf.c, gnome-canvas-polygon.h,
> +	gnome-canvas-rect-ellipse.h, gnome-canvas-shape-private.h,
> +	gnome-canvas-shape.h, gnome-canvas-text.h, gnome-canvas-widget.h:
> +	Removed deprecated includes, use G_BEGIN_DECLS instead of
> +	GNOME_BEGIN_DECLS. Prefixed package headers with libgnomecanvas/
> +	where they get included.
> +
>  2001-06-20  Rusty Conover  <rconover bangtail net>
>  
>  	* This is the start of the changes to convert most shape items to
> Index: gnome-canvas-bpath.h
> ===================================================================
> RCS file: /cvs/gnome/libgnomecanvas/libgnomecanvas/gnome-canvas-bpath.h,v
> retrieving revision 1.4
> diff -u -r1.4 gnome-canvas-bpath.h
> --- gnome-canvas-bpath.h	2001/06/20 07:23:22	1.4
> +++ gnome-canvas-bpath.h	2001/06/21 20:33:50
> @@ -14,12 +14,11 @@
>  #ifndef GNOME_CANVAS_BPATH_H
>  #define GNOME_CANVAS_BPATH_H
>  
> -#include <libgnome/gnome-defs.h>
> -#include <libgnomeui/gnome-canvas.h>
> -#include "gnome-canvas-shape.h"
> -#include "gnome-canvas-path-def.h"
> +#include <libgnomecanvas/gnome-canvas.h>
> +#include <libgnomecanvas/gnome-canvas-shape.h>
> +#include <libgnomecanvas/gnome-canvas-path-def.h>
>  
> -BEGIN_GNOME_DECLS
> +G_BEGIN_DECLS
>  
>  
>  /* Bpath item for the canvas.
> @@ -57,6 +56,6 @@
>  /* Standard Gtk function */
>  GtkType gnome_canvas_bpath_get_type (void);
>  
> -END_GNOME_DECLS
> +G_END_DECLS
>  
>  #endif
> Index: gnome-canvas-clipgroup.h
> ===================================================================
> RCS file: /cvs/gnome/libgnomecanvas/libgnomecanvas/gnome-canvas-clipgroup.h,v
> retrieving revision 1.3
> diff -u -r1.3 gnome-canvas-clipgroup.h
> --- gnome-canvas-clipgroup.h	2001/06/17 23:02:10	1.3
> +++ gnome-canvas-clipgroup.h	2001/06/21 20:33:50
> @@ -14,16 +14,15 @@
>   *          Lauris Kaplinski <lauris ximian com>
>   */
>  
> -#include <libgnome/gnome-defs.h>
> -#include <libgnomeui/gnome-canvas.h>
> -#include <libgnomeui/gnome-canvas-util.h>
> +#include <libgnomecanvas/gnome-canvas.h>
> +#include <libgnomecanvas/gnome-canvas-util.h>
>  
>  #include <libart_lgpl/art_bpath.h>
>  #include <libart_lgpl/art_svp_wind.h>
>  #include <libart_lgpl/art_vpath_dash.h>
> -#include "gnome-canvas-path-def.h"
> +#include <libgnomecanvas/gnome-canvas-path-def.h>
>  
> -BEGIN_GNOME_DECLS
> +G_BEGIN_DECLS
>  
>  
>  #define GNOME_TYPE_CANVAS_CLIPGROUP            (gnome_canvas_clipgroup_get_type ())
> @@ -54,6 +53,6 @@
>  GtkType gnome_canvas_clipgroup_get_type (void);
>  
>  
> -END_GNOME_DECLS
> +G_END_DECLS
>  
>  #endif
> Index: gnome-canvas-line.h
> ===================================================================
> RCS file: /cvs/gnome/libgnomecanvas/libgnomecanvas/gnome-canvas-line.h,v
> retrieving revision 1.17
> diff -u -r1.17 gnome-canvas-line.h
> --- gnome-canvas-line.h	2001/04/18 23:54:53	1.17
> +++ gnome-canvas-line.h	2001/06/21 20:33:50
> @@ -36,7 +36,7 @@
>  #define GNOME_CANVAS_LINE_H
>  
>  
> -#include "gnome-canvas.h"
> +#include <libgnomecanvas/gnome-canvas.h>
>  
>  
>  G_BEGIN_DECLS
> Index: gnome-canvas-path-def.h
> ===================================================================
> RCS file: /cvs/gnome/libgnomecanvas/libgnomecanvas/gnome-canvas-path-def.h,v
> retrieving revision 1.2
> diff -u -r1.2 gnome-canvas-path-def.h
> --- gnome-canvas-path-def.h	2001/06/17 23:02:10	1.2
> +++ gnome-canvas-path-def.h	2001/06/21 20:33:50
> @@ -17,9 +17,8 @@
>  
>  #include <glib.h>
>  #include <libart_lgpl/art_bpath.h>
> -#include <libgnome/gnome-defs.h>
>  
> -BEGIN_GNOME_DECLS
> +G_BEGIN_DECLS
>  
>  typedef struct _GnomeCanvasPathDef GnomeCanvasPathDef;
>  
> @@ -89,6 +88,6 @@
>  gboolean gnome_canvas_path_def_any_closed (const GnomeCanvasPathDef * path);
>  gboolean gnome_canvas_path_def_all_closed (const GnomeCanvasPathDef * path);
>  
> -END_GNOME_DECLS
> +G_END_DECLS
>  
>  #endif
> Index: gnome-canvas-pixbuf.c
> ===================================================================
> RCS file: /cvs/gnome/libgnomecanvas/libgnomecanvas/gnome-canvas-pixbuf.c,v
> retrieving revision 1.17
> diff -u -r1.17 gnome-canvas-pixbuf.c
> --- gnome-canvas-pixbuf.c	2001/06/12 03:19:57	1.17
> +++ gnome-canvas-pixbuf.c	2001/06/21 20:33:50
> @@ -29,9 +29,6 @@
>  #include <libart_lgpl/art_rgb_rgba_affine.h>
>  #include "gnome-canvas-pixbuf.h"
>  
> -/* For GtkTypeAnchor */
> -#include <gtk/gtkpacker.h>
> -
>  
>  
>  /* Private part of the GnomeCanvasPixbuf structure */
> Index: gnome-canvas-polygon.h
> ===================================================================
> RCS file: /cvs/gnome/libgnomecanvas/libgnomecanvas/gnome-canvas-polygon.h,v
> retrieving revision 1.13
> diff -u -r1.13 gnome-canvas-polygon.h
> --- gnome-canvas-polygon.h	2001/06/20 07:23:22	1.13
> +++ gnome-canvas-polygon.h	2001/06/21 20:33:50
> @@ -36,9 +36,9 @@
>  #define GNOME_CANVAS_POLYGON_H
>  
>  
> -#include "gnome-canvas.h"
> -#include "gnome-canvas-shape.h"
> -#include "gnome-canvas-path-def.h"
> +#include <libgnomecanvas/gnome-canvas.h>
> +#include <libgnomecanvas/gnome-canvas-shape.h>
> +#include <libgnomecanvas/gnome-canvas-path-def.h>
>  
>  G_BEGIN_DECLS
>  
> Index: gnome-canvas-rect-ellipse.h
> ===================================================================
> RCS file: /cvs/gnome/libgnomecanvas/libgnomecanvas/gnome-canvas-rect-ellipse.h,v
> retrieving revision 1.16
> diff -u -r1.16 gnome-canvas-rect-ellipse.h
> --- gnome-canvas-rect-ellipse.h	2001/06/20 07:23:22	1.16
> +++ gnome-canvas-rect-ellipse.h	2001/06/21 20:33:50
> @@ -35,9 +35,9 @@
>  #define GNOME_CANVAS_RECT_ELLIPSE_H
>  
>  
> -#include "gnome-canvas.h"
> +#include <libgnomecanvas/gnome-canvas.h>
>  
> -#include "gnome-canvas-shape.h"
> +#include <libgnomecanvas/gnome-canvas-shape.h>
>  
>  #include <libart_lgpl/art_svp.h>
>  
> Index: gnome-canvas-shape-private.h
> ===================================================================
> RCS file: /cvs/gnome/libgnomecanvas/libgnomecanvas/gnome-canvas-shape-private.h,v
> retrieving revision 1.1
> diff -u -r1.1 gnome-canvas-shape-private.h
> --- gnome-canvas-shape-private.h	2001/06/20 07:23:22	1.1
> +++ gnome-canvas-shape-private.h	2001/06/21 20:33:50
> @@ -18,11 +18,11 @@
>  #include <libart_lgpl/art_svp.h>
>  #include <libart_lgpl/art_vpath_dash.h>
>  #include <libart_lgpl/art_svp_wind.h>
> -#include <libgnomeui/gnome-canvas.h>
> +#include <libgnomecanvas/gnome-canvas.h>
>  
> -#include "gnome-canvas-path-def.h"
> +#include <libgnomecanvas/gnome-canvas-path-def.h>
>  
> -BEGIN_GNOME_DECLS
> +G_BEGIN_DECLS
>  
>  typedef struct _GnomeCanvasShapePrivGdk GnomeCanvasShapePrivGdk;
>  typedef struct _GCBPDrawCtx GCBPDrawCtx;
> @@ -97,6 +97,6 @@
>  	GnomeCanvasShapePrivGdk * gdk;	/* Gdk specific things */
>  };
>  
> -END_GNOME_DECLS
> +G_END_DECLS
>  
>  #endif
> Index: gnome-canvas-shape.h
> ===================================================================
> RCS file: /cvs/gnome/libgnomecanvas/libgnomecanvas/gnome-canvas-shape.h,v
> retrieving revision 1.1
> diff -u -r1.1 gnome-canvas-shape.h
> --- gnome-canvas-shape.h	2001/06/20 07:23:22	1.1
> +++ gnome-canvas-shape.h	2001/06/21 20:33:50
> @@ -14,11 +14,10 @@
>  #ifndef GNOME_CANVAS_SHAPE_H
>  #define GNOME_CANVAS_SHAPE_H
>  
> -#include <libgnome/gnome-defs.h>
> -#include <libgnomeui/gnome-canvas.h>
> -#include "gnome-canvas-path-def.h"
> +#include <libgnomecanvas/gnome-canvas.h>
> +#include <libgnomecanvas/gnome-canvas-path-def.h>
>  
> -BEGIN_GNOME_DECLS
> +G_BEGIN_DECLS
>  
>  
>  /* Shape item for the canvas.
> @@ -75,6 +74,6 @@
>  /* Standard Gtk function */
>  GtkType gnome_canvas_shape_get_type (void);
>  
> -END_GNOME_DECLS
> +G_END_DECLS
>  
>  #endif
> Index: gnome-canvas-text.h
> ===================================================================
> RCS file: /cvs/gnome/libgnomecanvas/libgnomecanvas/gnome-canvas-text.h,v
> retrieving revision 1.20
> diff -u -r1.20 gnome-canvas-text.h
> --- gnome-canvas-text.h	2001/05/05 23:15:37	1.20
> +++ gnome-canvas-text.h	2001/06/21 20:33:50
> @@ -37,8 +37,7 @@
>  #define GNOME_CANVAS_TEXT_H
>  
>  
> -#include <gtk/gtkpacker.h> /* why the hell is GtkAnchorType here and not in gtkenums.h? */
> -#include "gnome-canvas.h"
> +#include <libgnomecanvas/gnome-canvas.h>
>  
>  
>  G_BEGIN_DECLS
> Index: gnome-canvas-widget.h
> ===================================================================
> RCS file: /cvs/gnome/libgnomecanvas/libgnomecanvas/gnome-canvas-widget.h,v
> retrieving revision 1.9
> diff -u -r1.9 gnome-canvas-widget.h
> --- gnome-canvas-widget.h	2001/04/18 23:54:53	1.9
> +++ gnome-canvas-widget.h	2001/06/21 20:33:51
> @@ -35,8 +35,7 @@
>  #define GNOME_CANVAS_WIDGET_H
>  
>  
> -#include <gtk/gtkpacker.h> /* why the hell is GtkAnchorType here and not in gtkenums.h? */
> -#include "gnome-canvas.h"
> +#include <libgnomecanvas/gnome-canvas.h>
>  
>  
>  G_BEGIN_DECLS

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