r17962 - in /desktop/experimental/yelp/debian: changelog patches/06_text_plain.patch patches/07_url_localfile.patch patches/series

joss at users.alioth.debian.org joss at users.alioth.debian.org
Tue Dec 23 19:18:33 UTC 2008


Author: joss
Date: Tue Dec 23 19:18:33 2008
New Revision: 17962

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17962
Log:
* Force the search implementation to be the basic one.
* 07_url_localfile.patch: new patch. Handle local URIs just like 
  file: URIs, for broken doc-base OMF files with uri="/blah".
* 06_text_plain.patch: do not kill handling of info and man pages 
  through file: URIs.

Added:
    desktop/experimental/yelp/debian/patches/07_url_localfile.patch
Modified:
    desktop/experimental/yelp/debian/changelog
    desktop/experimental/yelp/debian/patches/06_text_plain.patch
    desktop/experimental/yelp/debian/patches/series

Modified: desktop/experimental/yelp/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/yelp/debian/changelog?rev=17962&op=diff
==============================================================================
--- desktop/experimental/yelp/debian/changelog (original)
+++ desktop/experimental/yelp/debian/changelog Tue Dec 23 19:18:33 2008
@@ -12,6 +12,11 @@
   [ Josselin Mouette ]
   * Add glib 2.15.2 build-dependency for gio.
   * Regenerate 70_autotools.patch, and document how to do it.
+  * Force the search implementation to be the basic one.
+  * 07_url_localfile.patch: new patch. Handle local URIs just like 
+    file: URIs, for broken doc-base OMF files with uri="/blah".
+  * 06_text_plain.patch: do not kill handling of info and man pages 
+    through file: URIs.
 
  -- Josselin Mouette <joss at debian.org>  Tue, 23 Dec 2008 19:33:13 +0100
 

Modified: desktop/experimental/yelp/debian/patches/06_text_plain.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/yelp/debian/patches/06_text_plain.patch?rev=17962&op=diff
==============================================================================
--- desktop/experimental/yelp/debian/patches/06_text_plain.patch (original)
+++ desktop/experimental/yelp/debian/patches/06_text_plain.patch Tue Dec 23 19:18:33 2008
@@ -1,8 +1,8 @@
-Index: yelp-2.22.1/src/yelp-utils.c
+Index: yelp-2.24.0/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 
+--- yelp-2.24.0.orig/src/yelp-utils.c	2008-12-23 19:56:02.068668992 +0100
++++ yelp-2.24.0/src/yelp-utils.c	2008-12-23 20:17:36.508666254 +0100
+@@ -92,6 +92,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;
@@ -11,19 +11,19 @@
  
      } 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
