From 8cb8276f43f79a70b4c07e0b2ed0d90f9b744d4a Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Tue, 9 Aug 2005 20:19:52 +0000 Subject: [PATCH] * sources/Makefile.am: remove gda/gnomedb * sources/gda.patch, sources/gnomedb.patch: gone svn path=/trunk/gtk-sharp/; revision=48202 --- ChangeLog | 4 ++++ sources/Makefile.am | 8 ++------ sources/gda.patch | 15 --------------- sources/gnomedb.patch | 22 ---------------------- 4 files changed, 6 insertions(+), 43 deletions(-) delete mode 100644 sources/gda.patch delete mode 100644 sources/gnomedb.patch diff --git a/ChangeLog b/ChangeLog index fe3d8565a..e21bc3619 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,10 @@ * gda/, gnomedb/: buh-bye + * sources/Makefile.am: remove gda/gnomedb + + * sources/gda.patch, sources/gnomedb.patch: gone + 2005-08-09 Dan Winship * generator/ClassBase.cs (Validate): Don't fully validate the diff --git a/sources/Makefile.am b/sources/Makefile.am index 332fabf2e..495774c99 100644 --- a/sources/Makefile.am +++ b/sources/Makefile.am @@ -3,8 +3,6 @@ EXTRA_DIST = \ gtk-sharp-2.4-sources.xml \ gtk-sharp-2.6-sources.xml \ gtk-sharp-2.8-sources.xml \ - gda.patch \ - gnomedb.patch \ gtkclipboard.patch \ gtk_tree_model_signal_fix.patch \ gtkhtml-font-style-enum.patch @@ -50,8 +48,6 @@ GNOME_DOWNLOADS = \ http://ftp.gnome.org/pub/GNOME/desktop/2.6/2.6.0/sources/libglade-2.3.6.tar.bz2 \ http://ftp.gnome.org/pub/GNOME/desktop/2.6/2.6.0/sources/libart_lgpl-2.3.16.tar.bz2 \ http://ftp.gnome.org/pub/GNOME/desktop/2.6/2.6.0/sources/librsvg-2.6.4.tar.bz2 \ - http://ftp.gnome.org/pub/GNOME/sources/libgda/1.0/libgda-1.0.0.tar.bz2 \ - http://ftp.gnome.org/pub/GNOME/sources/libgnomedb/1.0/libgnomedb-1.0.0.tar.bz2 \ http://ftp.gnome.org/pub/GNOME/desktop/2.6/2.6.0/sources/vte-0.11.10.tar.bz2 GTKHTML_SOURCEFILES = \ @@ -108,6 +104,6 @@ get-gnome-sources: for i in $(GNOME_DOWNLOADS); do \ wget $$i --output-document=- | tar -xj ; \ done; - patch -p0 libgnomedb-1.0.0/libgnomedb/gnome-db-list.c < gnomedb.patch - patch -p0 libgda-1.0.0/libgda/gda-export.c < gda.patch + + diff --git a/sources/gda.patch b/sources/gda.patch deleted file mode 100644 index c4234a0bc..000000000 --- a/sources/gda.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- gda-export.c 2004-11-13 00:25:44.396760885 -0600 -+++ libgda-1.0.0/libgda/gda-export.c 2004-11-13 00:23:58.405595352 -0600 -@@ -213,10 +213,10 @@ - G_TYPE_NONE, 2, - G_TYPE_INT, G_TYPE_STRING); - gda_export_signals[CANCELLED] = -- g_signal_new ("finished", -+ g_signal_new ("cancelled", - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST, -- G_STRUCT_OFFSET (GdaExportClass, finished), -+ G_STRUCT_OFFSET (GdaExportClass, cancelled), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); diff --git a/sources/gnomedb.patch b/sources/gnomedb.patch deleted file mode 100644 index cbd964ec5..000000000 --- a/sources/gnomedb.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- gnome-db-list.c 2004-11-13 00:01:42.391981026 -0600 -+++ libgnomedb-1.0.0/libgnomedb/gnome-db-list.c 2004-11-13 00:02:10.172354404 -0600 -@@ -111,7 +111,7 @@ - g_signal_new ("selection_cleared", - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST, -- G_STRUCT_OFFSET (GnomeDbGridClass, row_selected), -+ G_STRUCT_OFFSET (GnomeDbGridClass, selection_cleared), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); ---- libgnomedb-1.0.0/libgnomedb/gnome-db-editor.h.orig 2005-02-23 13:50:59.509288486 -0500 -+++ libgnomedb-1.0.0/libgnomedb/gnome-db-editor.h 2005-02-23 13:50:51.247345662 -0500 -@@ -29,7 +29,7 @@ - - #define GNOME_DB_TYPE_EDITOR (gnome_db_editor_get_type()) - #define GNOME_DB_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj, GNOME_DB_TYPE_EDITOR, GnomeDbEditor)) --#define GNOME_DB_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass, GNOME_DB_TYPE_EDITOR, GnomeDbEditor)) -+#define GNOME_DB_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass, GNOME_DB_TYPE_EDITOR, GnomeDbEditorClass)) - #define GNOME_DB_IS_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj, GNOME_DB_TYPE_EDITOR)) - #define GNOME_DB_IS_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_DB_TYPE_EDITOR)) -