packages: xiphos/xiphos.spec, xiphos/xiphos-xulrunner.patch (NEW) -m Added ...

Fri May 28 09:49:03 CEST 2010

Author: caleb                        Date: Fri May 28 07:49:03 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
-m Added patch for issue in xulrunner. Patch is applied upstream, but current version being re-released with patch on Fedora and Ubuntu.

---- Files affected:
packages/xiphos:
   xiphos.spec (1.8 -> 1.9) , xiphos-xulrunner.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/xiphos/xiphos.spec
diff -u packages/xiphos/xiphos.spec:1.8 packages/xiphos/xiphos.spec:1.9

--- packages/xiphos/xiphos.spec:1.8	Tue May 25 15:41:46 2010
+++ packages/xiphos/xiphos.spec	Fri May 28 09:48:58 2010
@@ -2,12 +2,13 @@
 Summary:	GNOME-based Bible research tool
 Name:		xiphos
 Version:	3.1.3
-Release:	0.1
+Release:	0.2
 License:	GPL
 Group:		X11/Applications
 URL:		http://www.xiphos.org/
 Source0:	http://downloads.sourceforge.net/gnomesword/Xiphos/%{version}/%{name}-%{version}.tar.gz
 # Source0-md5:	aaded6bc81b29935edd989d204928ba3
+Patch0:		%{name}-xulrunner.patch
 BuildRequires:	clucene-core-devel
 BuildRequires:	gnome-spell
 BuildRequires:	gtkhtml-devel >= 3.0
@@ -36,6 +37,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 %configure
@@ -80,6 +82,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2010/05/28 07:48:58  caleb
+-m Added patch for issue in xulrunner. Patch is applied upstream, but current version being re-released with patch on Fedora and Ubuntu.
+
 Revision 1.8  2010/05/25 13:41:46  glen
 - .ico is for win32 only
 - drop .xpm (.png is enough)

================================================================
Index: packages/xiphos/xiphos-xulrunner.patch
diff -u /dev/null packages/xiphos/xiphos-xulrunner.patch:1.1
--- /dev/null	Fri May 28 09:49:03 2010
+++ packages/xiphos/xiphos-xulrunner.patch	Fri May 28 09:48:58 2010
@@ -0,0 +1,47 @@
+--- src/main/export_passage.cc.orig	2010-03-13 21:59:08.000000000 -0500
++++ src/main/export_passage.cc	2010-05-27 12:55:56.968451561 -0400
+@@ -37,7 +37,7 @@
+ #include "main/sword.h"
+ 
+ 
+-#define HTML_START "<HTML><HEAD><META HTTP-EQUIV=\"content-type\" CONTENT=\"text/html; CHARSET=utf-8\"><STYLE TYPE=\"text/css\"><!-- A { text-decoration:none } %s --></STYLE></HEAD><BODY>"
++#define HTML_START "<html><head><meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\"><style type=\"text/css\"><!-- A { text-decoration:none } %s --></style></head><body>"
+ 
+ enum {
+         TARGET_HTML,
+--- src/gnome2/utilities.c.orig	2010-03-19 13:01:57.000000000 -0400
++++ src/gnome2/utilities.c	2010-05-27 12:55:56.969460768 -0400
+@@ -1202,6 +1202,33 @@
+ 		gtk_html_set_editable(html, FALSE);
+ #endif
+ 
++#ifdef USE_GTKMOZEMBED
++	// EVIL EVIL EVIL EVIL.
++	// crazy nonsense with xulrunner 1.9.2.3, failure to jump to anchor.
++	// force the issue by stuffing a javascript snippet inside <head></head>.
++	// there are forms of evil so dark that they should not be contemplated.
++	if (anchor || settings.special_anchor) {
++		gchar *buf;
++
++		// first, scribble out everything up to the closing </head>.
++		buf = strstr(text, "</head>");	// yes, lowercase.
++		assert(buf != NULL);	// don't be so stupid as not to include <head></head>.
++		offset = buf - text;
++		gecko_html_write(html, text, offset);
++		len -= offset;
++
++		// now write the javascript snippet.
++		buf = g_strdup_printf(
++		    "<script type=\"text/javascript\" language=\"javascript\">"
++		    " window.onload = function () { window.location.hash = \"%s\"; }"
++		    " </script>", (settings.special_anchor
++				   ? settings.special_anchor
++				   : anchor));
++		gecko_html_write(html, buf, strlen(buf));
++		g_free(buf);
++	}
++#endif /* USE_GTKMOZEMBED */
++
+ 	// html widgets are uptight about being handed
+ 	// huge quantities of text -- producer/consumer problem,
+ 	// and we mustn't overload the receiver.  10k chunks.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xiphos/xiphos.spec?r1=1.8&r2=1.9&f=u

