Merge GNOME git commit a5588114ed94d00ca64913aa5b248e09a5e13edc.

Fixes compatibility issues with xulrunner-1.9.2.

6 files changed, 107 insertions, 3 deletions

diff --git a/misc/yelp/Makefile b/misc/yelp/Makefile
index 294a7d8cd2e..96edb306c3c 100644
--- a/misc/yelp/Makefile
+++ b/misc/yelp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.87 2010/01/18 09:59:16 wiz Exp $
+# $NetBSD: Makefile,v 1.88 2010/02/13 12:26:15 tnn Exp $
 #
 
 DISTNAME=		yelp-2.28.1
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		misc gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/yelp/2.28/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/misc/yelp/distinfo b/misc/yelp/distinfo
index 1e3c4c5bcb6..559adb4a730 100644
--- a/misc/yelp/distinfo
+++ b/misc/yelp/distinfo
@@ -1,6 +1,10 @@
-$NetBSD: distinfo,v 1.28 2009/12/02 12:57:26 wiz Exp $
+$NetBSD: distinfo,v 1.29 2010/02/13 12:26:15 tnn Exp $
 
 SHA1 (yelp-2.28.1.tar.bz2) = 260719600148490effaba2e78a9d536f251f5b66
 RMD160 (yelp-2.28.1.tar.bz2) = 0cac3a3504065fece952390a05b9612cfe180f11
 Size (yelp-2.28.1.tar.bz2) = 1136184 bytes
 SHA1 (patch-ab) = 67b55fe06a9bceccd9e43ff85d49a92ab6cc67ea
