rpms/devhelp/F-10 devhelp-load-uris.patch, NONE, 1.1 devhelp.spec, 1.101, 1.102 devhelp-0.19-xulrunner.patch, 1.2, NONE

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/devhelp/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14941

Modified Files:
	devhelp.spec 
Added Files:
	devhelp-load-uris.patch 
Removed Files:
	devhelp-0.19-xulrunner.patch 
Log Message:
* Mon Feb 16 2009 - Bastien Nocera <bnocera at redhat.com> - 0.22-4
- Remove gecko BRs
- 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/F-10/devhelp.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- devhelp.spec	4 Feb 2009 18:56:13 -0000	1.101
+++ devhelp.spec	16 Feb 2009 15:48:13 -0000	1.102
@@ -1,5 +1,4 @@
 # Last updated for 0.22
-%define gecko_version 1.9.0.6
 %define gtk2_version 2.10.0
 %define libwnck_version 2.10.0
 
@@ -7,7 +6,7 @@
 
 Name: devhelp
 Version: 0.22
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Summary: API document browser
@@ -21,18 +20,18 @@
 Requires(preun): GConf2 >= 2.14
 Requires(post): GConf2 >= 2.14
 
-Requires: gecko-libs = %{gecko_version}
-
 ### Build Dependencies ###
 
 BuildRequires: desktop-file-utils >= 0.3
-BuildRequires: gecko-devel-unstable = %{gecko_version}
 BuildRequires: gettext
 BuildRequires: intltool
 BuildRequires: libgnomeui-devel >= 2.2.0
 BuildRequires: libwnck-devel >= %{libwnck_version}
 BuildRequires: WebKit-gtk-devel
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=572022
+Patch0: devhelp-load-uris.patch
+
 %description
 An API document browser for GNOME 2.
 
@@ -52,9 +51,10 @@
 
 %prep
 %setup -q -n devhelp-%{version}
+%patch0 -p0 -b .uris
 
 %build
-%configure --disable-static --with-gecko=libxul-embedding
+%configure --disable-static
 make %{?_smp_mflags}
 
 %install
@@ -135,6 +135,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Feb 16 2009 - Bastien Nocera <bnocera at redhat.com> - 0.22-4
+- Remove gecko BRs
+- Fix displaying web pages, WebKit doesn't like local filenames as URIs
+
 * Wed Feb 04 2009 Christopher Aillon <caillon at redhat.com> - 0.22-3
 - Rebuild against newer gecko
 


--- devhelp-0.19-xulrunner.patch DELETED ---