rpms/mono-tools/F-12 mono-tools-2.4.2-webkit.patch, NONE, 1.1 mono-tools.spec, 1.42, 1.43

[chkr]

Author: chkr

Update of /cvs/pkgs/rpms/mono-tools/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8871

Modified Files:
	mono-tools.spec 
Added Files:
	mono-tools-2.4.2-webkit.patch 
Log Message:
* Wed Nov 25 2009 Christian Krause <chkr at fedoraproject.org> - 2.4.2-7
- Fix monodoc crash when using WebKit html renderer (BZ 538555)


mono-tools-2.4.2-webkit.patch:
 WebKitHtmlRender.cs |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE mono-tools-2.4.2-webkit.patch ---
--- trunk/mono-tools/docbrowser/WebKitHtmlRender.cs	2008/06/15 19:55:23	105868
+++ trunk/mono-tools/docbrowser/WebKitHtmlRender.cs	2009/10/13 00:54:21	143994
@@ -31,6 +31,8 @@
 		web_view = new WebView ();
 		web_view.Show (); 
 		web_view.NavigationRequested += delegate (object sender, NavigationRequestedArgs e) {
+			if (e.Request.Uri == "about:blank")
+				return;
 			url = e.Request.Uri;
 			if (UrlClicked != null)
 				UrlClicked (this, new EventArgs());



Index: mono-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-tools/F-12/mono-tools.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- mono-tools.spec	26 Oct 2009 22:04:56 -0000	1.42
+++ mono-tools.spec	26 Nov 2009 07:21:39 -0000	1.43
@@ -3,10 +3,13 @@
 Summary: A collection of tools for mono applications
 Name: mono-tools
 Version: 2.4.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: MIT
 Group: Development/Tools
 Source0: %{name}-%{version}.tar.bz2
+# patch from upstream to fix crash in monodoc when using WebKit html renderer
+# http://anonsvn.mono-project.com/viewvc/trunk/mono-tools/docbrowser/WebKitHtmlRender.cs?r1=105868&r2=143994&view=patch
+Patch1: mono-tools-2.4.2-webkit.patch
 URL: http://mono.ximian.com/monobuild/preview/sources-preview/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  mono-data, mono-devel >= 2.4.2, gtk-sharp2-gapi, pkgconfig mono-nunit
@@ -43,6 +46,7 @@ Documentation for monotools for use with
 
 %prep
 %setup -q 
+%patch1 -p2 -b .webkit
 
 find . -name Makefile.in -or -name Makefile.am -or -name \*.pc.in \
        -or -name \*.make -or -name \*.in \
@@ -135,6 +139,9 @@ desktop-file-install --vendor fedora \
 %{_libdir}/monodoc/web/*
 
 %changelog
+* Wed Nov 25 2009 Christian Krause <chkr at fedoraproject.org> - 2.4.2-7
+- Fix monodoc crash when using WebKit html renderer (BZ 538555)
+
 * Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 2.4.2-6
 - exclude sparc64