rpms/devhelp/devel devhelp-load-uris.patch, NONE, 1.1 devhelp.spec, 1.103, 1.104

[Bastien Nocera]

Author: hadess

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

Modified Files:
	devhelp.spec 
Added Files:
	devhelp-load-uris.patch 
Log Message:
* Mon Feb 16 2009 - Bastien Nocera <bnocera at redhat.com> - 0.23-3
- Fix displaying web pages, WebKit doesn't like local filenames as URIs


devhelp-load-uris.patch:

--- NEW FILE devhelp-load-uris.patch ---
Index: src/dh-parser.c
===================================================================
--- src/dh-parser.c	(revision 1263)
+++ src/dh-parser.c	(working copy)
@@ -66,6 +66,7 @@
 {
         gint         i;
         gint         line, col;
+        gchar       *tmp_base;
         const gchar *title = NULL;
         const gchar *base = NULL;
         const gchar *name = NULL;
@@ -126,11 +127,18 @@
         }
 
         if (base) {
-                parser->base = g_strdup (base);
+                tmp_base = g_strdup (base);
         } else {
-                parser->base = g_path_get_dirname (parser->path);
+                tmp_base = g_path_get_dirname (parser->path);
         }
+        parser->base = g_filename_to_uri (tmp_base, NULL, NULL);
 
+        /* In case the conversion didn't work */
+        if (parser->base)
+        	g_free (tmp_base);
+	else
+		parser->base = tmp_base;
+
         link = dh_link_new (DH_LINK_TYPE_BOOK,
                             parser->base,
                             name,


Index: devhelp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/devhelp/devel/devhelp.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- devhelp.spec	24 Jan 2009 00:11:32 -0000	1.103
+++ devhelp.spec	16 Feb 2009 15:51:20 -0000	1.104
@@ -29,6 +29,9 @@
 BuildRequires: gtk2-devel
 BuildRequires: WebKit-gtk-devel
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=572022
+Patch0: devhelp-load-uris.patch
+
 %description
 Devhelp is an API documentation browser for the GNOME desktop. 
 It works natively with API documentation generated by gtk-doc.
@@ -49,6 +52,7 @@
 
 %prep
 %setup -q -n devhelp-%{version}
+%patch0 -p0 -b .uris
 
 %build
 %configure --disable-static
@@ -132,6 +136,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Feb 16 2009 - Bastien Nocera <bnocera at redhat.com> - 0.23-3
+- Fix displaying web pages, WebKit doesn't like local filenames as URIs
+
 * Fri Jan 23 2009 Matthias Clasen  <mclasen at redhat.com> - 0.23-2
 - Cosmetic spec fixes