Added two patches needed for gcc-2.95. Approved by jlam.

3 files changed, 89 insertions, 1 deletions

diff --git a/devel/gal2/distinfo b/devel/gal2/distinfo
index 199f771ef9e..f267057b1ef 100644
--- a/devel/gal2/distinfo
+++ b/devel/gal2/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.13 2005/03/26 16:16:54 jmmv Exp $
+$NetBSD: distinfo,v 1.14 2005/04/12 00:49:40 rillig Exp $
 
 SHA1 (gal-2.4.1.tar.bz2) = 904d739146daeb7f020a0d29be9f8ccb7fdd319f
 RMD160 (gal-2.4.1.tar.bz2) = 3a69d2580a16a31fb05216a8a56fd0a29c268b33
 Size (gal-2.4.1.tar.bz2) = 1196797 bytes
+SHA1 (patch-aa) = a455fb6350eea73e031c75ec9bdf408cb4465db5
+SHA1 (patch-ab) = a8050973a7dc136c842550a4b01ac20032f2891f
diff --git a/devel/gal2/patches/patch-aa b/devel/gal2/patches/patch-aa
new file mode 100644
index 00000000000..590dfe4c68e
--- /dev/null
+++ b/devel/gal2/patches/patch-aa
@@ -0,0 +1,35 @@
+$NetBSD: patch-aa,v 1.4 2005/04/12 00:49:40 rillig Exp $
+
+Needed for gcc-2.95.
+
+--- gal/a11y/e-table/gal-a11y-e-cell-text.c.orig	Mon Feb 28 14:59:18 2005
++++ gal/a11y/e-table/gal-a11y-e-cell-text.c	Mon Apr 11 00:40:39 2005
+@@ -151,12 +151,12 @@ ect_get_character_at_offset (AtkText *te
+ {
+ 	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
+ 	gunichar ret_val;
+-	gchar *at_offset;
++	gchar *at_offset, *full_text;
+ 
+ 	if (!ect_check (text))
+ 		return -1;
+ 
+-	gchar *full_text = e_cell_text_get_text_by_view (gaec->cell_view, gaec->model_col, gaec->row);
++	full_text = e_cell_text_get_text_by_view (gaec->cell_view, gaec->model_col, gaec->row);
+ 	at_offset = g_utf8_offset_to_pointer (full_text, offset);
+ 	ret_val = g_utf8_get_char_validated (at_offset, -1);
+ 	g_free (full_text);
+@@ -236,11 +236,12 @@ ect_get_character_count (AtkText *text)
+ {
+ 	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
+ 	gint ret_val;
++	gchar *full_text;
+ 
+ 	if (!ect_check (text))
+ 		return -1;
+ 
+-	gchar *full_text = e_cell_text_get_text_by_view (gaec->cell_view, gaec->model_col, gaec->row);
++	full_text = e_cell_text_get_text_by_view (gaec->cell_view, gaec->model_col, gaec->row);
+ 
+ 	ret_val = g_utf8_strlen (full_text, -1);
+ 	g_free (full_text);
diff --git a/devel/gal2/patches/patch-ab b/devel/gal2/patches/patch-ab
new file mode 100644
index 00000000000..c47c9595dae
--- /dev/null
+++ b/devel/gal2/patches/patch-ab
@@ -0,0 +1,51 @@
+$NetBSD: patch-ab,v 1.3 2005/04/12 00:49:41 rillig Exp $
+
+Needed for gcc-2.95.
+
+--- gal/a11y/e-table/gal-a11y-e-cell-vbox.c.orig	Thu Jan 27 06:28:27 2005
++++ gal/a11y/e-table/gal-a11y-e-cell-vbox.c	Mon Apr 11 00:43:09 2005
+@@ -31,8 +31,9 @@ static AtkComponentIface *component_pare
+ static gint
+ ecv_get_n_children (AtkObject *a11y)
+ {
++	GalA11yECellVbox *gaev;
+ 	g_return_val_if_fail (GAL_A11Y_IS_E_CELL_VBOX (a11y), 0);
+-	GalA11yECellVbox *gaev = GAL_A11Y_E_CELL_VBOX (a11y);
++	gaev = GAL_A11Y_E_CELL_VBOX (a11y);
+ 	return (gaev->a11y_subcell_count);
+ }
+ 
+@@ -63,10 +64,11 @@ ecv_ref_child (AtkObject *a11y, gint i)
+ 	AtkObject *ret;
+ 	if (i < gaev->a11y_subcell_count) {
+ 		if (gaev->a11y_subcells[i] == NULL) {
++			ECellView *subcell_view;
+ 			gint model_col, row;
+ 			row = gaec->row;
+ 			model_col = ecvv->model_cols[i];
+-			ECellView *subcell_view = ecvv->subcell_views[i];
++			subcell_view = ecvv->subcell_views[i];
+ 			ret = gal_a11y_e_cell_registry_get_object (NULL,
+ 				gaec->item,
+ 				subcell_view,
+@@ -200,14 +202,17 @@ AtkObject *gal_a11y_e_cell_vbox_new	(ETa
+ 					 int         row)
+ {
+ 	AtkObject *a11y;
++	GalA11yECell *gaec;
++	GalA11yECellVbox *gaev;
++	ECellVboxView *ecvv;
+ 
+ 	a11y = g_object_new (gal_a11y_e_cell_vbox_get_type (), NULL);
+ 	
+ 	gal_a11y_e_cell_construct (a11y, item, cell_view, parent, model_col, view_col, row);
+ 
+-	GalA11yECell *gaec = GAL_A11Y_E_CELL (a11y);
+-	GalA11yECellVbox *gaev = GAL_A11Y_E_CELL_VBOX (a11y);
+-	ECellVboxView *ecvv = (ECellVboxView *) (gaec->cell_view);
++	gaec = GAL_A11Y_E_CELL (a11y);
++	gaev = GAL_A11Y_E_CELL_VBOX (a11y);
++	ecvv = (ECellVboxView *) (gaec->cell_view);
+ 	gaev->a11y_subcell_count = ecvv->subcell_view_count; 
+ 	gaev->a11y_subcells = g_malloc0 (sizeof(AtkObject *)*gaev->a11y_subcell_count);
+ 	return a11y;