Hello community, here is the log from the commit of package yelp checked in at Mon Dec 1 12:15:51 CET 2008. -------- --- GNOME/yelp/yelp.changes 2008-10-31 07:21:01.000000000 +0100 +++ /mounts/work_src_done/STABLE/yelp/yelp.changes 2008-11-29 20:21:43.000000000 +0100 @@ -1,0 +2,6 @@ +Sat Nov 29 20:20:12 CET 2008 - vuntz@novell.com + +- Update yelp-gio-port-issues.patch to fix help not working in + GNOME applications. Fix bnc#449516. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yelp.spec ++++++ --- /var/tmp/diff_new_pack.G16242/_old 2008-12-01 12:15:44.000000000 +0100 +++ /var/tmp/diff_new_pack.G16242/_new 2008-12-01 12:15:44.000000000 +0100 @@ -40,7 +40,7 @@ License: GPL v2 or later; LGPL v2.1 or later Group: System/GUI/GNOME Version: 2.24.0 -Release: 2 +Release: 3 Summary: The GNOME 2.x Desktop Help Browser Source: ftp://ftp.gnome.org/pub/GNOME/sources/yelp/2.12/%{name}-%{version}.tar.bz2 Source1: help-title.png @@ -116,12 +116,15 @@ %files lang -f %{name}.lang %changelog +* Sat Nov 29 2008 vuntz@novell.com +- Update yelp-gio-port-issues.patch to fix help not working in + GNOME applications. Fix bnc#449516. * Fri Oct 31 2008 vuntz@novell.com - Add yelp-gio-port-issues.patch to fix HTML help (the openSUSE help is all HTML...). Fix bnc#439883. - Kill yelp-onlyshowin.patch: fixed upstream. - Clean spec. -* Tue Sep 23 2008 maw@suse.de +* Mon Sep 22 2008 maw@suse.de - Update to version 2.24.0: + Improve a11y under gecko 1.9 (bgo#545162, and drop yelp-html.patch as a result) @@ -218,7 +221,7 @@ + Updated translations. * Tue Aug 07 2007 maw@suse.de - Split off a -lang subpackage. -* Sat Aug 04 2007 maw@suse.de +* Fri Aug 03 2007 maw@suse.de - Buildrequire rarian-devel, not rarian - Use %%fdupes - Add abuild.patch. @@ -279,7 +282,7 @@ - Fix build with gecko trunk - Prefer xulrunner over mozilla - translation updates -* Fri Sep 15 2006 jhargadon@suse.de +* Thu Sep 14 2006 jhargadon@suse.de - update to version 2.16.0 - Fix a crash when the category is missing for a document - Fix a crash with bzip streams @@ -290,7 +293,7 @@ - Fix crash on CVS info file - translation updates - added patch to eliminate autobuild warnings in src/yelp-main.c -* Sat Aug 26 2006 jhargadon@suse.de +* Fri Aug 25 2006 jhargadon@suse.de - update to version 2.15.91 - Fix search results to be accessible - Change "Sound & Vision" to "Sound & Video" in TOC @@ -328,7 +331,7 @@ - Updated patch to be even more tolerant of broken help URIs. Fixes at least Novell bugs #157790, #157781 and $157775, probably others not files yet. -* Sat Mar 18 2006 joeshaw@suse.de +* Fri Mar 17 2006 joeshaw@suse.de - Add a patch which fixes some misuse of the libbeagle API. Fixes bnc #157801, sent upstream as bgo #334938. * Mon Mar 13 2006 jpr@suse.de @@ -355,12 +358,12 @@ * Sat Mar 04 2006 hpj@suse.de - Fix yelp-suse patch to show help:// docs in languages other than C if present and desired. -* Sat Mar 04 2006 hpj@suse.de +* Fri Mar 03 2006 hpj@suse.de - Use susehelp to show GNOME docs instead of invoking yelp directly. * Sat Feb 18 2006 gekker@suse.de - fixup .desktop file for ui team -* Sat Feb 18 2006 joeshaw@suse.de +* Fri Feb 17 2006 joeshaw@suse.de - Update SUSE yelp patch to disable search UI when Beagle is not available (as on SLES). - Remove redundant search entry on table-of-contents and search @@ -458,7 +461,7 @@ - Fixed mozilla/xulrunner dependencies. * Thu Oct 20 2005 clahey@suse.de - New yelp-updates.patch. Fixes some search bugs. -* Fri Oct 14 2005 gekker@suse.de +* Thu Oct 13 2005 gekker@suse.de - Update to version 2.12.1 * Thu Oct 13 2005 ro@suse.de - build with xulrunner @@ -478,10 +481,10 @@ * Wed Aug 24 2005 clahey@suse.de - Updated yelp-updates.patch. Makes search just show the top ten results. Fixed bug where only one search is actually done. -* Wed Aug 24 2005 clahey@suse.de +* Tue Aug 23 2005 clahey@suse.de - Updated yelp-updates.patch. Fixes print this document, search appearance, and help: parsing. -* Sat Aug 20 2005 clahey@suse.de +* Fri Aug 19 2005 clahey@suse.de - Updated yelp-updates.patch * Fri Aug 19 2005 ro@suse.de - move code from previous change from post to install section @@ -490,7 +493,7 @@ mozilla-nss and mozilla-nspr packages (#98002). * Fri Jul 29 2005 clahey@suse.de - Updated yelp-updates.patch. -* Sat Jul 23 2005 gekker@suse.de +* Fri Jul 22 2005 gekker@suse.de - Update to version 2.11.1 - Remove upstreamed patch * Tue Jul 19 2005 jpr@suse.de @@ -547,7 +550,7 @@ - updated to version 1.0.7 * improved translation and updates - removed wrapper script -* Tue Nov 12 2002 ro@suse.de +* Mon Nov 11 2002 ro@suse.de - changed neededforbuild <xf86 xdevel> to <x-devel-packages> * Wed Oct 23 2002 hhetter@suse.de - updated to stable version 1.0.6 @@ -574,7 +577,7 @@ * translation updates * Tue Jun 11 2002 hhetter@suse.de - updated to version 1.0 -* Thu Jun 06 2002 ro@suse.de +* Wed Jun 05 2002 ro@suse.de - use libdir for configure * Wed Jun 05 2002 hhetter@suse.de - initial SuSE Release ++++++ yelp-gio-port-issues.patch ++++++ --- /var/tmp/diff_new_pack.G16242/_old 2008-12-01 12:15:44.000000000 +0100 +++ /var/tmp/diff_new_pack.G16242/_new 2008-12-01 12:15:44.000000000 +0100 @@ -2,29 +2,42 @@ =================================================================== --- yelp-2.24.0.orig/src/yelp-utils.c +++ yelp-2.24.0/src/yelp-utils.c -@@ -414,14 +414,14 @@ yelp_uri_resolve (gchar *uri, gchar **re +@@ -414,12 +414,12 @@ yelp_uri_resolve (gchar *uri, gchar **re file_cut++; ret = resolve_full_file (&intern_uri[file_cut]); if (ret == YELP_RRN_TYPE_EXTERNAL) { -- *section = NULL; - *result = g_strdup (uri); -+ *section = NULL; ++ *result = g_strdup (&uri[file_cut]); + *section = NULL; +- *result = g_strdup (uri); } else if (ret == YELP_RRN_TYPE_ERROR) { - *section = NULL; *result = NULL; + *section = NULL; } else { -- *result = g_strdup (&intern_uri[file_cut]); -+ *result = g_strdup (intern_uri); + *result = g_strdup (&intern_uri[file_cut]); *section = intern_section; - } - /* full file path. Ensure file exists and determine type */ Index: yelp-2.24.0/src/yelp-window.c =================================================================== --- yelp-2.24.0.orig/src/yelp-window.c +++ yelp-2.24.0/src/yelp-window.c -@@ -1609,7 +1609,6 @@ window_do_load_html (YelpWindow *wind +@@ -1046,8 +1046,13 @@ yelp_window_load (YelpWindow *window, co + break; + case YELP_RRN_TYPE_HTML: + case YELP_RRN_TYPE_XHTML: +- priv->base_uri = g_strdup ("file:///fakefile"); +- window_do_load_html (window, real_uri, frag_id, type, TRUE); ++ { ++ gchar *uri; ++ priv->base_uri = g_strdup ("file:///fakefile"); ++ uri = g_filename_to_uri (real_uri, NULL, NULL); ++ window_do_load_html (window, uri, frag_id, type, TRUE); ++ g_free (uri); ++ } + break; + case YELP_RRN_TYPE_EXTERNAL: + { +@@ -1609,7 +1614,6 @@ window_do_load_html (YelpWindow *wind gchar buffer[BUFFER_SIZE]; GtkAction *action; gchar *real_uri = NULL; @@ -32,7 +45,7 @@ gboolean handled = TRUE; -@@ -1646,12 +1645,10 @@ window_do_load_html (YelpWindow *wind +@@ -1646,12 +1650,10 @@ window_do_load_html (YelpWindow *wind goto done; } @@ -43,11 +56,11 @@ + real_uri = g_strconcat (uri, "#", frag_id, NULL); } else { - real_uri = base_uri; -+ real_uri = uri; ++ real_uri = g_strdup (uri); } yelp_html_set_base_uri (priv->html_view, real_uri); -@@ -1669,6 +1666,10 @@ window_do_load_html (YelpWindow *wind +@@ -1669,6 +1671,10 @@ window_do_load_html (YelpWindow *wind while ((g_input_stream_read_all ((GInputStream *)stream, buffer, BUFFER_SIZE, &n, NULL, NULL))) { gchar *tmp; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org