tags 451395 + patch tags 479500 + patch thanks Hi,
Attached is the diff for my hippo-canvas 0.2.23-4.1 NMU.In addition to fixing the above issues, I also took the liberty of cleaning some autogenerated files filling up in the diff. Hope that's ok with you.
Kind regards, - Jonas who wants a working hippocanvas for use with Sugar :-) -- * Jonas Smedegaard - idealist og Internet-arkitekt * Tlf.: +45 40843136 Website: http://dr.jones.dk/ - Enden er nær: http://www.shibumi.org/eoti.htm
reverted:
--- hippo-canvas-0.2.23/config/hippo-canvas/hippo-canvas-type-builtins.c
+++ hippo-canvas-0.2.23.orig/config/hippo-canvas/hippo-canvas-type-builtins.c
@@ -1,290 +0,0 @@
-
-/* Generated data (by glib-mkenums) */
-
-#include "hippo-canvas-type-builtins.h"
-
-
-/* enumerations from "hippo/hippo-canvas-box.h" */
-#include "hippo/hippo-canvas-box.h"
-const GEnumValue _hippo_pack_flags_values[] = {
- { HIPPO_PACK_EXPAND, "HIPPO_PACK_EXPAND", "expand" },
- { HIPPO_PACK_END, "HIPPO_PACK_END", "end" },
- { HIPPO_PACK_FIXED, "HIPPO_PACK_FIXED", "fixed" },
- { HIPPO_PACK_IF_FITS, "HIPPO_PACK_IF_FITS", "if-fits" },
- { HIPPO_PACK_FLOAT_LEFT, "HIPPO_PACK_FLOAT_LEFT", "float-left" },
- { HIPPO_PACK_FLOAT_RIGHT, "HIPPO_PACK_FLOAT_RIGHT", "float-right" },
- { HIPPO_PACK_CLEAR_LEFT, "HIPPO_PACK_CLEAR_LEFT", "clear-left" },
- { HIPPO_PACK_CLEAR_RIGHT, "HIPPO_PACK_CLEAR_RIGHT", "clear-right" },
- { HIPPO_PACK_CLEAR_BOTH, "HIPPO_PACK_CLEAR_BOTH", "clear-both" },
- { 0, NULL, NULL }
-};
-
-GType
-hippo_pack_flags_get_type (void)
-{
- static GType type = 0;
-
- if (G_UNLIKELY (type == 0))
- type = g_enum_register_static ("HippoPackFlags", _hippo_pack_flags_values);
-
- return type;
-}
-
-const GEnumValue _hippo_cascade_mode_values[] = {
- { HIPPO_CASCADE_MODE_NONE, "HIPPO_CASCADE_MODE_NONE", "none" },
- { HIPPO_CASCADE_MODE_INHERIT, "HIPPO_CASCADE_MODE_INHERIT", "inherit" },
- { 0, NULL, NULL }
-};
-
-GType
-hippo_cascade_mode_get_type (void)
-{
- static GType type = 0;
-
- if (G_UNLIKELY (type == 0))
- type = g_enum_register_static ("HippoCascadeMode", _hippo_cascade_mode_values);
-
- return type;
-}
-
-
-/* enumerations from "hippo/hippo-canvas-context.h" */
-#include "hippo/hippo-canvas-context.h"
-const GEnumValue _hippo_stock_color_values[] = {
- { HIPPO_STOCK_COLOR_BG_NORMAL, "HIPPO_STOCK_COLOR_BG_NORMAL", "normal" },
- { HIPPO_STOCK_COLOR_BG_PRELIGHT, "HIPPO_STOCK_COLOR_BG_PRELIGHT", "prelight" },
- { 0, NULL, NULL }
-};
-
-GType
-hippo_stock_color_get_type (void)
-{
- static GType type = 0;
-
- if (G_UNLIKELY (type == 0))
- type = g_enum_register_static ("HippoStockColor", _hippo_stock_color_values);
-
- return type;
-}
-
-
-/* enumerations from "hippo/hippo-canvas-item.h" */
-#include "hippo/hippo-canvas-item.h"
-const GEnumValue _hippo_canvas_pointer_values[] = {
- { HIPPO_CANVAS_POINTER_UNSET, "HIPPO_CANVAS_POINTER_UNSET", "unset" },
- { HIPPO_CANVAS_POINTER_DEFAULT, "HIPPO_CANVAS_POINTER_DEFAULT", "default" },
- { HIPPO_CANVAS_POINTER_HAND, "HIPPO_CANVAS_POINTER_HAND", "hand" },
- { 0, NULL, NULL }
-};
-
-GType
-hippo_canvas_pointer_get_type (void)
-{
- static GType type = 0;
-
- if (G_UNLIKELY (type == 0))
- type = g_enum_register_static ("HippoCanvasPointer", _hippo_canvas_pointer_values);
-
- return type;
-}
-
-const GEnumValue _hippo_item_alignment_values[] = {
- { HIPPO_ALIGNMENT_FILL, "HIPPO_ALIGNMENT_FILL", "fill" },
- { HIPPO_ALIGNMENT_START, "HIPPO_ALIGNMENT_START", "start" },
- { HIPPO_ALIGNMENT_CENTER, "HIPPO_ALIGNMENT_CENTER", "center" },
- { HIPPO_ALIGNMENT_END, "HIPPO_ALIGNMENT_END", "end" },
- { 0, NULL, NULL }
-};
-
-GType
-hippo_item_alignment_get_type (void)
-{
- static GType type = 0;
-
- if (G_UNLIKELY (type == 0))
- type = g_enum_register_static ("HippoItemAlignment", _hippo_item_alignment_values);
-
- return type;
-}
-
-
-/* enumerations from "hippo/hippo-canvas-text.h" */
-#include "hippo/hippo-canvas-text.h"
-const GEnumValue _hippo_canvas_size_mode_values[] = {
- { HIPPO_CANVAS_SIZE_FULL_WIDTH, "HIPPO_CANVAS_SIZE_FULL_WIDTH", "full-width" },
- { HIPPO_CANVAS_SIZE_WRAP_WORD, "HIPPO_CANVAS_SIZE_WRAP_WORD", "wrap-word" },
- { HIPPO_CANVAS_SIZE_ELLIPSIZE_END, "HIPPO_CANVAS_SIZE_ELLIPSIZE_END", "ellipsize-end" },
- { 0, NULL, NULL }
-};
-
-GType
-hippo_canvas_size_mode_get_type (void)
-{
- static GType type = 0;
-
- if (G_UNLIKELY (type == 0))
- type = g_enum_register_static ("HippoCanvasSizeMode", _hippo_canvas_size_mode_values);
-
- return type;
-}
-
-
-/* enumerations from "hippo/hippo-canvas-widgets.h" */
-#include "hippo/hippo-canvas-widgets.h"
-const GEnumValue _hippo_scrollbar_policy_values[] = {
- { HIPPO_SCROLLBAR_NEVER, "HIPPO_SCROLLBAR_NEVER", "never" },
- { HIPPO_SCROLLBAR_AUTOMATIC, "HIPPO_SCROLLBAR_AUTOMATIC", "automatic" },
- { HIPPO_SCROLLBAR_ALWAYS, "HIPPO_SCROLLBAR_ALWAYS", "always" },
- { 0, NULL, NULL }
-};
-
-GType
-hippo_scrollbar_policy_get_type (void)
-{
- static GType type = 0;
-
- if (G_UNLIKELY (type == 0))
- type = g_enum_register_static ("HippoScrollbarPolicy", _hippo_scrollbar_policy_values);
-
- return type;
-}
-
-
-/* enumerations from "hippo/hippo-event.h" */
-#include "hippo/hippo-event.h"
-const GEnumValue _hippo_event_type_values[] = {
- { HIPPO_EVENT_BUTTON_PRESS, "HIPPO_EVENT_BUTTON_PRESS", "button-press" },
- { HIPPO_EVENT_BUTTON_RELEASE, "HIPPO_EVENT_BUTTON_RELEASE", "button-release" },
- { HIPPO_EVENT_MOTION_NOTIFY, "HIPPO_EVENT_MOTION_NOTIFY", "motion-notify" },
- { HIPPO_EVENT_KEY_PRESS, "HIPPO_EVENT_KEY_PRESS", "key-press" },
- { 0, NULL, NULL }
-};
-
-GType
-hippo_event_type_get_type (void)
-{
- static GType type = 0;
-
- if (G_UNLIKELY (type == 0))
- type = g_enum_register_static ("HippoEventType", _hippo_event_type_values);
-
- return type;
-}
-
-const GEnumValue _hippo_motion_detail_values[] = {
- { HIPPO_MOTION_DETAIL_ENTER, "HIPPO_MOTION_DETAIL_ENTER", "enter" },
- { HIPPO_MOTION_DETAIL_LEAVE, "HIPPO_MOTION_DETAIL_LEAVE", "leave" },
- { HIPPO_MOTION_DETAIL_WITHIN, "HIPPO_MOTION_DETAIL_WITHIN", "within" },
- { 0, NULL, NULL }
-};
-
-GType
-hippo_motion_detail_get_type (void)
-{
- static GType type = 0;
-
- if (G_UNLIKELY (type == 0))
- type = g_enum_register_static ("HippoMotionDetail", _hippo_motion_detail_values);
-
- return type;
-}
-
-const GEnumValue _hippo_key_values[] = {
- { HIPPO_KEY_UNKNOWN, "HIPPO_KEY_UNKNOWN", "unknown" },
- { HIPPO_KEY_RETURN, "HIPPO_KEY_RETURN", "return" },
- { HIPPO_KEY_ESCAPE, "HIPPO_KEY_ESCAPE", "escape" },
- { HIPPO_KEY_TAB, "HIPPO_KEY_TAB", "tab" },
- { HIPPO_KEY_LEFTTAB, "HIPPO_KEY_LEFTTAB", "lefttab" },
- { 0, NULL, NULL }
-};
-
-GType
-hippo_key_get_type (void)
-{
- static GType type = 0;
-
- if (G_UNLIKELY (type == 0))
- type = g_enum_register_static ("HippoKey", _hippo_key_values);
-
- return type;
-}
-
-const GFlagsValue _hippo_modifier_values[] = {
- { HIPPO_MODIFIER_SHIFT, "HIPPO_MODIFIER_SHIFT", "shift" },
- { HIPPO_MODIFIER_CTRL, "HIPPO_MODIFIER_CTRL", "ctrl" },
- { HIPPO_MODIFIER_ALT, "HIPPO_MODIFIER_ALT", "alt" },
- { 0, NULL, NULL }
-};
-
-GType
-hippo_modifier_get_type (void)
-{
- static GType type = 0;
-
- if (G_UNLIKELY (type == 0))
- type = g_flags_register_static ("HippoModifier", _hippo_modifier_values);
-
- return type;
-}
-
-
-/* enumerations from "hippo/hippo-graphics.h" */
-#include "hippo/hippo-graphics.h"
-const GEnumValue _hippo_orientation_values[] = {
- { HIPPO_ORIENTATION_VERTICAL, "HIPPO_ORIENTATION_VERTICAL", "vertical" },
- { HIPPO_ORIENTATION_HORIZONTAL, "HIPPO_ORIENTATION_HORIZONTAL", "horizontal" },
- { 0, NULL, NULL }
-};
-
-GType
-hippo_orientation_get_type (void)
-{
- static GType type = 0;
-
- if (G_UNLIKELY (type == 0))
- type = g_enum_register_static ("HippoOrientation", _hippo_orientation_values);
-
- return type;
-}
-
-const GEnumValue _hippo_side_values[] = {
- { HIPPO_SIDE_TOP, "HIPPO_SIDE_TOP", "top" },
- { HIPPO_SIDE_BOTTOM, "HIPPO_SIDE_BOTTOM", "bottom" },
- { HIPPO_SIDE_LEFT, "HIPPO_SIDE_LEFT", "left" },
- { HIPPO_SIDE_RIGHT, "HIPPO_SIDE_RIGHT", "right" },
- { 0, NULL, NULL }
-};
-
-GType
-hippo_side_get_type (void)
-{
- static GType type = 0;
-
- if (G_UNLIKELY (type == 0))
- type = g_enum_register_static ("HippoSide", _hippo_side_values);
-
- return type;
-}
-
-const GEnumValue _hippo_gravity_values[] = {
- { HIPPO_GRAVITY_NORTH_WEST, "HIPPO_GRAVITY_NORTH_WEST", "north-west" },
- { HIPPO_GRAVITY_NORTH_EAST, "HIPPO_GRAVITY_NORTH_EAST", "north-east" },
- { HIPPO_GRAVITY_SOUTH_EAST, "HIPPO_GRAVITY_SOUTH_EAST", "south-east" },
- { HIPPO_GRAVITY_SOUTH_WEST, "HIPPO_GRAVITY_SOUTH_WEST", "south-west" },
- { 0, NULL, NULL }
-};
-
-GType
-hippo_gravity_get_type (void)
-{
- static GType type = 0;
-
- if (G_UNLIKELY (type == 0))
- type = g_enum_register_static ("HippoGravity", _hippo_gravity_values);
-
- return type;
-}
-
-
-/* Generated data ends here */
-
reverted:
--- hippo-canvas-0.2.23/config/hippo-canvas/hippo-canvas-type-builtins.h
+++ hippo-canvas-0.2.23.orig/config/hippo-canvas/hippo-canvas-type-builtins.h
@@ -1,58 +0,0 @@
-
-/* Generated data (by glib-mkenums) */
-
-#ifndef HIPPO_CANVAS_TYPE_BUILTINS_H
-#define HIPPO_CANVAS_TYPE_BUILTINS_H 1
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-
-/* --- hippo/hippo-canvas-box.h --- */
-#define HIPPO_TYPE_PACK_FLAGS hippo_pack_flags_get_type()
-GType hippo_pack_flags_get_type (void);
-#define HIPPO_TYPE_CASCADE_MODE hippo_cascade_mode_get_type()
-GType hippo_cascade_mode_get_type (void);
-
-/* --- hippo/hippo-canvas-context.h --- */
-#define HIPPO_TYPE_STOCK_COLOR hippo_stock_color_get_type()
-GType hippo_stock_color_get_type (void);
-
-/* --- hippo/hippo-canvas-item.h --- */
-#define HIPPO_TYPE_CANVAS_POINTER hippo_canvas_pointer_get_type()
-GType hippo_canvas_pointer_get_type (void);
-#define HIPPO_TYPE_ITEM_ALIGNMENT hippo_item_alignment_get_type()
-GType hippo_item_alignment_get_type (void);
-
-/* --- hippo/hippo-canvas-text.h --- */
-#define HIPPO_TYPE_CANVAS_SIZE_MODE hippo_canvas_size_mode_get_type()
-GType hippo_canvas_size_mode_get_type (void);
-
-/* --- hippo/hippo-canvas-widgets.h --- */
-#define HIPPO_TYPE_SCROLLBAR_POLICY hippo_scrollbar_policy_get_type()
-GType hippo_scrollbar_policy_get_type (void);
-
-/* --- hippo/hippo-event.h --- */
-#define HIPPO_TYPE_EVENT_TYPE hippo_event_type_get_type()
-GType hippo_event_type_get_type (void);
-#define HIPPO_TYPE_MOTION_DETAIL hippo_motion_detail_get_type()
-GType hippo_motion_detail_get_type (void);
-#define HIPPO_TYPE_KEY hippo_key_get_type()
-GType hippo_key_get_type (void);
-#define HIPPO_TYPE_MODIFIER hippo_modifier_get_type()
-GType hippo_modifier_get_type (void);
-
-/* --- hippo/hippo-graphics.h --- */
-#define HIPPO_TYPE_ORIENTATION hippo_orientation_get_type()
-GType hippo_orientation_get_type (void);
-#define HIPPO_TYPE_SIDE hippo_side_get_type()
-GType hippo_side_get_type (void);
-#define HIPPO_TYPE_GRAVITY hippo_gravity_get_type()
-GType hippo_gravity_get_type (void);
-G_END_DECLS
-
-#endif /* HIPPO_CANVAS_TYPE_BUILTINS_H */
-
-/* Generated data ends here */
-
reverted:
--- hippo-canvas-0.2.23/config/hippo-canvas/hippo-canvas-marshal.c
+++ hippo-canvas-0.2.23.orig/config/hippo-canvas/hippo-canvas-marshal.c
@@ -1,167 +0,0 @@
-#include "hippo-canvas-marshal.h"
-
-#include <glib-object.h>
-
-
-#ifdef G_ENABLE_DEBUG
-#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v)
-#define g_marshal_value_peek_char(v) g_value_get_char (v)
-#define g_marshal_value_peek_uchar(v) g_value_get_uchar (v)
-#define g_marshal_value_peek_int(v) g_value_get_int (v)
-#define g_marshal_value_peek_uint(v) g_value_get_uint (v)
-#define g_marshal_value_peek_long(v) g_value_get_long (v)
-#define g_marshal_value_peek_ulong(v) g_value_get_ulong (v)
-#define g_marshal_value_peek_int64(v) g_value_get_int64 (v)
-#define g_marshal_value_peek_uint64(v) g_value_get_uint64 (v)
-#define g_marshal_value_peek_enum(v) g_value_get_enum (v)
-#define g_marshal_value_peek_flags(v) g_value_get_flags (v)
-#define g_marshal_value_peek_float(v) g_value_get_float (v)
-#define g_marshal_value_peek_double(v) g_value_get_double (v)
-#define g_marshal_value_peek_string(v) (char*) g_value_get_string (v)
-#define g_marshal_value_peek_param(v) g_value_get_param (v)
-#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v)
-#define g_marshal_value_peek_pointer(v) g_value_get_pointer (v)
-#define g_marshal_value_peek_object(v) g_value_get_object (v)
-#else /* !G_ENABLE_DEBUG */
-/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API.
- * Do not access GValues directly in your code. Instead, use the
- * g_value_get_*() functions
- */
-#define g_marshal_value_peek_boolean(v) (v)->data[0].v_int
-#define g_marshal_value_peek_char(v) (v)->data[0].v_int
-#define g_marshal_value_peek_uchar(v) (v)->data[0].v_uint
-#define g_marshal_value_peek_int(v) (v)->data[0].v_int
-#define g_marshal_value_peek_uint(v) (v)->data[0].v_uint
-#define g_marshal_value_peek_long(v) (v)->data[0].v_long
-#define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong
-#define g_marshal_value_peek_int64(v) (v)->data[0].v_int64
-#define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64
-#define g_marshal_value_peek_enum(v) (v)->data[0].v_long
-#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong
-#define g_marshal_value_peek_float(v) (v)->data[0].v_float
-#define g_marshal_value_peek_double(v) (v)->data[0].v_double
-#define g_marshal_value_peek_string(v) (v)->data[0].v_pointer
-#define g_marshal_value_peek_param(v) (v)->data[0].v_pointer
-#define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer
-#define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer
-#define g_marshal_value_peek_object(v) (v)->data[0].v_pointer
-#endif /* !G_ENABLE_DEBUG */
-
-
-/* VOID:POINTER,BOXED (./common/hippo/hippo-canvas-marshal.list:1) */
-void
-hippo_canvas_marshal_VOID__POINTER_BOXED (GClosure *closure,
- GValue *return_value G_GNUC_UNUSED,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint G_GNUC_UNUSED,
- gpointer marshal_data)
-{
- typedef void (*GMarshalFunc_VOID__POINTER_BOXED) (gpointer data1,
- gpointer arg_1,
- gpointer arg_2,
- gpointer data2);
- register GMarshalFunc_VOID__POINTER_BOXED callback;
- register GCClosure *cc = (GCClosure*) closure;
- register gpointer data1, data2;
-
- g_return_if_fail (n_param_values == 3);
-
- if (G_CCLOSURE_SWAP_DATA (closure))
- {
- data1 = closure->data;
- data2 = g_value_peek_pointer (param_values + 0);
- }
- else
- {
- data1 = g_value_peek_pointer (param_values + 0);
- data2 = closure->data;
- }
- callback = (GMarshalFunc_VOID__POINTER_BOXED) (marshal_data ? marshal_data : cc->callback);
-
- callback (data1,
- g_marshal_value_peek_pointer (param_values + 1),
- g_marshal_value_peek_boxed (param_values + 2),
- data2);
-}
-
-/* VOID:INT,INT,INT,INT (./common/hippo/hippo-canvas-marshal.list:2) */
-void
-hippo_canvas_marshal_VOID__INT_INT_INT_INT (GClosure *closure,
- GValue *return_value G_GNUC_UNUSED,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint G_GNUC_UNUSED,
- gpointer marshal_data)
-{
- typedef void (*GMarshalFunc_VOID__INT_INT_INT_INT) (gpointer data1,
- gint arg_1,
- gint arg_2,
- gint arg_3,
- gint arg_4,
- gpointer data2);
- register GMarshalFunc_VOID__INT_INT_INT_INT callback;
- register GCClosure *cc = (GCClosure*) closure;
- register gpointer data1, data2;
-
- g_return_if_fail (n_param_values == 5);
-
- if (G_CCLOSURE_SWAP_DATA (closure))
- {
- data1 = closure->data;
- data2 = g_value_peek_pointer (param_values + 0);
- }
- else
- {
- data1 = g_value_peek_pointer (param_values + 0);
- data2 = closure->data;
- }
- callback = (GMarshalFunc_VOID__INT_INT_INT_INT) (marshal_data ? marshal_data : cc->callback);
-
- callback (data1,
- g_marshal_value_peek_int (param_values + 1),
- g_marshal_value_peek_int (param_values + 2),
- g_marshal_value_peek_int (param_values + 3),
- g_marshal_value_peek_int (param_values + 4),
- data2);
-}
-
-/* BOOLEAN:BOXED (./common/hippo/hippo-canvas-marshal.list:3) */
-void
-hippo_canvas_marshal_BOOLEAN__BOXED (GClosure *closure,
- GValue *return_value G_GNUC_UNUSED,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint G_GNUC_UNUSED,
- gpointer marshal_data)
-{
- typedef gboolean (*GMarshalFunc_BOOLEAN__BOXED) (gpointer data1,
- gpointer arg_1,
- gpointer data2);
- register GMarshalFunc_BOOLEAN__BOXED callback;
- register GCClosure *cc = (GCClosure*) closure;
- register gpointer data1, data2;
- gboolean v_return;
-
- g_return_if_fail (return_value != NULL);
- g_return_if_fail (n_param_values == 2);
-
- if (G_CCLOSURE_SWAP_DATA (closure))
- {
- data1 = closure->data;
- data2 = g_value_peek_pointer (param_values + 0);
- }
- else
- {
- data1 = g_value_peek_pointer (param_values + 0);
- data2 = closure->data;
- }
- callback = (GMarshalFunc_BOOLEAN__BOXED) (marshal_data ? marshal_data : cc->callback);
-
- v_return = callback (data1,
- g_marshal_value_peek_boxed (param_values + 1),
- data2);
-
- g_value_set_boolean (return_value, v_return);
-}
-
reverted:
--- hippo-canvas-0.2.23/config/hippo-canvas/hippo-canvas-marshal.h
+++ hippo-canvas-0.2.23.orig/config/hippo-canvas/hippo-canvas-marshal.h
@@ -1,36 +0,0 @@
-
-#ifndef __hippo_canvas_marshal_MARSHAL_H__
-#define __hippo_canvas_marshal_MARSHAL_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-/* VOID:POINTER,BOXED (./common/hippo/hippo-canvas-marshal.list:1) */
-extern void hippo_canvas_marshal_VOID__POINTER_BOXED (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
-
-/* VOID:INT,INT,INT,INT (./common/hippo/hippo-canvas-marshal.list:2) */
-extern void hippo_canvas_marshal_VOID__INT_INT_INT_INT (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
-
-/* BOOLEAN:BOXED (./common/hippo/hippo-canvas-marshal.list:3) */
-extern void hippo_canvas_marshal_BOOLEAN__BOXED (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
-
-G_END_DECLS
-
-#endif /* __hippo_canvas_marshal_MARSHAL_H__ */
-
reverted:
--- hippo-canvas-0.2.23/config/hippo-canvas/stamp-hippo-canvas-type-builtins.c
+++ hippo-canvas-0.2.23.orig/config/hippo-canvas/stamp-hippo-canvas-type-builtins.c
@@ -1 +0,0 @@
-timestamp
reverted:
--- hippo-canvas-0.2.23/config/hippo-canvas/stamp-hippo-canvas-type-builtins.h
+++ hippo-canvas-0.2.23.orig/config/hippo-canvas/stamp-hippo-canvas-type-builtins.h
@@ -1 +0,0 @@
-timestamp
diff -u hippo-canvas-0.2.23/debian/control hippo-canvas-0.2.23/debian/control
--- hippo-canvas-0.2.23/debian/control
+++ hippo-canvas-0.2.23/debian/control
@@ -1,7 +1,7 @@
Source: hippo-canvas
Section: libs
Priority: optional
-Maintainer: Debian maintenance of the Gnome Online Desktop <[EMAIL PROTECTED]>
+Maintainer: Debian maintenance of the Gnome Online Desktop <[EMAIL PROTECTED]>
Uploaders: Santiago Ruano Rincón <[EMAIL PROTECTED]>
Build-Depends: cdbs, debhelper (>= 5.0.37.2), libgtk2.0-dev, python-central (>= 0.5), python-all-dev, python-gtk2-dev, python-cairo-dev
Standards-Version: 3.7.2
diff -u hippo-canvas-0.2.23/debian/rules hippo-canvas-0.2.23/debian/rules
--- hippo-canvas-0.2.23/debian/rules
+++ hippo-canvas-0.2.23/debian/rules
@@ -13,0 +14,3 @@
+
+clean::
+ rm -rf config/hippo-canvas
diff -u hippo-canvas-0.2.23/debian/changelog hippo-canvas-0.2.23/debian/changelog
--- hippo-canvas-0.2.23/debian/changelog
+++ hippo-canvas-0.2.23/debian/changelog
@@ -1,3 +1,14 @@
+hippo-canvas (0.2.23-4.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix implicit pointer conversion: patch python/hippo.override to
+ include hippo/hippo-canvas-test.h. Closes: bug#451395.
+ * Correct maintainer email address in debian/control. Closes:
+ bug#479500.
+ * Remove autogenerated config/hippo-canvas in clean target.
+
+ -- Jonas Smedegaard <[EMAIL PROTECTED]> Wed, 07 May 2008 22:53:12 +0200
+
hippo-canvas (0.2.23-4) unstable; urgency=high
* Fixes segfaults with newest python-cairo. Patch by Patrick Winnertz
only in patch2:
unchanged:
--- hippo-canvas-0.2.23.orig/debian/patches/avoid_implicit_pointer_conversion.patch
+++ hippo-canvas-0.2.23/debian/patches/avoid_implicit_pointer_conversion.patch
@@ -0,0 +1,10 @@
+--- hippo-canvas-0.2.23.orig/python/hippo.override
++++ hippo-canvas-0.2.23/python/hippo.override
+@@ -5,6 +5,7 @@
+
+ #include "pygobject.h"
+ #include "canvas-box-child.h"
++#include "hippo/hippo-canvas-test.h"
+ #include "hippo/hippo-canvas-item.h"
+ #include "hippo/hippo-canvas-container.h"
+ #include "hippo/hippo-canvas-box.h"
signature.asc
Description: Digital signature