+SHA1 (patch-ac) = 188a0a2ed84e54f9c73f589d14bfea155233021a
+SHA1 (patch-ad) = 7a737e7890be40ace92cdd79d234c57ca6e6f223
+SHA1 (patch-ae) = cb64a4aab05937b35482c83276058ae64618532b
+SHA1 (patch-af) = b6ef2e6b00ff3a1c807499113926d8ac3072e67d
diff --git a/misc/yelp/patches/patch-ac b/misc/yelp/patches/patch-ac
new file mode 100644
index 00000000000..bcb89bb067a
--- /dev/null
+++ b/misc/yelp/patches/patch-ac
@@ -0,0 +1,37 @@
+$NetBSD: patch-ac,v 1.5 2010/02/13 12:26:15 tnn Exp $
+
+http://git.gnome.org/browse/yelp/commit/?id=a5588114ed94d00ca64913aa5b248e09a5e13edc
+
+--- src/yelp-html.cpp.orig	2009-11-19 17:09:56.000000000 +0000
++++ src/yelp-html.cpp
+@@ -24,6 +24,8 @@
+ #include <mozilla-config.h>
+ #include <config.h>
+ 
++#include <string.h>
++
+ #include "yelp-gecko-services.h"
+ #include "yelp-gecko-utils.h"
+ #include "yelp-marshal.h"
+@@ -90,13 +92,20 @@ static gint
+ html_open_uri (GtkMozEmbed *embed, const gchar *uri)
+ {
+     YelpHtml *html = YELP_HTML (embed);
+-    gboolean block_load;
++    gboolean block_load = FALSE;
+ 
+     g_return_val_if_fail (uri != NULL, FALSE);
+ 
+     debug_print (DB_FUNCTION, "entering\n");
+     debug_print (DB_ARG, "  uri = \"%s\"\n", uri);
+ 
++    if (g_str_equal (html->priv->base_uri, uri)) {
++	/* As of xulrunner 1.6.2, open_uri is called in response
++	   to the base URI we pass in.
++	 */
++	return FALSE;
++    }
++
+     if (!html->priv->frames_enabled) {
+ 	g_signal_emit (html, signals[URI_SELECTED], 0, uri, FALSE);
+ 	block_load = TRUE;
diff --git a/misc/yelp/patches/patch-ad b/misc/yelp/patches/patch-ad
new file mode 100644
index 00000000000..366328bc412
--- /dev/null
+++ b/misc/yelp/patches/patch-ad
@@ -0,0 +1,29 @@
+$NetBSD: patch-ad,v 1.1 2010/02/13 12:26:15 tnn Exp $
+
+http://git.gnome.org/browse/yelp/commit/?id=a5588114ed94d00ca64913aa5b248e09a5e13edc
+
+--- src/yelp-window.c.orig	2009-11-19 17:09:56.000000000 +0000
++++ src/yelp-window.c
+@@ -1854,14 +1854,21 @@ html_uri_selected_cb (YelpHtml  *html,
+ 		      gboolean   handled,
+ 		      gpointer   user_data)
+ {
++    gchar *new_uri = uri;
+     YelpWindow *window = YELP_WINDOW (user_data);
+ 
+     debug_print (DB_FUNCTION, "entering\n");
+     debug_print (DB_ARG, "  uri = \"%s\"\n", uri);
+ 
++    if (g_str_has_prefix (uri, "xref:"))
++        new_uri = g_strconcat (window->priv->base_uri, "#", uri + 5, NULL);
++
+     if (!handled) {
+-	yelp_window_load (window, uri);
++	yelp_window_load (window, new_uri);
+     }
++
++    if (new_uri != uri)
++        g_free (new_uri);
+ }
+ 
+ static gboolean
diff --git a/misc/yelp/patches/patch-ae b/misc/yelp/patches/patch-ae
new file mode 100644
index 00000000000..4e43087b02a
--- /dev/null
+++ b/misc/yelp/patches/patch-ae
@@ -0,0 +1,15 @@
+$NetBSD: patch-ae,v 1.1 2010/02/13 12:26:15 tnn Exp $
+
+http://git.gnome.org/browse/yelp/commit/?id=a5588114ed94d00ca64913aa5b248e09a5e13edc
+
+--- stylesheets/db2html.xsl.in.orig	2009-11-19 17:09:56.000000000 +0000
++++ stylesheets/db2html.xsl.in
+@@ -68,7 +68,7 @@ FIXME: yelp:cache no longer works
+ <!-- == db.xref.target == -->
+ <xsl:template name="db.xref.target">
+   <xsl:param name="linkend"/>
+-  <xsl:value-of select="concat('#', $linkend)"/>
++  <xsl:value-of select="concat('xref:', $linkend)"/>
+ </xsl:template>
+ 
+ <!-- == db2html.css.custom == -->
diff --git a/misc/yelp/patches/patch-af b/misc/yelp/patches/patch-af
new file mode 100644
index 00000000000..220a3d2936a
--- /dev/null
+++ b/misc/yelp/patches/patch-af
@@ -0,0 +1,19 @@
+$NetBSD: patch-af,v 1.1 2010/02/13 12:26:16 tnn Exp $
+
+http://git.gnome.org/browse/yelp/commit/?id=a5588114ed94d00ca64913aa5b248e09a5e13edc
+
+--- stylesheets/mal2html.xsl.in.orig	2009-11-19 17:09:56.000000000 +0000
++++ stylesheets/mal2html.xsl.in
+@@ -44,10 +44,10 @@
+     <xsl:when test="contains($xref, '#')">
+       <xsl:variable name="pageid" select="substring-before($xref, '#')"/>
+       <xsl:variable name="sectionid" select="substring-after($xref, '#')"/>
+-      <xsl:value-of select="concat('#', $pageid, '/', $sectionid)"/>
++      <xsl:value-of select="concat('xref:', $pageid, '/', $sectionid)"/>
+     </xsl:when>
+     <xsl:otherwise>
+-      <xsl:value-of select="concat('#', $xref)"/>
++      <xsl:value-of select="concat('xref:', $xref)"/>
+     </xsl:otherwise>
+   </xsl:choose>
+ </xsl:template>