rpms/gnomesword/devel gnomesword-gcc44.patch, NONE, 1.1 gnomesword.spec, 1.53, 1.54

[Miloš Jakubíček]

Author: mjakubicek

Update of /cvs/pkgs/rpms/gnomesword/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15740/devel

Modified Files:
	gnomesword.spec 
Added Files:
	gnomesword-gcc44.patch 
Log Message:
- Fix FTBFS: added gnomesword-gcc44.patch



gnomesword-gcc44.patch:

--- NEW FILE gnomesword-gcc44.patch ---
--- src/gecko/gecko-html.cpp.orig	2009-04-24 11:06:40.000000000 +0200
+++ src/gecko/gecko-html.cpp	2009-04-24 11:19:55.000000000 +0200
@@ -214,7 +214,7 @@
 
 	GeckoHtml *html = GECKO_HTML(embed);
 	GeckoHtmlPriv *priv = GECKO_HTML_GET_PRIVATE(html);
-	gchar *buf, *place;
+	const gchar *buf, *place;
 	gchar tmpbuf[1023];
 	gchar book[32];
 	GString *tmpstr = g_string_new(NULL);
--- src/main/sword.cc.orig	2009-04-24 11:24:29.000000000 +0200
+++ src/main/sword.cc	2009-04-24 11:28:43.000000000 +0200
@@ -184,9 +184,9 @@
 	// This is a sick. unreliable hack that should be removed
 	// after the underlying problem is fixed in Sword.
 	gchar *rework;
-	for (rework = strstr(note_str, "%20");
+	for (rework = (gchar *) strstr(note_str, "%20");
 	     rework;
-	     rework = strstr(rework+1, "%20")) {
+	     rework = (gchar *) strstr(rework+1, "%20")) {
 		*rework = ' ';
 		(void) strcpy(rework+1, rework+3);
 	}
--- src/main/url.cc.orig	2009-04-24 11:29:57.000000000 +0200
+++ src/main/url.cc	2009-04-24 11:30:27.000000000 +0200
@@ -1025,7 +1025,7 @@
 		 strstr(url, "gnomesword.url")) {
 
 		// another minor nightmare: re-encode / and : in hex.
-		gchar *place;
+		const gchar *place;
 		gchar tmpbuf[1023];
 		GString *tmpstr = g_string_new(NULL);
 
--- src/main/display.cc.orig	2009-04-24 11:20:27.000000000 +0200
+++ src/main/display.cc	2009-04-24 11:55:28.000000000 +0200
@@ -192,9 +192,9 @@
 	resized = "";
 	trail = text;
 
-	for (path = strcasestr(text, "<img src=\"");
+	for (path = (char *) strcasestr(text, "<img src=\"");
 	     path;
-	     path = strcasestr(path, "<img src=\"")) {
+	     path = (char *) strcasestr(path, "<img src=\"")) {
 
 		if (window_y == -999) {
 			/* we have images, but we don't know bounds yet */
@@ -512,7 +512,8 @@
 	   const char **morph)
 {
 	int wlen, slen, mlen, min_length;
-	char *s, *s0, *t;
+	char *s, *s0;
+	const char *t;
 
 	// unannotated words need no help.
 	if (*word && (*strongs == NULL) && (*morph == NULL)) {
@@ -531,11 +532,11 @@
 
 	rendered += "<span class=\"word\">";
 	if (*strongs) {
-		s = g_strrstr(*strongs, "</a>");
+		s = (char *) g_strrstr(*strongs, "</a>");
 		*s = '\0';
 		t = strrchr(*strongs, '>') + 1;
 		// correct weird NASB lexicon references.
-		if (s0 = strchr(*strongs, '!')) {
+		if (s0 = (char *) strchr(*strongs, '!')) {
 			do {
 				*s0 = *(s0+1);
 				++s0;
@@ -545,30 +546,30 @@
 		*s = '<';
 		slen = s - t;
 #ifdef USE_GTKMOZEMBED
-		s = strstr(*strongs, "<");
+		s = (char *) strstr(*strongs, "<");
 		*s = *(s+1) = *(s+2) = *(s+3) = ' ';
-		s = strstr(s, ">");
+		s = (char *) strstr(s, ">");
 		*s = *(s+1) = *(s+2) = *(s+3) = ' ';
 #endif /* USE_GTKMOZEMBED */
 	} else
 		slen = 0;
 	if (*morph) {
-		s = s0 = strstr(*morph, "\">") + 2;
+		s = s0 = (char *) strstr(*morph, "\">") + 2;
 		t = strchr(s, '<');
 		for (/* */; s < t; ++s)
 			if (isupper(*s))
 				*s = tolower(*s);
-		for (s = strchr(s0, ' '); s && (s < t); s = strchr(s, ' '))
+		for (s = (char *) strchr(s0, ' '); s && (s < t); s = (char *) strchr(s, ' '))
 			*s = '-';
-		s = g_strrstr(*morph, "</a>");
+		s = (char *) g_strrstr(*morph, "</a>");
 		*s = '\0';
-		t = strrchr(*morph, '>') + 1;
+		t = (char *) strrchr(*morph, '>') + 1;
 		*s = '<';
 		mlen = s - t;
 #ifdef USE_GTKMOZEMBED
-		s = strchr(*morph, '(');
+		s = (char *) strchr(*morph, '(');
 		*s = ' ';
-		s = strrchr(s, ')');
+		s = (char *) strrchr(s, ')');
 		*s = ' ';
 #endif /* USE_GTKMOZEMBED */
 	} else


Index: gnomesword.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnomesword/devel/gnomesword.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- gnomesword.spec	24 Feb 2009 23:47:56 -0000	1.53
+++ gnomesword.spec	24 Apr 2009 10:12:07 -0000	1.54
@@ -1,12 +1,14 @@
 Name:		gnomesword           
 Version:	2.4.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	GNOME-based Bible research tool
 
 Group:		Applications/Text
 License:	GPLv2+
 URL:		http://gnomesword.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/gnomesword/gnomesword-%{version}.tar.gz
+Patch0:		%{name}-gcc44.patch
+# Not upstreamed, package outdated, filed as BZ#497497
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	sword-devel >= 1.5.11
@@ -33,10 +35,11 @@
 
 %prep
 %setup -q
+%patch0
 
 %build
 %configure
-make %{?_smp_mflags}
+make -k %{?_smp_mflags}
 
 %install
 rm -rf %buildroot
@@ -77,6 +80,9 @@
 %_datadir/gnome/help/gnomesword/
 
 %changelog
+* Fri Apr 24 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 2.4.1-3
+- Fix FTBFS: added gnomesword-gcc44.patch
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild