From 4c60af126b716c96feb48522bc38a36529390512 Mon Sep 17 00:00:00 2001
From: Joe Marcus Clarke <marcus@FreeBSD.org>
Date: Sat, 1 Mar 2003 00:43:00 +0000
Subject: Use a better fix for the gcc-2.95.x variable initialization problem.

Obtained from:	gnomesword CVS
---
 misc/gnomesword/Makefile                    |  1 +
 misc/gnomesword/files/patch-src_gs_editor.c | 85 ++++++++++++++++++++++++++---
 2 files changed, 77 insertions(+), 9 deletions(-)

(limited to 'misc/gnomesword')

diff --git a/misc/gnomesword/Makefile b/misc/gnomesword/Makefile
index 4c17512daf38..307224656ad4 100644
--- a/misc/gnomesword/Makefile
+++ b/misc/gnomesword/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		gnomesword
 PORTVERSION=		0.7.8
+PORTREVISION=		1
 CATEGORIES=		misc
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/misc/gnomesword/files/patch-src_gs_editor.c b/misc/gnomesword/files/patch-src_gs_editor.c
index 6bfe1c65d935..54856618521c 100644
--- a/misc/gnomesword/files/patch-src_gs_editor.c
+++ b/misc/gnomesword/files/patch-src_gs_editor.c
@@ -1,22 +1,89 @@
---- src/gs_editor.c.orig	Fri Feb 28 17:32:42 2003
-+++ src/gs_editor.c	Fri Feb 28 17:33:19 2003
-@@ -1252,6 +1252,10 @@
+--- src/gs_editor.c	2003/01/12 00:35:43	1.7
++++ src/gs_editor.c	2003/01/13 16:53:17	1.8
+@@ -52,7 +52,7 @@
+ #include <gtkhtml/htmlcolor.h>
+ #include <gtkhtml/htmlcolorset.h>
+ #include <gtkhtml/htmllinktext.h>
+-#endif		
++#endif
+ 
+ #ifdef USE_SPELL
+ #include "spell.h"
+@@ -392,7 +392,6 @@
+ 		g_warning("file not writen");
+ 	else
+ 		g_warning("file writen");
+-	//g_warning(gstr->str);
+ 
+ 	gtk_text_insert(GTK_TEXT(text), NULL,
+ 			&text->style->black, NULL, gstr->str, -1);
+@@ -428,7 +427,6 @@
+ 		 GSHTMLEditorControlData * ecd)
+ {
+ 	ecd->changed = TRUE;
+-	//file_changed = TRUE;
+ 	updatestatusbar(ecd);
+ 	return 1;
+ }
+@@ -511,7 +509,7 @@
+ GtkWidget *create_editor(GtkWidget * htmlwidget, GtkWidget * vbox,
+ 			 SETTINGS * s, GSHTMLEditorControlData * necd)
+ {
+-	GtkWidget * frame34, *scrolledwindow17;
++	GtkWidget *frame34, *scrolledwindow17;
+ 
+ 	frame34 = gtk_frame_new(NULL);
+ 	gtk_widget_ref(frame34);
+@@ -1251,22 +1249,25 @@
+ set_link_to_module(gchar * linkref, gchar * linkmod,
  		   GSHTMLEditorControlData * ecd)
  {
- 	gchar buf[256], *target = "";
-+#ifdef USE_GTKHTML1
+-	gchar buf[256], *target = "";
 +	const gchar *url;
 +	const gchar *text;
-+#endif
++	gchar *target;
++	gchar *url_copy;
++	gchar buf[256];
++	HTMLEngine *e;
++	HTMLObject *new_link;
++
++	e = ecd->html->engine;
  	
- 	HTMLEngine *e = ecd->html->engine;	
+-	HTMLEngine *e = ecd->html->engine;	
  	if (strlen(linkmod))
-@@ -1260,8 +1264,6 @@
+ 		sprintf(buf, "version=%s passage=%s", linkmod, linkref);
+ 	else
  		sprintf(buf, "passage=%s", linkref);
- 	
+-	
++
  #ifdef USE_GTKHTML1
 -	const gchar *url;
 -	const gchar *text;
  	url = buf;
  	text = linkref;
  	if (url && text && *url && *text) {
+-		HTMLObject *new_link;
+-		gchar *url_copy;
+ 		target = strchr(url, '#');
+ 		url_copy =
+ 		    target ? g_strndup(url,
+@@ -1274,14 +1275,17 @@
+ 		new_link =
+ 		    html_link_text_new(text,
+ 				       GTK_HTML_FONT_STYLE_DEFAULT,
+-				       html_colorset_get_color(e->settings->color_set,
+-							       HTMLLinkColor),
++				       html_colorset_get_color(e->
++							settings->
++							color_set,
++							HTMLLinkColor),
+ 				       url_copy, target);
+ 		html_engine_paste_object(e, new_link,
+ 					 g_utf8_strlen(text, -1));
+ 		g_free(url_copy);
+ 	}
+ #else
++	target = "";
+ 	html_engine_selection_push(e);
+ 	html_engine_insert_link(e, buf, target);
+ 	html_engine_selection_pop(e);
-- 
cgit v1.2.3