#! /bin/sh /usr/share/dpatch/dpatch-run ## ubuntu_fix-libeog-build.dpatch by Matvey Kozhev ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Add missing header to libeog/image-view.h. @DPATCH@ diff -urNad f-spot-0.4.4~/libeog/image-view.h f-spot-0.4.4/libeog/image-view.h --- f-spot-0.4.4~/libeog/image-view.h 2008-05-07 19:35:31.000000000 +0700 +++ f-spot-0.4.4/libeog/image-view.h 2008-07-19 16:22:11.000000000 +0700 @@ -57,10 +57,10 @@ #define TYPE_IMAGE_VIEW (image_view_get_type ()) -#define IMAGE_VIEW(obj) (GTK_CHECK_CAST ((obj), TYPE_IMAGE_VIEW, ImageView)) -#define IMAGE_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), TYPE_IMAGE_VIEW, ImageViewClass)) -#define IS_IMAGE_VIEW(obj) (GTK_CHECK_TYPE ((obj), TYPE_IMAGE_VIEW)) -#define IS_IMAGE_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_IMAGE_VIEW)) +#define IMAGE_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_IMAGE_VIEW, ImageView)) +#define IMAGE_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_IMAGE_VIEW, ImageViewClass)) +#define IS_IMAGE_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_IMAGE_VIEW)) +#define IS_IMAGE_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_IMAGE_VIEW)) typedef struct _ImageView ImageView; typedef struct _ImageViewClass ImageViewClass; @@ -94,7 +94,7 @@ #endif }; -GtkType image_view_get_type (void); +GType image_view_get_type (void); GtkWidget *image_view_new (void); diff -urNad f-spot-0.4.4~/libeog/ui-image.c f-spot-0.4.4/libeog/ui-image.c --- f-spot-0.4.4~/libeog/ui-image.c 2008-05-07 19:35:31.000000000 +0700 +++ f-spot-0.4.4/libeog/ui-image.c 2008-07-19 16:20:31.000000000 +0700 @@ -60,7 +60,7 @@ * * Return value: the type ID of the #UIImage class. **/ -GtkType +GType ui_image_get_type (void) { static GType ui_image_type = 0; diff -urNad f-spot-0.4.4~/libeog/ui-image.h f-spot-0.4.4/libeog/ui-image.h --- f-spot-0.4.4~/libeog/ui-image.h 2008-05-07 19:35:31.000000000 +0700 +++ f-spot-0.4.4/libeog/ui-image.h 2008-07-19 16:22:54.000000000 +0700 @@ -27,10 +27,10 @@ G_BEGIN_DECLS #define TYPE_UI_IMAGE (ui_image_get_type ()) -#define UI_IMAGE(obj) (GTK_CHECK_CAST ((obj), TYPE_UI_IMAGE, UIImage)) -#define UI_IMAGE_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), TYPE_UI_IMAGE, UIImageClass)) -#define IS_UI_IMAGE(obj) (GTK_CHECK_TYPE ((obj), TYPE_UI_IMAGE)) -#define IS_UI_IMAGE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_UI_IMAGE)) +#define UI_IMAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_UI_IMAGE, UIImage)) +#define UI_IMAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_UI_IMAGE, UIImageClass)) +#define IS_UI_IMAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_UI_IMAGE)) +#define IS_UI_IMAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_UI_IMAGE)) typedef struct _UIImage UIImage; @@ -50,7 +50,7 @@ }; -GtkType ui_image_get_type (void); +GType ui_image_get_type (void); GtkWidget *ui_image_new (void); GtkWidget *ui_image_construct (UIImage *ui);