rpms/xiphos/devel xiphos-xul-1.9.2.patch, NONE, 1.1 xiphos.spec, 1.8, 1.9

[Deji Akingunola]

Author: deji

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

Modified Files:
	xiphos.spec 
Added Files:
	xiphos-xul-1.9.2.patch 
Log Message:
* Sat Mar 13 2010 Deji Akingunola <dakingun at gmail.com> - 3.1.2-3
- Backport upstream patch to fix bug with xulrunner-1.9.2.


xiphos-xul-1.9.2.patch:
 gecko-html.cpp |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE xiphos-xul-1.9.2.patch ---
--- trunk/src/gecko/gecko-html.cpp	2009/12/26 17:37:13	3622
+++ trunk/src/gecko/gecko-html.cpp	2010/03/13 06:31:07	3720
@@ -221,6 +221,10 @@
 {
 	g_return_val_if_fail(uri != NULL, FALSE);
 
+	//for xulrunner 1.9.2
+	if (g_str_equal (uri, "file:///"))
+	    return FALSE;
+
 	GeckoHtml *html = GECKO_HTML(embed);
 	GeckoHtmlPriv *priv = GECKO_HTML_GET_PRIVATE(html);
 	gchar *buf, *place;


Index: xiphos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xiphos/devel/xiphos.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- xiphos.spec	7 Mar 2010 05:35:28 -0000	1.8
+++ xiphos.spec	14 Mar 2010 05:08:29 -0000	1.9
@@ -1,12 +1,13 @@
 Name:		xiphos 
 Version:	3.1.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Bible study and research tool
 
 Group:		Applications/Text
 License:	GPLv2+
 URL:		http://xiphos.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/gnomesword/xiphos-%{version}.tar.gz
+Patch0:		xiphos-xul-1.9.2.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	sword-devel >= 1.5.11
@@ -33,6 +34,7 @@ Project and elsewhere.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure
@@ -85,6 +87,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %_datadir/gnome/help/xiphos
 
 %changelog
+* Sat Mar 13 2010 Deji Akingunola <dakingun at gmail.com> - 3.1.2-3
+- Backport upstream patch to fix bug with xulrunner-1.9.2.
+
 * Sat Mar 07 2010 Deji Akingunola <dakingun at gmail.com> - 3.1.2-2
 - Rebuild with current xulrunner to fix crashes.