r16849 - in /desktop/unstable/yelp/debian: changelog patches/05_txt_crash.patch patches/06_text_plain.patch patches/series
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sun Aug 31 09:14:48 UTC 2008
Author: joss
Date: Sun Aug 31 09:14:48 2008
New Revision: 16849
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16849
Log:
* 05_txt_crash.patch: fix crash when trying to view a text file.
Closes: #497086.
* 06_text_plain.patch: support text/plain files, so that the text
documentation is viewable.
Added:
desktop/unstable/yelp/debian/patches/05_txt_crash.patch
desktop/unstable/yelp/debian/patches/06_text_plain.patch
Modified:
desktop/unstable/yelp/debian/changelog
desktop/unstable/yelp/debian/patches/series
Modified: desktop/unstable/yelp/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/yelp/debian/changelog?rev=16849&op=diff
==============================================================================
--- desktop/unstable/yelp/debian/changelog (original)
+++ desktop/unstable/yelp/debian/changelog Sun Aug 31 09:14:48 2008
@@ -1,3 +1,12 @@
+yelp (2.22.1-7) unstable; urgency=low
+
+ * 05_txt_crash.patch: fix crash when trying to view a text file.
+ Closes: #497086.
+ * 06_text_plain.patch: support text/plain files, so that the text
+ documentation is viewable.
+
+ -- Josselin Mouette <joss at debian.org> Sun, 31 Aug 2008 10:25:38 +0200
+
yelp (2.22.1-6) unstable; urgency=low
* Add CVE identifier in 2.22.1-4 and 60_format-string.
Added: desktop/unstable/yelp/debian/patches/05_txt_crash.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/yelp/debian/patches/05_txt_crash.patch?rev=16849&op=file
==============================================================================
--- desktop/unstable/yelp/debian/patches/05_txt_crash.patch (added)
+++ desktop/unstable/yelp/debian/patches/05_txt_crash.patch Sun Aug 31 09:14:48 2008
@@ -1,0 +1,22 @@
+Index: yelp-2.22.1/src/yelp-utils.c
+===================================================================
+--- yelp-2.22.1.orig/src/yelp-utils.c 2008-08-31 10:24:19.903811447 +0200
++++ yelp-2.22.1/src/yelp-utils.c 2008-08-31 10:24:50.891310627 +0200
+@@ -126,7 +126,7 @@ resolve_is_man_path (const gchar *path,
+ iter = cats;
+
+ if (encoding && *encoding) {
+- while (iter) {
++ while (*iter) {
+ gchar *ending = g_strdup_printf ("%s.%s", *iter, encoding);
+ if (g_str_has_suffix (path, ending)) {
+ g_free (ending);
+@@ -136,7 +136,7 @@ resolve_is_man_path (const gchar *path,
+ iter++;
+ }
+ } else {
+- while (iter) {
++ while (*iter) {
+ if (g_str_has_suffix (path, *iter)) {
+ return TRUE;
+ }
Added: desktop/unstable/yelp/debian/patches/06_text_plain.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/yelp/debian/patches/06_text_plain.patch?rev=16849&op=file
==============================================================================
--- desktop/unstable/yelp/debian/patches/06_text_plain.patch (added)
+++ desktop/unstable/yelp/debian/patches/06_text_plain.patch Sun Aug 31 09:14:48 2008
@@ -1,0 +1,93 @@
+Index: yelp-2.22.1/src/yelp-utils.c
+===================================================================
+--- yelp-2.22.1.orig/src/yelp-utils.c 2008-08-31 10:53:20.003312013 +0200
++++ yelp-2.22.1/src/yelp-utils.c 2008-08-31 10:55:09.413083017 +0200
+@@ -82,6 +82,8 @@ resolve_process_ghelp (char *uri, gchar
+ type = YELP_RRN_TYPE_HTML;
+ else if (g_str_equal (mime, "application/xhtml+xml"))
+ type = YELP_RRN_TYPE_XHTML;
++ else if (g_str_equal (mime, "text/plain"))
++ type = YELP_RRN_TYPE_TEXT;
+
+ } else {
+ gint file_cut = 6;
+@@ -166,6 +168,8 @@ resolve_full_file (const gchar *path)
+ type = YELP_RRN_TYPE_HTML;
+ else if (g_str_equal (mime_type, "application/xhtml+xml"))
+ type = YELP_RRN_TYPE_XHTML;
++ else if (g_str_equal (mime_type, "text/plain"))
++ type = YELP_RRN_TYPE_TEXT;
+ else if (g_str_equal (mime_type, "application/x-gzip")) {
+ if (g_str_has_suffix (path, ".info.gz")) {
+ type = YELP_RRN_TYPE_INFO;
+Index: yelp-2.22.1/src/yelp-utils.h
+===================================================================
+--- yelp-2.22.1.orig/src/yelp-utils.h 2008-08-31 10:52:57.687807179 +0200
++++ yelp-2.22.1/src/yelp-utils.h 2008-08-31 10:53:12.203305866 +0200
+@@ -29,6 +29,7 @@ typedef enum {
+ YELP_RRN_TYPE_DOC = 0,
+ YELP_RRN_TYPE_MAN,
+ YELP_RRN_TYPE_INFO,
++ YELP_RRN_TYPE_TEXT,
+ YELP_RRN_TYPE_HTML,
+ YELP_RRN_TYPE_XHTML,
+ YELP_RRN_TYPE_TOC,
+Index: yelp-2.22.1/src/yelp-window.c
+===================================================================
+--- yelp-2.22.1.orig/src/yelp-window.c 2008-08-31 10:55:17.143312977 +0200
++++ yelp-2.22.1/src/yelp-window.c 2008-08-31 10:58:00.095307224 +0200
+@@ -1046,6 +1046,7 @@ yelp_window_load (YelpWindow *window, co
+ break;
+ case YELP_RRN_TYPE_HTML:
+ case YELP_RRN_TYPE_XHTML:
++ case YELP_RRN_TYPE_TEXT:
+ priv->base_uri = g_strdup ("file:///fakefile");
+ window_do_load_html (window, real_uri, frag_id, type, TRUE);
+ break;
+@@ -1102,7 +1103,8 @@ yelp_window_load (YelpWindow *window, co
+ frag_id = g_strdup ("x-yelp-index");
+
+ if (priv->current_document || (priv->current_type == YELP_RRN_TYPE_HTML ||
+- priv->current_type == YELP_RRN_TYPE_XHTML))
++ priv->current_type == YELP_RRN_TYPE_XHTML ||
++ priv->current_type == YELP_RRN_TYPE_TEXT))
+ need_hist = TRUE;
+ window_setup_window (window, type, real_uri, frag_id,
+ (gchar *) uri, current_base, need_hist);
+@@ -1661,6 +1663,9 @@ window_do_load_html (YelpWindow *wind
+ case YELP_RRN_TYPE_XHTML:
+ yelp_html_open_stream (priv->html_view, "application/xhtml+xml");
+ break;
++ case YELP_RRN_TYPE_TEXT:
++ yelp_html_open_stream (priv->html_view, "text/plain");
++ break;
+ default:
+ g_assert_not_reached ();
+ }
+@@ -1762,6 +1767,7 @@ html_frame_selected_cb (YelpHtml *html,
+ switch (window->priv->current_type) {
+ case YELP_RRN_TYPE_XHTML:
+ case YELP_RRN_TYPE_HTML:
++ case YELP_RRN_TYPE_TEXT:
+ handle = TRUE;
+ break;
+ default:
+@@ -2073,6 +2079,9 @@ window_print_page_cb (GtkAction *action,
+ case YELP_RRN_TYPE_XHTML:
+ yelp_html_open_stream (html, "application/xhtml+xml");
+ break;
++ case YELP_RRN_TYPE_TEXT:
++ yelp_html_open_stream (html, "text/plain");
++ break;
+ default:
+ g_assert_not_reached ();
+ }
+@@ -2240,7 +2249,7 @@ history_load_entry (YelpWindow *window,
+ {
+ g_return_if_fail (YELP_IS_WINDOW (window));
+
+- if (entry->type == YELP_RRN_TYPE_HTML || entry->type == YELP_RRN_TYPE_XHTML) {
++ if (entry->type == YELP_RRN_TYPE_HTML || entry->type == YELP_RRN_TYPE_XHTML || entry->type == YELP_RRN_TYPE_TEXT) {
+ window_do_load_html (window, entry->uri, entry->frag_id, entry->type, FALSE);
+ } else {
+ g_assert (entry->doc != NULL);
Modified: desktop/unstable/yelp/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/yelp/debian/patches/series?rev=16849&op=diff
==============================================================================
--- desktop/unstable/yelp/debian/patches/series (original)
+++ desktop/unstable/yelp/debian/patches/series Sun Aug 31 09:14:48 2008
@@ -2,5 +2,7 @@
02_man-utf8.patch
03_info_crasher.patch
04_use_doc-base.patch
+05_txt_crash.patch
+06_text_plain.patch
60_format-string.patch
70_autotools.patch
More information about the pkg-gnome-commits
mailing list