Hello community, here is the log from the commit of package devhelp for openSUSE:Factory checked in at Fri Aug 7 22:43:05 CEST 2009. -------- --- GNOME/devhelp/devhelp.changes 2009-07-22 13:43:52.000000000 +0200 +++ devhelp/devhelp.changes 2009-08-06 14:25:27.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Aug 6 14:16:13 CEST 2009 - vuntz@novell.com + +- Update devhelp-webkit.patch to the patch from git. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ devhelp.spec ++++++ --- /var/tmp/diff_new_pack.R4WZRD/_old 2009-08-07 22:41:35.000000000 +0200 +++ /var/tmp/diff_new_pack.R4WZRD/_new 2009-08-07 22:41:35.000000000 +0200 @@ -35,14 +35,14 @@ Suggests: vim-plugin-devhelp Summary: Developer's Help Program for GNOME Version: 0.23 -Release: 3 +Release: 4 License: GPL v2 or later Group: Development/Tools/Other Url: http://developer.imendio.com/wiki/Devhelp Source: %{name}-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM devhelp-webkit.patch bnc522359 bgo586559 sbrabec@suse.cz -- Use correct URIs. Patch: %{name}-webkit.patch -# PATCH-FIX-BUILD devhelp-includes.patch sbrabec@suse.cz -- Add missing include to build with the latest GLib. +# PATCH-FIX-UPSTREAM devhelp-includes.patch sbrabec@suse.cz -- Add missing include to build with the latest GLib. Patch1: %{name}-includes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-lang = %{version} @@ -59,14 +59,6 @@ - Command line search with nice Emacs integration - - -Authors: --------- - Johan Dahlin <zilch.am@home.se> - Mikael Hallendal <micke@codefactory.se> - Richard Hult <rhult@codefactory.se> - %package devel License: GPL v2 or later Summary: Developer's Help Program For GNOME @@ -85,14 +77,6 @@ - Commandline search, with nice emacs integration. - - -Authors: --------- - Johan Dahlin <zilch.am@home.se> - Mikael Hallendal <micke@codefactory.se> - Richard Hult <rhult@codefactory.se> - %package -n gedit-plugin-devhelp License: GPL v2 or later Requires: gedit @@ -110,14 +94,6 @@ - Command line search with nice Emacs integration - - -Authors: --------- - Johan Dahlin <zilch.am@home.se> - Mikael Hallendal <micke@codefactory.se> - Richard Hult <rhult@codefactory.se> - %package -n vim-plugin-devhelp License: GPL v2 or later Requires: vim @@ -135,14 +111,6 @@ - Command line search with nice Emacs integration - - -Authors: --------- - Johan Dahlin <zilch.am@home.se> - Mikael Hallendal <micke@codefactory.se> - Richard Hult <rhult@codefactory.se> - %lang_package %prep %setup -q ++++++ devhelp-webkit.patch ++++++ --- /var/tmp/diff_new_pack.R4WZRD/_old 2009-08-07 22:41:35.000000000 +0200 +++ /var/tmp/diff_new_pack.R4WZRD/_new 2009-08-07 22:41:35.000000000 +0200 @@ -1,59 +1,158 @@ -diff -Nurd -x'*~' devhelp-0.23.orig/src/dh-window.c devhelp-0.23/src/dh-window.c ---- devhelp-0.23.orig/src/dh-window.c 2008-11-28 10:56:04.000000000 -0500 -+++ devhelp-0.23/src/dh-window.c 2009-07-08 03:36:23.000000000 -0400 -@@ -133,6 +133,20 @@ - #define GET_PRIVATE(instance) G_TYPE_INSTANCE_GET_PRIVATE \ - (instance, DH_TYPE_WINDOW, DhWindowPriv); +From af67fbedccab5044808a489a9f3a5540d42adcf2 Mon Sep 17 00:00:00 2001 +From: Enrico Tröge <enrico.troeger@uvena.de> +Date: Thu, 19 Feb 2009 10:02:43 +0000 +Subject: Use file: URIs instead of local paths, fixes use with more recent webkit + +2009-02-19 Enrico Tröge <enrico.troeger@uvena.de> + + * src/dh-assistant-view.c: (assistant_view_set_link): + * src/dh-book-tree.c: (book_tree_find_uri_foreach): + * src/dh-link.c: (link_free), (dh_link_new): + * src/dh-link.h: Use file: URIs instead of local paths, fixes use + with more recent webkit versions. + +svn path=/trunk/; revision=1265 +--- +diff --git a/src/dh-assistant-view.c b/src/dh-assistant-view.c +index ec42a2e..c8bab6c 100644 +--- a/src/dh-assistant-view.c ++++ b/src/dh-assistant-view.c +@@ -169,6 +169,7 @@ assistant_view_set_link (DhAssistantView *view, + gsize length; + gchar *key; + gsize key_length; ++ gsize offset = 0; + const gchar *start; + const gchar *end; -+ -+static void -+_webkit_web_view_open_compat (WebKitWebView *view, -+ const gchar *uri) -+{ -+ gchar *real_uri; -+ if (g_path_is_absolute(uri)) -+ real_uri = g_strdup_printf ("file://%s", uri); -+ else -+ real_uri = g_strdup (uri); -+ webkit_web_view_load_uri (view, real_uri); -+ g_free(real_uri); -+} -+ - static void - window_activate_new_window (GtkAction *action, - DhWindow *window) -@@ -803,7 +817,7 @@ - window); - - uri = dh_link_get_uri (link); -- webkit_web_view_open (view, uri); -+ _webkit_web_view_open_compat (view, uri); - g_free (uri); - - g_signal_handlers_unblock_by_func (view, -@@ -827,7 +841,7 @@ - view = window_get_active_web_view (window); - - uri = dh_link_get_uri (link); -- webkit_web_view_open (view, uri); -+ _webkit_web_view_open_compat (view, uri); - g_free (uri); - - window_check_history (window, view); -@@ -1093,7 +1107,7 @@ +@@ -203,7 +204,10 @@ assistant_view_set_link (DhAssistantView *view, + return; } - if (location) { -- webkit_web_view_open (WEBKIT_WEB_VIEW (view), location); -+ _webkit_web_view_open_compat (WEBKIT_WEB_VIEW (view), location); - } else { - webkit_web_view_open (WEBKIT_WEB_VIEW (view), "about:blank"); +- file = g_mapped_file_new (filename, FALSE, NULL); ++ if (g_str_has_prefix (filename, "file://")) ++ offset = 7; ++ ++ file = g_mapped_file_new (filename + offset, FALSE, NULL); + if (!file) { + g_free (filename); + return; +@@ -326,7 +330,7 @@ assistant_view_set_link (DhAssistantView *view, + * anchor links are handled internally in webkit. + */ + tmp = g_path_get_dirname (filename); +- base = g_strconcat ("file://", tmp, "/fake", NULL); ++ base = g_strconcat (tmp, "/fake", NULL); + g_free (tmp); + + webkit_web_view_load_html_string ( +diff --git a/src/dh-book-tree.c b/src/dh-book-tree.c +index 9183b98..3207948 100644 +--- a/src/dh-book-tree.c ++++ b/src/dh-book-tree.c +@@ -245,22 +245,14 @@ book_tree_find_uri_foreach (GtkTreeModel *model, + FindURIData *data) + { + DhLink *link; +- const gchar *uri; + gchar *link_uri; + + gtk_tree_model_get (model, iter, + COL_LINK, &link, + -1); + +- /* A bit hackish, could be made more generic. */ +- if (g_str_has_prefix (data->uri, "file://")) { +- uri = data->uri + 7; +- } else { +- uri = data->uri; +- } +- + link_uri = dh_link_get_uri (link); +- if (g_str_has_prefix (uri, link_uri)) { ++ if (g_str_has_prefix (data->uri, link_uri)) { + data->found = TRUE; + data->iter = *iter; + data->path = gtk_tree_path_copy (path); +diff --git a/src/dh-link.c b/src/dh-link.c +index 230af73..f320daa 100644 +--- a/src/dh-link.c ++++ b/src/dh-link.c +@@ -33,7 +33,7 @@ struct _DhLink { + gchar *base; + + gchar *name; +- gchar *uri; ++ gchar *filename; + + DhLink *book; + DhLink *page; +@@ -64,7 +64,7 @@ link_free (DhLink *link) + g_free (link->base); + g_free (link->id); + g_free (link->name); +- g_free (link->uri); ++ g_free (link->filename); + + if (link->book) { + dh_link_unref (link->book); +@@ -83,12 +83,12 @@ dh_link_new (DhLinkType type, + const gchar *name, + DhLink *book, + DhLink *page, +- const gchar *uri) ++ const gchar *filename) + { + DhLink *link; + + g_return_val_if_fail (name != NULL, NULL); +- g_return_val_if_fail (uri != NULL, NULL); ++ g_return_val_if_fail (filename != NULL, NULL); + + if (type == DH_LINK_TYPE_BOOK) { + g_return_val_if_fail (base != NULL, NULL); +@@ -110,7 +110,7 @@ dh_link_new (DhLinkType type, } -@@ -1357,6 +1371,6 @@ - priv = window->priv; - web_view = window_get_active_web_view (window); -- webkit_web_view_open (web_view, uri); -+ _webkit_web_view_open_compat (web_view, uri); - dh_book_tree_select_uri (DH_BOOK_TREE (priv->book_tree), uri); + link->name = g_strdup (name); +- link->uri = g_strdup (uri); ++ link->filename = g_strdup (filename); + + if (book) { + link->book = dh_link_ref (book); +@@ -205,11 +205,16 @@ dh_link_get_book_id (DhLink *link) + gchar * + dh_link_get_uri (DhLink *link) + { +- if (link->type == DH_LINK_TYPE_BOOK) { +- return g_strconcat (link->base, "/", link->uri, NULL); +- } ++ gchar *base, *uri; ++ ++ if (link->type == DH_LINK_TYPE_BOOK) ++ base = link->base; ++ else ++ base = link->book->base; ++ ++ uri = g_strconcat ("file://", base, "/", link->filename, NULL, NULL); + +- return g_strconcat (link->book->base, "/", link->uri, NULL); ++ return uri; } + + DhLinkType +diff --git a/src/dh-link.h b/src/dh-link.h +index c28a9b4..aa30df9 100644 +--- a/src/dh-link.h ++++ b/src/dh-link.h +@@ -51,7 +51,7 @@ DhLink * dh_link_new (DhLinkType type, + const gchar *name, + DhLink *book, + DhLink *page, +- const gchar *uri); ++ const gchar *filename); + void dh_link_free (DhLink *link); + gint dh_link_compare (gconstpointer a, + gconstpointer b); +-- +cgit v0.8.2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org