+@@ -204,7 +206,7 @@ resolve_full_file (const gchar *path)
+ 	} else if (resolve_is_man_path (path, NULL)) {
+ 	    type = YELP_RRN_TYPE_MAN;
+ 	} else {
+-	    type = YELP_RRN_TYPE_EXTERNAL;
++	    type = YELP_RRN_TYPE_TEXT;
+ 	}
+     } else {
+ 	type = YELP_RRN_TYPE_EXTERNAL;
+Index: yelp-2.24.0/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
+--- yelp-2.24.0.orig/src/yelp-utils.h	2008-12-23 19:56:02.056668724 +0100
++++ yelp-2.24.0/src/yelp-utils.h	2008-12-23 19:56:04.340666482 +0100
 @@ -29,6 +29,7 @@ typedef enum {
      YELP_RRN_TYPE_DOC = 0,
      YELP_RRN_TYPE_MAN,
@@ -32,10 +32,10 @@
      YELP_RRN_TYPE_HTML,
      YELP_RRN_TYPE_XHTML,
      YELP_RRN_TYPE_TOC,
-Index: yelp-2.22.1/src/yelp-window.c
+Index: yelp-2.24.0/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
+--- yelp-2.24.0.orig/src/yelp-window.c	2008-12-23 19:56:02.040668855 +0100
++++ yelp-2.24.0/src/yelp-window.c	2008-12-23 20:15:21.528674314 +0100
 @@ -1046,6 +1046,7 @@ yelp_window_load (YelpWindow *window, co
  	    break;
  	case YELP_RRN_TYPE_HTML:
@@ -54,7 +54,7 @@
  	    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
+@@ -1662,6 +1664,9 @@ window_do_load_html (YelpWindow    *wind
      case YELP_RRN_TYPE_XHTML:
  	yelp_html_open_stream (priv->html_view, "application/xhtml+xml");
  	break;
@@ -64,7 +64,7 @@
      default:
  	g_assert_not_reached ();
      }
-@@ -1762,6 +1767,7 @@ html_frame_selected_cb (YelpHtml *html, 
+@@ -1766,6 +1771,7 @@ html_frame_selected_cb (YelpHtml *html, 
      switch (window->priv->current_type) {
      case YELP_RRN_TYPE_XHTML:
      case YELP_RRN_TYPE_HTML:
@@ -72,7 +72,7 @@
  	handle = TRUE;
  	break;
      default:
-@@ -2073,6 +2079,9 @@ window_print_page_cb (GtkAction *action,
+@@ -2083,6 +2089,9 @@ window_print_page_cb (GtkAction *action,
  	case YELP_RRN_TYPE_XHTML:
  	    yelp_html_open_stream (html, "application/xhtml+xml");
  	    break;
@@ -82,7 +82,7 @@
  	default:
  	    g_assert_not_reached ();
  	}
-@@ -2240,7 +2249,7 @@ history_load_entry (YelpWindow *window, 
+@@ -2255,7 +2264,7 @@ history_load_entry (YelpWindow *window, 
  {
      g_return_if_fail (YELP_IS_WINDOW (window));
  

Added: desktop/experimental/yelp/debian/patches/07_url_localfile.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/yelp/debian/patches/07_url_localfile.patch?rev=17962&op=file
==============================================================================
--- desktop/experimental/yelp/debian/patches/07_url_localfile.patch (added)
+++ desktop/experimental/yelp/debian/patches/07_url_localfile.patch Tue Dec 23 19:18:33 2008
@@ -1,0 +1,29 @@
+Index: yelp-2.24.0/src/yelp-utils.c
+===================================================================
+--- yelp-2.24.0.orig/src/yelp-utils.c	2008-12-23 20:06:34.384671865 +0100
++++ yelp-2.24.0/src/yelp-utils.c	2008-12-23 20:13:19.936668697 +0100
+@@ -391,8 +391,8 @@ yelp_uri_resolve (gchar *uri, gchar **re
+ 	    g_free (info_name);
+ 	    g_free (info_sect);
+ 	}
+-    } else if (!strncmp (uri, "file:", 5)) {
+-	int file_cut = 5;
++    } else if (!strncmp (uri, "file:", 5) || *uri == '/') {
++	int file_cut = (*uri == '/')?0:5;
+ 	while (uri[file_cut+1] == '/')
+ 	    file_cut++;
+ 	ret = resolve_full_file (&intern_uri[file_cut]);
+@@ -439,13 +439,6 @@ yelp_uri_resolve (gchar *uri, gchar **re
+ 	    *result = g_strdup (intern_uri);
+ 	    *section = g_strdup (intern_section);
+ 	}
+-    } else if (*uri == '/' || g_str_has_suffix (uri, ".xml")) {
+-	/* Quite probable it was supposed to be ours, but
+-	 * the file doesn't exist.  Hence, we should bin it
+-	 */
+-	ret = YELP_RRN_TYPE_ERROR;
+-	*result = NULL;
+-	*section = NULL;
+     } else {
+ 	/* We really don't care what it is.  It's not ours.  Let
+ 	 * someone else handle it 

Modified: desktop/experimental/yelp/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/yelp/debian/patches/series?rev=17962&op=diff
==============================================================================
--- desktop/experimental/yelp/debian/patches/series (original)
+++ desktop/experimental/yelp/debian/patches/series Tue Dec 23 19:18:33 2008
@@ -2,4 +2,5 @@
 03_info_crasher.patch
 04_use_doc-base.patch
 06_text_plain.patch
+07_url_localfile.patch
 70_autotools.patch




More information about the pkg-gnome-commits mailing list