head 1.6; access; symbols pkgsrc-2013Q2:1.6.0.8 pkgsrc-2013Q2-base:1.6 pkgsrc-2012Q4:1.6.0.6 pkgsrc-2012Q4-base:1.6 pkgsrc-2011Q4:1.6.0.4 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q2:1.6.0.2 pkgsrc-2011Q2-base:1.6 pkgsrc-2010Q1:1.5.0.2 pkgsrc-2010Q1-base:1.5 pkgsrc-2009Q4:1.4.0.4 pkgsrc-2009Q4-base:1.4 pkgsrc-2008Q4:1.4.0.2 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.3.0.4 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.2 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.2.0.2 pkgsrc-2008Q2-base:1.2 pkgsrc-2008Q1:1.1.0.4 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.2 pkgsrc-2007Q4-base:1.1; locks; strict; comment @# @; 1.6 date 2010.06.15.21.24.14; author drochner; state dead; branches; next 1.5; 1.5 date 2010.02.13.12.26.15; author tnn; state Exp; branches; next 1.4; 1.4 date 2008.10.25.02.09.37; author wiz; state dead; branches; next 1.3; 1.3 date 2008.08.27.09.56.34; author drochner; state Exp; branches; next 1.2; 1.2 date 2008.04.15.18.27.48; author drochner; state dead; branches 1.2.2.1; next 1.1; 1.1 date 2007.11.03.16.25.52; author drochner; state Exp; branches; next ; 1.2.2.1 date 2008.08.30.12.10.41; author tron; state Exp; branches; next ; desc @@ 1.6 log @update to 2.30.1 This switches to the gnome-2.30 release branch @ text @$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 #include +#include + #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; @ 1.5 log @Merge GNOME git commit a5588114ed94d00ca64913aa5b248e09a5e13edc. Fixes compatibility issues with xulrunner-1.9.2. @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @Update to 2.24.0: Changed in 2.24.0: ------------------ *Improve a11y under gecko 1.9 - Bug #545162 - Huge thanks to Ginn Chen, Willie Walker and Joanmarie Diggs * Fix potential race-condition - bug #551757 (Joe Marcus Clarke) * fd.o categorisation improvements - bug #552128 * Updated translations: ar (Djihed Afifi) bn_IN (Runa Bhattacharjee) he (Yair Hershkovitz) hi (Rajesh Ranjan) hr (Robert Sedak) hu (Gabor Kelemen) kn (Shankar Prasad) pt (Duarte Loreto) pt_BR (Vladimir Melo) ro (Mişu Moldovan) sr (Goran Rakić) sr@@latin (Goran Rakić) th (Theppitak Karoonboonyanan) Changed in 2.23.91: ------------------- * Fix loading of text files - bug #549986 (Josselin Mouette) * Fix glibc info manual chrash - bug #520266 (Matthias Clasen and J.H.M. Dassen) * Updated translations: eu (Inaki Larranaga Murgoitio) * Conversion from sr@@Latn to sr@@latin (Goran Rakic) Changed in 2.23.2: ------------------ * Fix string vulnerability [#546364] - Christian Persch * Use "help-browser" icon instead of deprecated "gnome-help" - Luca Ferretti * Updated translations: ar (Djihed Afifi) de (Jochen Skulj) gu (Ankit Patel) he (Yair Hershkovitz) ks (Rakesh Pandit) oc (Yannig Marchegay) or (Manoj Kumar Giri) pt_BR (John Wendell) sq (Laurent Dhima) Changed in 2.23.1: ------------------ * Add support for Gecko 1.9 (XULRunner) - Christian Persch * Move from gnome-vfs to gio - Alon Zakai * Fix searching on multibyte characters - Takao Fujiwara * Add support for newer Beagles - Arun Raghavan * Fix parallel make - Rémi Cardona * Make "print whole document" work again * Re-add support for gnome-help URIs * Only show the help browser in GNOME menus (as other desktops should ship their own help browser) * New translations: fur (Friulian team) * Updated translations: ar (Djihed Afifi) bg (Alexander Shopov) he (Yair Hershkovitz) vi (Clytie Siddall) @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.3 2008/08/27 09:56:34 drochner Exp $ d3 24 a26 12 --- src/yelp-window.c.orig 2008-04-07 20:16:39.000000000 +0200 +++ src/yelp-window.c @@@@ -1152,9 +1152,9 @@@@ window_error (YelpWindow *window, gchar GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, - title); + "%s", title); gtk_message_dialog_format_secondary_markup - (GTK_MESSAGE_DIALOG (dialog), message); + (GTK_MESSAGE_DIALOG (dialog), "%s", message); gtk_dialog_run (GTK_DIALOG (dialog)); d28 10 a37 1 gtk_widget_destroy (dialog); @ 1.3 log @add patch from upstream CVS to fix a format string vulnerability (CVE-2008-3533), bump PKGREVISION @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @update to 2.22.1 This switches to the gnome-2.22 release branch. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.1 2007/11/03 16:25:52 drochner Exp $ d3 12 a14 5 --- ./src/yelp-window.c.orig 2007-09-29 21:20:58.000000000 +0200 +++ ./src/yelp-window.c @@@@ -1584,7 +1584,7 @@@@ window_do_load_html (YelpWindow *wind goto done; } d16 1 a16 5 - base_uri = g_filename_to_uri (real_uri, NULL, NULL); + base_uri = g_filename_to_uri (uri, NULL, NULL); if (frag_id) { real_uri = g_strconcat (base_uri, "#", frag_id); g_free (base_uri); @ 1.2.2.1 log @Pullup ticket #2507 - requested by drochner Revisions pulled up: - misc/yelp/Makefile 1.77 - misc/yelp/distinfo 1.24 - misc/yelp/patches/patch-ac 1.3 --- Module Name: pkgsrc Committed By: drochner Date: Wed Aug 27 09:56:34 UTC 2008 Modified Files: pkgsrc/misc/yelp: Makefile distinfo Added Files: pkgsrc/misc/yelp/patches: patch-ac Log Message: add patch from upstream CVS to fix a format string vulnerability (CVE-2008-3533), bump PKGREVISION @ text @d1 1 a1 1 $NetBSD$ d3 5 a7 12 --- src/yelp-window.c.orig 2008-04-07 20:16:39.000000000 +0200 +++ src/yelp-window.c @@@@ -1152,9 +1152,9 @@@@ window_error (YelpWindow *window, gchar GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, - title); + "%s", title); gtk_message_dialog_format_secondary_markup - (GTK_MESSAGE_DIALOG (dialog), message); + (GTK_MESSAGE_DIALOG (dialog), "%s", message); gtk_dialog_run (GTK_DIALOG (dialog)); d9 5 a13 1 gtk_widget_destroy (dialog); @ 1.1 log @update to 2.20.0 This switches to the new gnome-2.20 branch. @ text @d1 1 a1 1 $NetBSD$ @