Sat Feb 13 12:26:16 2010 UTC ()
Merge GNOME git commit a5588114ed94d00ca64913aa5b248e09a5e13edc.
Fixes compatibility issues with xulrunner-1.9.2.
(tnn)
diff -r1.87 -r1.88 pkgsrc/misc/yelp/Makefile
diff -r1.28 -r1.29 pkgsrc/misc/yelp/distinfo
diff -r0 -r1.5 pkgsrc/misc/yelp/patches/patch-ac
diff -r0 -r1.1 pkgsrc/misc/yelp/patches/patch-ad
diff -r0 -r1.1 pkgsrc/misc/yelp/patches/patch-ae
diff -r0 -r1.1 pkgsrc/misc/yelp/patches/patch-af
--- pkgsrc/misc/yelp/Attic/Makefile 2010/01/18 09:59:16 1.87
+++ pkgsrc/misc/yelp/Attic/Makefile 2010/02/13 12:26:15 1.88
| @@ -1,18 +1,18 @@ | | | @@ -1,18 +1,18 @@ |
| 1 | # $NetBSD: Makefile,v 1.87 2010/01/18 09:59:16 wiz Exp $ | | 1 | # $NetBSD: Makefile,v 1.88 2010/02/13 12:26:15 tnn Exp $ |
| 2 | # | | 2 | # |
| 3 | | | 3 | |
| 4 | DISTNAME= yelp-2.28.1 | | 4 | DISTNAME= yelp-2.28.1 |
| 5 | PKGREVISION= 1 | | 5 | PKGREVISION= 2 |
| 6 | CATEGORIES= misc gnome | | 6 | CATEGORIES= misc gnome |
| 7 | MASTER_SITES= ${MASTER_SITE_GNOME:=sources/yelp/2.28/} | | 7 | MASTER_SITES= ${MASTER_SITE_GNOME:=sources/yelp/2.28/} |
| 8 | EXTRACT_SUFX= .tar.bz2 | | 8 | EXTRACT_SUFX= .tar.bz2 |
| 9 | | | 9 | |
| 10 | MAINTAINER= pkgsrc-users@NetBSD.org | | 10 | MAINTAINER= pkgsrc-users@NetBSD.org |
| 11 | HOMEPAGE= http://www.gnome.org/ | | 11 | HOMEPAGE= http://www.gnome.org/ |
| 12 | COMMENT= Help browser for GNOME 2 desktop | | 12 | COMMENT= Help browser for GNOME 2 desktop |
| 13 | | | 13 | |
| 14 | PKG_DESTDIR_SUPPORT= user-destdir | | 14 | PKG_DESTDIR_SUPPORT= user-destdir |
| 15 | | | 15 | |
| 16 | DEPENDS+= docbook>=4.2:../../textproc/docbook | | 16 | DEPENDS+= docbook>=4.2:../../textproc/docbook |
| 17 | | | 17 | |
| 18 | BUILDLINK_API_DEPENDS.libxslt+= libxslt>=1.1.4 | | 18 | BUILDLINK_API_DEPENDS.libxslt+= libxslt>=1.1.4 |
--- pkgsrc/misc/yelp/Attic/distinfo 2009/12/02 12:57:26 1.28
+++ pkgsrc/misc/yelp/Attic/distinfo 2010/02/13 12:26:15 1.29
| @@ -1,6 +1,10 @@ | | | @@ -1,6 +1,10 @@ |
| 1 | $NetBSD: distinfo,v 1.28 2009/12/02 12:57:26 wiz Exp $ | | 1 | $NetBSD: distinfo,v 1.29 2010/02/13 12:26:15 tnn Exp $ |
| 2 | | | 2 | |
| 3 | SHA1 (yelp-2.28.1.tar.bz2) = 260719600148490effaba2e78a9d536f251f5b66 | | 3 | SHA1 (yelp-2.28.1.tar.bz2) = 260719600148490effaba2e78a9d536f251f5b66 |
| 4 | RMD160 (yelp-2.28.1.tar.bz2) = 0cac3a3504065fece952390a05b9612cfe180f11 | | 4 | RMD160 (yelp-2.28.1.tar.bz2) = 0cac3a3504065fece952390a05b9612cfe180f11 |
| 5 | Size (yelp-2.28.1.tar.bz2) = 1136184 bytes | | 5 | Size (yelp-2.28.1.tar.bz2) = 1136184 bytes |
| 6 | SHA1 (patch-ab) = 67b55fe06a9bceccd9e43ff85d49a92ab6cc67ea | | 6 | SHA1 (patch-ab) = 67b55fe06a9bceccd9e43ff85d49a92ab6cc67ea |
| | | 7 | SHA1 (patch-ac) = 188a0a2ed84e54f9c73f589d14bfea155233021a |
| | | 8 | SHA1 (patch-ad) = 7a737e7890be40ace92cdd79d234c57ca6e6f223 |
| | | 9 | SHA1 (patch-ae) = cb64a4aab05937b35482c83276058ae64618532b |
| | | 10 | SHA1 (patch-af) = b6ef2e6b00ff3a1c807499113926d8ac3072e67d |
$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;
$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
$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 == -->
$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>