Hello community, here is the log from the commit of package yelp checked in at Mon Nov 3 14:40:09 CET 2008. -------- --- GNOME/yelp/yelp.changes 2008-09-22 23:33:32.000000000 +0200 +++ /mounts/work_src_done/STABLE/yelp/yelp.changes 2008-10-31 07:21:01.000000000 +0100 @@ -1,0 +2,8 @@ +Fri Oct 31 07:10:01 CET 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. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yelp-onlyshowin.patch New: ---- yelp-gio-port-issues.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yelp.spec ++++++ --- /var/tmp/diff_new_pack.g11964/_old 2008-11-03 14:39:58.000000000 +0100 +++ /var/tmp/diff_new_pack.g11964/_new 2008-11-03 14:39:58.000000000 +0100 @@ -30,6 +30,7 @@ BuildRequires: libglade2-devel BuildRequires: libgnomeui-devel BuildRequires: libxslt-devel +BuildRequires: mozilla-xulrunner%{xulrunner_version}-devel BuildRequires: perl-XML-Parser BuildRequires: rarian-devel BuildRequires: startup-notification-devel @@ -39,35 +40,24 @@ License: GPL v2 or later; LGPL v2.1 or later Group: System/GUI/GNOME Version: 2.24.0 -Release: 1 +Release: 2 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 Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build -# PATCH-FIX-UPSTREAM bgo522994 vuntz@novell.com -- hide menu entry outside of GNOME -Patch2: yelp-onlyshowin.patch # PATCH-FEATURE-OPENSUSE yelp-2.13.5-use-susehelp.patch -- make gnome-help a symlink to susehelp for better cross-desktop compatibility Patch6: yelp-2.13.5-use-susehelp.patch # PATCH-FEATURE-OPENSUSE yelp-handle-help-uri.patch vuntz@novell.com -- handle help: URI Patch9: yelp-handle-help-uri.patch # PATCH-FIX-OPENSUSE yelp-nspr-includes.patch maw@novell.com Patch10: yelp-nspr-includes.patch +# PATCH-FIX-UPSTREAM yelp-gio-port-issues.patch bnc439883 bgo558633 vuntz@novell.com +Patch11: yelp-gio-port-issues.patch PreReq: filesystem gconf2 Requires: gnome-doc-utils Requires: libbeagle >= 0.2.0 -%if %suse_version > 1010 || 0%{?opensuse_bs} -BuildRequires: mozilla-xulrunner%{xulrunner_version}-devel Requires: mozilla-xulrunner%{xulrunner_version} -%else -%if %suse_version > 1000 && %suse_version <= 1010 -BuildRequires: gecko-sdk -Requires: mozilla-xulrunner -%else -BuildRequires: gecko-sdk -Requires: mozilla -%endif -%endif Provides: suse_help_viewer AutoReqProv: on Requires: %{name}-lang = %{version} @@ -83,10 +73,10 @@ %prep %setup -n yelp-%{version} cp %{S:1} data/icons/ -%patch2 -p1 %patch6 -p1 %patch9 -p1 %patch10 -p0 +%patch11 -p1 # Use nds for Low Saxon (Northern Frisian Enclave) # Northern Frisian Enclave is not ISO-3166 country code: rename nds@NFE nds po/nds@NFE.* @@ -126,7 +116,12 @@ %files lang -f %{name}.lang %changelog -* Mon Sep 22 2008 maw@suse.de +* 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 - Update to version 2.24.0: + Improve a11y under gecko 1.9 (bgo#545162, and drop yelp-html.patch as a result) @@ -169,7 +164,7 @@ shouldn't be needed anymore because of yelp-handle-help-uri.patch The second one will be replaced by a fix in the opensuse manual packages. -* Tue Apr 22 2008 vuntz@suse.de +* Wed Apr 23 2008 vuntz@suse.de - Drop yelp-2.18.1-empty-doc-crash.patch: doesn't apply anymore and seems to be fixed upstream now (crash not reproducable). - Tag yelp-2.13.5-use-susehelp.patch. @@ -223,7 +218,7 @@ + Updated translations. * Tue Aug 07 2007 maw@suse.de - Split off a -lang subpackage. -* Fri Aug 03 2007 maw@suse.de +* Sat Aug 04 2007 maw@suse.de - Buildrequire rarian-devel, not rarian - Use %%fdupes - Add abuild.patch. @@ -243,7 +238,7 @@ * Mon Apr 09 2007 maw@suse.de - Update to version 2.18.0 - Mozilla API changes/fixes. -* Fri Mar 09 2007 maw@suse.de +* Sat Mar 10 2007 maw@suse.de - Update to version 2.16.2. * Don't crash when manpath is unavailable * Remove markup from translated messages (#360450) @@ -284,7 +279,7 @@ - Fix build with gecko trunk - Prefer xulrunner over mozilla - translation updates -* Thu Sep 14 2006 jhargadon@suse.de +* Fri Sep 15 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 @@ -295,7 +290,7 @@ - Fix crash on CVS info file - translation updates - added patch to eliminate autobuild warnings in src/yelp-main.c -* Fri Aug 25 2006 jhargadon@suse.de +* Sat Aug 26 2006 jhargadon@suse.de - update to version 2.15.91 - Fix search results to be accessible - Change "Sound & Vision" to "Sound & Video" in TOC @@ -310,10 +305,10 @@ - fix big memory leak (use xmlFreeDoc, not xmlFree) * Fri Jul 07 2006 lrupp@suse.de - Fixed mozilla/xulrunner/xulrunner180 dependencies -* Mon May 22 2006 hpj@suse.de +* Tue May 23 2006 hpj@suse.de - Updated patch to make it show more SuSE-specific manuals if present. Fixes Novell bug #173181. -* Wed May 10 2006 hpj@suse.de +* Thu May 11 2006 hpj@suse.de - Updated patch to address the specific case of help:// URIs with full path and a section. Also try to look for local DTDs before loading them from potential network URIs, which makes it a lot @@ -333,7 +328,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. -* Fri Mar 17 2006 joeshaw@suse.de +* Sat Mar 18 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 @@ -354,18 +349,18 @@ Fixes https://bugzilla.novell.com/show_bug.cgi?id=156481 * Mon Mar 06 2006 dobey@suse.de - Update help-title.png to follow new color/branding -* Fri Mar 03 2006 hpj@suse.de +* Sat Mar 04 2006 hpj@suse.de - Fix yelp-suse patch to show fragments specified by ? at the end of URIs. -* Fri Mar 03 2006 hpj@suse.de +* Sat Mar 04 2006 hpj@suse.de - Fix yelp-suse patch to show help:// docs in languages other than C if present and desired. -* Fri Mar 03 2006 hpj@suse.de +* Sat Mar 04 2006 hpj@suse.de - Use susehelp to show GNOME docs instead of invoking yelp directly. -* Fri Feb 17 2006 gekker@suse.de +* Sat Feb 18 2006 gekker@suse.de - fixup .desktop file for ui team -* Fri Feb 17 2006 joeshaw@suse.de +* Sat Feb 18 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 @@ -448,28 +443,28 @@ * Fri Jan 13 2006 joeshaw@suse.de - Update yelp-suse.patch to fix opening of KDE docs from the table of contents. -* Mon Jan 09 2006 joeshaw@suse.de +* Tue Jan 10 2006 joeshaw@suse.de - Update yelp-suse.patch to fix a strict aliasing issue -* Mon Jan 09 2006 joeshaw@suse.de +* Tue Jan 10 2006 joeshaw@suse.de - Update to version 2.13.2 - Regenerate and rename yelp-updates.patch to yelp-suse.patch, since most of the code is suse-specific. -* Wed Dec 21 2005 joeshaw@suse.de +* Thu Dec 22 2005 joeshaw@suse.de - Update beagle patch, require libbeagle 0.1.4 -* Wed Nov 30 2005 gekker@suse.de +* Thu Dec 01 2005 gekker@suse.de - Update to version 2.12.2 - Remove upstreamed patch * Wed Nov 16 2005 sbrabec@suse.cz - Fixed mozilla/xulrunner dependencies. * Thu Oct 20 2005 clahey@suse.de - New yelp-updates.patch. Fixes some search bugs. -* Thu Oct 13 2005 gekker@suse.de +* Fri Oct 14 2005 gekker@suse.de - Update to version 2.12.1 * Thu Oct 13 2005 ro@suse.de - build with xulrunner * Thu Oct 06 2005 gekker@suse.de - Fixup .desktop file -* Tue Oct 04 2005 clahey@suse.de +* Wed Oct 05 2005 clahey@suse.de - Provide suse_help_viewer. * Fri Sep 16 2005 clahey@suse.de - Made yelp actually find docbook files. (dumb typo.) @@ -483,10 +478,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. -* Tue Aug 23 2005 clahey@suse.de +* Wed Aug 24 2005 clahey@suse.de - Updated yelp-updates.patch. Fixes print this document, search appearance, and help: parsing. -* Fri Aug 19 2005 clahey@suse.de +* Sat Aug 20 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 @@ -495,7 +490,7 @@ mozilla-nss and mozilla-nspr packages (#98002). * Fri Jul 29 2005 clahey@suse.de - Updated yelp-updates.patch. -* Fri Jul 22 2005 gekker@suse.de +* Sat Jul 23 2005 gekker@suse.de - Update to version 2.11.1 - Remove upstreamed patch * Tue Jul 19 2005 jpr@suse.de @@ -516,9 +511,9 @@ - Don't remove buildroot before install * Tue Oct 26 2004 mmj@suse.de - Locale rename no to nb -* Tue Sep 07 2004 clahey@suse.de +* Wed Sep 08 2004 clahey@suse.de - Add OnlyShowIn=GNOME;. -* Tue Jun 08 2004 clahey@suse.de +* Wed Jun 09 2004 clahey@suse.de - Patch out libxslt 1.1.4 requirements. * Mon May 10 2004 sbrabec@suse.cz - Updated to version 2.6.1 (GNOME 2.6). @@ -542,7 +537,7 @@ - Updated to version 2.2.2. - Updated neededforbuild. - Use %%find_lang. -* Mon Jun 16 2003 ro@suse.de +* Tue Jun 17 2003 ro@suse.de - added directories to filelist * Fri Feb 07 2003 hhetter@suse.de - updated to version 2.2.0 [GNOME 2.2.0] @@ -552,7 +547,7 @@ - updated to version 1.0.7 * improved translation and updates - removed wrapper script -* Mon Nov 11 2002 ro@suse.de +* Tue Nov 12 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 @@ -579,7 +574,7 @@ * translation updates * Tue Jun 11 2002 hhetter@suse.de - updated to version 1.0 -* Wed Jun 05 2002 ro@suse.de +* Thu Jun 06 2002 ro@suse.de - use libdir for configure * Wed Jun 05 2002 hhetter@suse.de - initial SuSE Release ++++++ yelp-gio-port-issues.patch ++++++ Index: yelp-2.24.0/src/yelp-utils.c =================================================================== --- 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 file_cut++; ret = resolve_full_file (&intern_uri[file_cut]); if (ret == YELP_RRN_TYPE_EXTERNAL) { - *section = NULL; *result = g_strdup (uri); + *section = NULL; } 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); *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 gchar buffer[BUFFER_SIZE]; GtkAction *action; gchar *real_uri = NULL; - gchar *base_uri = NULL; gboolean handled = TRUE; @@ -1646,12 +1645,10 @@ window_do_load_html (YelpWindow *wind goto done; } - base_uri = g_filename_to_uri (uri, NULL, NULL); if (frag_id) { - real_uri = g_strconcat (base_uri, "#", frag_id, NULL); - g_free (base_uri); + real_uri = g_strconcat (uri, "#", frag_id, NULL); } else { - real_uri = base_uri; + real_uri = uri; } yelp_html_set_base_uri (priv->html_view, real_uri); @@ -1669,6 +1666,10 @@ window_do_load_html (YelpWindow *wind while ((g_input_stream_read_all ((GInputStream *)stream, buffer, BUFFER_SIZE, &n, NULL, NULL))) { gchar *tmp; + + if (n == 0) + break; + tmp = g_utf8_strup (buffer, n); if (strstr (tmp, "<FRAMESET")) { yelp_html_frames (priv->html_view, TRUE); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org