Hello community, here is the log from the commit of package yelp checked in at Sat Sep 15 12:04:35 CEST 2007. -------- --- GNOME/yelp/yelp.changes 2007-09-01 06:50:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/yelp/yelp.changes 2007-09-14 21:29:10.626296000 +0200 @@ -1,0 +2,13 @@ +Fri Sep 14 21:28:10 CEST 2007 - hpj@suse.de + +- Update yelp-suse-20060319.patch to find docs in the help-bundle/ + dir in addition to help/. + +------------------------------------------------------------------- +Fri Sep 14 17:23:00 CEST 2007 - jpr@suse.de + +- Revert to 2.18.1 +- Add yelp-2.18.1-empty-doc-crash.patch, which prevents a crash + when trying to load an empty doc. + +------------------------------------------------------------------- Old: ---- abuild.patch mp-search-parser.patch yelp-2.19.90-freed-memory-crash-2.patch yelp-2.19.90-freed-memory-crash.patch yelp-2.19.90-no-mime-type-crash.patch yelp-2.19.90.tar.bz2 New: ---- yelp-2.18.1-empty-doc-crash.patch yelp-2.18.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yelp.spec ++++++ --- /var/tmp/diff_new_pack.Y22875/_old 2007-09-15 12:04:20.000000000 +0200 +++ /var/tmp/diff_new_pack.Y22875/_new 2007-09-15 12:04:20.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yelp (Version 2.19.90) +# spec file for package yelp (Version 2.18.1) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,16 +12,16 @@ Name: yelp %define xulrunner_version 181 -BuildRequires: fdupes gcc-c++ gnome-common gnome-doc-utils-devel gnome-menus-devel intltool libbeagle-devel libglade2-devel libgnomeui-devel libxslt-devel mDNSResponder-devel perl-XML-Parser rarian-devel startup-notification-devel susehelp update-desktop-files +BuildRequires: fdupes gcc-c++ gnome-common gnome-doc-utils-devel gnome-menus-devel intltool libbeagle-devel libglade2-devel libgnomeui-devel libxslt-devel mDNSResponder-devel perl-XML-Parser startup-notification-devel susehelp update-desktop-files Requires: gnome-utils susehelp License: GPL v2 or later, LGPL v2 or later Group: System/GUI/GNOME -Version: 2.19.90 -Release: 1 +Version: 2.18.1 +Release: 44 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 +Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Patch1: yelp-libxslt.patch Patch2: yelp-onlyshowin.patch @@ -30,14 +30,9 @@ Patch6: yelp-2.13.5-use-susehelp.patch Patch8: yelp-2.14.0-process-suse-manuals.patch Patch9: yelp-autobuild-warning.patch -Patch10: mp-search-parser.patch -# FIXME: this is surely not the correct approach to take. -Patch11: abuild.patch -Patch12: yelp-2.19.90-freed-memory-crash.patch -Patch13: yelp-2.19.90-freed-memory-crash-2.patch -Patch14: yelp-2.19.90-no-mime-type-crash.patch +Patch10: yelp-2.18.1-empty-doc-crash.patch PreReq: filesystem gconf2 -Requires: gnome-doc-utils rarian +Requires: gnome-doc-utils Requires: libbeagle >= 0.2.0 %if %suse_version > 1010 || 0%{?opensuse_bs} BuildRequires: mozilla-xulrunner%{xulrunner_version}-devel @@ -52,9 +47,8 @@ %endif %endif Provides: suse_help_viewer -Autoreqprov: on +AutoReqProv: on Requires: %{name}-lang = %{version} - %gconf_schemas_prereq %description @@ -71,19 +65,12 @@ %patch1 -p0 %endif %patch2 -p1 -# FIXME: This patch is breaking the build. -#%patch4 -p1 +%patch4 -p1 %patch5 %patch6 -p1 -# FIXME: This patch is breaking the build. -#%patch8 -p1 -# FIXME: This patch is breaking the build. -#%patch9 +%patch8 -p1 +%patch9 %patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -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.* @@ -102,14 +89,12 @@ %find_lang %{name} %find_gconf_schemas cat %{name}.schemas_list >%{name}.lst - %fdupes $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %pre -f %{name}.schemas_pre - %posttrans -f %{name}.schemas_posttrans %preun -f %{name}.schemas_preun @@ -125,6 +110,13 @@ %files lang -f %{name}.lang %changelog +* Fri Sep 14 2007 - hpj@suse.de +- Update yelp-suse-20060319.patch to find docs in the help-bundle/ + dir in addition to help/. +* Fri Sep 14 2007 - jpr@suse.de +- Revert to 2.18.1 +- Add yelp-2.18.1-empty-doc-crash.patch, which prevents a crash + when trying to load an empty doc. * Sat Sep 01 2007 - hpj@suse.de - Add yelp-2.19.90-freed-memory-crash.patch (BGO #469436). - Add yelp-2.19.90-freed-memory-crash-2.patch (BGO #469438). ++++++ yelp-2.18.1-empty-doc-crash.patch ++++++ diff -upr yelp-2.18.1-pre/src/yelp-xslt-pager.c yelp-2.18.1-post/src/yelp-xslt-pager.c --- yelp-2.18.1-pre/src/yelp-xslt-pager.c 2007-03-07 13:28:48.000000000 -0600 +++ yelp-2.18.1-post/src/yelp-xslt-pager.c 2007-09-12 16:51:27.000000000 -0500 @@ -549,13 +564,17 @@ xslt_yelp_cache (xsltTransformContextPtr ctxt->output = old_output; ctxt->insert = old_insert; - /* this copy of the node we put in the cache */ - tmpnode = xmlCopyNode (new_doc->children, 1); - g_hash_table_insert (keyhash, key, tmpnode); - - /* this copy of the node gets attached to the result tree */ - tmpnode2 = xmlDocCopyNode (tmpnode, tmpnode->doc, 1); - xmlAddChild (ctxt->insert, tmpnode2); + if (new_doc->children) { + /* this copy of the node we put in the cache */ + tmpnode = xmlCopyNode (new_doc->children, 1); + g_hash_table_insert (keyhash, key, tmpnode); + + if (tmpnode) { + /* this copy of the node gets attached to the result tree */ + tmpnode2 = xmlDocCopyNode (tmpnode, tmpnode->doc, 1); + xmlAddChild (ctxt->insert, tmpnode2); + } + } while (gtk_events_pending ()) gtk_main_iteration (); ++++++ yelp-2.19.90.tar.bz2 -> yelp-2.18.1.tar.bz2 ++++++ ++++ 85872 lines of diff (skipped) ++++++ yelp-suse-20060319.patch ++++++ --- /var/tmp/diff_new_pack.Y22875/_old 2007-09-15 12:04:23.000000000 +0200 +++ /var/tmp/diff_new_pack.Y22875/_new 2007-09-15 12:04:23.000000000 +0200 @@ -1,6 +1,6 @@ -diff -upr yelp-2.16.1-pre/configure.in yelp-2.16.1-post/configure.in ---- yelp-2.16.1-pre/configure.in 2006-10-02 12:26:19.000000000 -0500 -+++ yelp-2.16.1-post/configure.in 2006-10-26 11:11:49.000000000 -0500 +diff -upr yelp-2.18.1-pre/configure.in yelp-2.18.1-post/configure.in +--- yelp-2.18.1-pre/configure.in 2007-04-09 11:46:52.000000000 -0500 ++++ yelp-2.18.1-post/configure.in 2007-09-14 10:39:24.000000000 -0500 @@ -73,10 +73,11 @@ PKG_CHECK_MODULES(YELP, libglade-2.0 >= 2.0.0 libgnome-2.0 >= 2.14.0 @@ -15,9 +15,9 @@ dbus-glib-1 ]) AC_SUBST([YELP_CFLAGS]) -diff -upr yelp-2.16.1-pre/data/icons/Makefile.am yelp-2.16.1-post/data/icons/Makefile.am ---- yelp-2.16.1-pre/data/icons/Makefile.am 2005-02-01 15:45:05.000000000 -0600 -+++ yelp-2.16.1-post/data/icons/Makefile.am 2006-10-26 11:11:49.000000000 -0500 +diff -upr yelp-2.18.1-pre/data/icons/Makefile.am yelp-2.18.1-post/data/icons/Makefile.am +--- yelp-2.18.1-pre/data/icons/Makefile.am 2007-03-07 13:28:48.000000000 -0600 ++++ yelp-2.18.1-post/data/icons/Makefile.am 2007-09-14 10:39:24.000000000 -0500 @@ -14,6 +14,7 @@ icon_DATA = \ yelp-watermark-blockquote-00BB.png \ yelp-watermark-blockquote-201C.png \ @@ -27,9 +27,9 @@ + help-title.png EXTRA_DIST = $(icon_DATA) $(icon192_DATA) -diff -upr yelp-2.16.1-pre/data/yelp.js yelp-2.16.1-post/data/yelp.js ---- yelp-2.16.1-pre/data/yelp.js 2005-11-21 14:56:22.000000000 -0600 -+++ yelp-2.16.1-post/data/yelp.js 2006-10-26 11:11:49.000000000 -0500 +diff -upr yelp-2.18.1-pre/data/yelp.js yelp-2.18.1-post/data/yelp.js +--- yelp-2.18.1-pre/data/yelp.js 2007-03-07 13:28:48.000000000 -0600 ++++ yelp-2.18.1-post/data/yelp.js 2007-09-14 10:39:24.000000000 -0500 @@ -81,6 +81,50 @@ var slt = { } } @@ -81,9 +81,9 @@ /* addEventListener() is Gecko-only, but so is yelp */ window.addEventListener("load",slt.init,false); /* load doesn't seem to get fired in Yelp. I might need to tell Gecko -diff -upr yelp-2.16.1-pre/src/yelp-db-pager.c yelp-2.16.1-post/src/yelp-db-pager.c ---- yelp-2.16.1-pre/src/yelp-db-pager.c 2006-06-11 23:39:59.000000000 -0500 -+++ yelp-2.16.1-post/src/yelp-db-pager.c 2006-10-26 11:11:49.000000000 -0500 +diff -upr yelp-2.18.1-pre/src/yelp-db-pager.c yelp-2.18.1-post/src/yelp-db-pager.c +--- yelp-2.18.1-pre/src/yelp-db-pager.c 2007-03-07 13:28:48.000000000 -0600 ++++ yelp-2.18.1-post/src/yelp-db-pager.c 2007-09-14 10:39:24.000000000 -0500 @@ -24,6 +24,7 @@ #include <config.h> #endif @@ -181,9 +181,9 @@ if (node_is_chunk (walker)) { title = BAD_CAST node_get_title (walker, "titleabbrev"); if (!title) -diff -upr yelp-2.16.1-pre/src/yelp-main.c yelp-2.16.1-post/src/yelp-main.c ---- yelp-2.16.1-pre/src/yelp-main.c 2006-08-05 13:04:23.000000000 -0500 -+++ yelp-2.16.1-post/src/yelp-main.c 2006-10-26 11:11:49.000000000 -0500 +diff -upr yelp-2.18.1-pre/src/yelp-main.c yelp-2.18.1-post/src/yelp-main.c +--- yelp-2.18.1-pre/src/yelp-main.c 2007-03-07 13:28:48.000000000 -0600 ++++ yelp-2.18.1-post/src/yelp-main.c 2007-09-14 10:39:24.000000000 -0500 @@ -24,6 +24,8 @@ #include <config.h> #endif @@ -193,7 +193,7 @@ #include <glib/gi18n.h> #include <gtk/gtkmain.h> #include <gtk/gtkwidget.h> -@@ -329,6 +331,48 @@ main_is_running (void) +@@ -333,6 +335,48 @@ main_is_running (void) } @@ -242,7 +242,7 @@ int main (int argc, char **argv) { -@@ -350,6 +394,8 @@ main (int argc, char **argv) +@@ -354,6 +398,8 @@ main (int argc, char **argv) putenv ("DESKTOP_STARTUP_ID="); } @@ -251,9 +251,10 @@ /* Commandline parsing is done here */ context = g_option_context_new (_(" GNOME Help Browser")); -diff -upr yelp-2.16.1-pre/src/yelp-search-pager.c yelp-2.16.1-post/src/yelp-search-pager.c ---- yelp-2.16.1-pre/src/yelp-search-pager.c 2006-08-30 07:32:32.000000000 -0500 -+++ yelp-2.16.1-post/src/yelp-search-pager.c 2006-10-26 11:11:49.000000000 -0500 +Only in yelp-2.18.1-post/src: yelp-main.c.orig +diff -upr yelp-2.18.1-pre/src/yelp-search-pager.c yelp-2.18.1-post/src/yelp-search-pager.c +--- yelp-2.18.1-pre/src/yelp-search-pager.c 2007-03-07 13:28:48.000000000 -0600 ++++ yelp-2.18.1-post/src/yelp-search-pager.c 2007-09-14 10:39:24.000000000 -0500 @@ -149,6 +149,7 @@ static gboolean search_pager_proces static YelpPagerClass *parent_class; @@ -334,23 +335,24 @@ static gboolean sk_docomf = FALSE; static GSList *omf_pending = NULL; -@@ -2034,3 +2053,4 @@ search_process_info (YelpSearchPager *pa +@@ -2043,3 +2062,4 @@ search_process_info (YelpSearchPager *pa return; } +#endif /* ENABLE_SCROLLKEEPER */ -diff -upr yelp-2.16.1-pre/src/yelp-search-pager.h yelp-2.16.1-post/src/yelp-search-pager.h ---- yelp-2.16.1-pre/src/yelp-search-pager.h 2005-10-28 15:37:37.000000000 -0500 -+++ yelp-2.16.1-post/src/yelp-search-pager.h 2006-10-26 11:11:49.000000000 -0500 +Only in yelp-2.18.1-post/src: yelp-search-pager.c.orig +diff -upr yelp-2.18.1-pre/src/yelp-search-pager.h yelp-2.18.1-post/src/yelp-search-pager.h +--- yelp-2.18.1-pre/src/yelp-search-pager.h 2007-03-07 13:28:48.000000000 -0600 ++++ yelp-2.18.1-post/src/yelp-search-pager.h 2007-09-14 10:39:24.000000000 -0500 @@ -53,4 +53,5 @@ GType yelp_search_pager_get_t void yelp_search_pager_init (void); YelpSearchPager *yelp_search_pager_get (YelpDocInfo *doc_info); +gboolean yelp_search_pager_search_available (void); #endif /* __YELP_SEARCH_PAGER_H__ */ -diff -upr yelp-2.16.1-pre/src/yelp-settings.c yelp-2.16.1-post/src/yelp-settings.c ---- yelp-2.16.1-pre/src/yelp-settings.c 2006-09-29 08:34:38.000000000 -0500 -+++ yelp-2.16.1-post/src/yelp-settings.c 2006-10-26 11:11:49.000000000 -0500 +diff -upr yelp-2.18.1-pre/src/yelp-settings.c yelp-2.18.1-post/src/yelp-settings.c +--- yelp-2.18.1-pre/src/yelp-settings.c 2007-03-07 13:28:48.000000000 -0600 ++++ yelp-2.18.1-post/src/yelp-settings.c 2007-09-14 10:39:24.000000000 -0500 @@ -35,7 +35,8 @@ #include "yelp-debug.h" @@ -361,9 +363,9 @@ #define KEY_GNOME_FIXED_FONT KEY_GNOME_DIR "/monospace_font_name" #define KEY_GNOME_GTK_THEME KEY_GNOME_DIR "/gtk_theme" -diff -upr yelp-2.16.1-pre/src/yelp-toc-pager.c yelp-2.16.1-post/src/yelp-toc-pager.c ---- yelp-2.16.1-pre/src/yelp-toc-pager.c 2006-09-03 10:35:51.000000000 -0500 -+++ yelp-2.16.1-post/src/yelp-toc-pager.c 2006-11-01 00:34:44.000000000 -0600 +diff -upr yelp-2.18.1-pre/src/yelp-toc-pager.c yelp-2.18.1-post/src/yelp-toc-pager.c +--- yelp-2.18.1-pre/src/yelp-toc-pager.c 2007-03-07 13:28:48.000000000 -0600 ++++ yelp-2.18.1-post/src/yelp-toc-pager.c 2007-09-14 10:39:24.000000000 -0500 @@ -39,6 +39,8 @@ #include <libxml/xpath.h> #include <libxml/xpathInternals.h> @@ -994,10 +996,9 @@ static void xml_trim_titles (xmlNodePtr node, xmlChar * nodetype) -Only in yelp-2.16.1-post/src: yelp-toc-pager.c.orig -diff -upr yelp-2.16.1-pre/src/yelp-utils.c yelp-2.16.1-post/src/yelp-utils.c ---- yelp-2.16.1-pre/src/yelp-utils.c 2006-06-11 21:17:56.000000000 -0500 -+++ yelp-2.16.1-post/src/yelp-utils.c 2006-10-26 11:11:49.000000000 -0500 +diff -upr yelp-2.18.1-pre/src/yelp-utils.c yelp-2.18.1-post/src/yelp-utils.c +--- yelp-2.18.1-pre/src/yelp-utils.c 2007-03-07 13:28:48.000000000 -0600 ++++ yelp-2.18.1-post/src/yelp-utils.c 2007-09-14 10:40:34.000000000 -0500 @@ -82,6 +82,7 @@ static gchar *mandirs[] = { static YelpDocType get_doc_type (gchar *uri); @@ -1175,7 +1176,7 @@ if (*(++cur) != '\0') { if (frag_id) g_free (frag_id); -@@ -628,6 +724,186 @@ yelp_doc_info_add_uri (YelpDocInfo *doc_ +@@ -628,6 +724,198 @@ yelp_doc_info_add_uri (YelpDocInfo *doc_ /** Convert fancy URIs to file URIs *******************************************/ static gchar * @@ -1334,6 +1335,12 @@ + if (result) + goto end; + ++ full_path = g_strdup_printf ("/gnome/help-bundle/%s/%s/%s", path, langs[i], file_name); ++ result = help_uri_expand_datadirs (full_path, path, reference); ++ g_free (full_path); ++ if (result) ++ goto end; ++ + full_path = g_strdup_printf ("/doc/HTML/%s/%s/%s", langs[i], path, file_name); + result = help_uri_expand_datadirs (full_path, path, reference); + g_free (full_path); @@ -1347,6 +1354,12 @@ + if (result) + goto end; + ++ full_path = g_strdup_printf ("/gnome/help-bundle/%s/C/%s", path, file_name); ++ result = help_uri_expand_datadirs (full_path, path, reference); ++ g_free (full_path); ++ if (result) ++ goto end; ++ + full_path = g_strdup_printf ("/doc/HTML/en/%s/%s", path, file_name); + result = help_uri_expand_datadirs (full_path, path, reference); + g_free (full_path); @@ -1362,7 +1375,7 @@ locate_file_lang (gchar *path, gchar *file, const gchar *lang) { gchar *exts[] = {".xml", ".docbook", ".sgml", ".html", "", NULL}; -@@ -662,6 +938,9 @@ convert_ghelp_uri (gchar *uri) +@@ -662,6 +950,9 @@ convert_ghelp_uri (gchar *uri) else goto done; @@ -1372,7 +1385,7 @@ if (path && path[0] == '/') { if ((cur = strchr (path, '?')) || (cur = strchr (path, '#'))) *cur = '\0'; -@@ -943,7 +1222,7 @@ convert_info_uri (gchar *uri) +@@ -946,7 +1237,7 @@ convert_info_uri (gchar *uri) goto done; info_name = g_strndup (path, cur - path); } @@ -1381,9 +1394,10 @@ info_name = g_strndup (path, cur - path); else info_name = g_strdup (path); -diff -upr yelp-2.16.1-pre/src/yelp-utils.h yelp-2.16.1-post/src/yelp-utils.h ---- yelp-2.16.1-pre/src/yelp-utils.h 2006-04-03 23:13:22.000000000 -0500 -+++ yelp-2.16.1-post/src/yelp-utils.h 2006-10-26 11:11:49.000000000 -0500 +Only in yelp-2.18.1-post/src: yelp-utils.c.orig +diff -upr yelp-2.18.1-pre/src/yelp-utils.h yelp-2.18.1-post/src/yelp-utils.h +--- yelp-2.18.1-pre/src/yelp-utils.h 2007-03-07 13:28:48.000000000 -0600 ++++ yelp-2.18.1-post/src/yelp-utils.h 2007-09-14 10:39:24.000000000 -0500 @@ -50,6 +50,7 @@ typedef enum { YELP_URI_TYPE_TOC = 1 << 4, YELP_URI_TYPE_EXTERNAL = 1 << 5, @@ -1402,9 +1416,9 @@ YELP_URI_TYPE_ANY = YELP_URI_TYPE_FILE | YELP_URI_TYPE_NO_FILE -diff -upr yelp-2.16.1-pre/src/yelp-window.c yelp-2.16.1-post/src/yelp-window.c ---- yelp-2.16.1-pre/src/yelp-window.c 2006-09-29 08:34:38.000000000 -0500 -+++ yelp-2.16.1-post/src/yelp-window.c 2006-11-01 00:34:48.000000000 -0600 +diff -upr yelp-2.18.1-pre/src/yelp-window.c yelp-2.18.1-post/src/yelp-window.c +--- yelp-2.18.1-pre/src/yelp-window.c 2007-03-07 13:28:48.000000000 -0600 ++++ yelp-2.18.1-post/src/yelp-window.c 2007-09-14 10:39:24.000000000 -0500 @@ -690,6 +690,7 @@ history_step_back (YelpWindow *window) { YelpWindowPriv *priv; @@ -1448,10 +1462,9 @@ #endif priv->ui_manager = gtk_ui_manager_new (); -Only in yelp-2.16.1-post/src: yelp-window.c.orig -diff -upr yelp-2.16.1-pre/stylesheets/toc2html.xsl yelp-2.16.1-post/stylesheets/toc2html.xsl ---- yelp-2.16.1-pre/stylesheets/toc2html.xsl 2006-07-10 18:50:03.000000000 -0500 -+++ yelp-2.16.1-post/stylesheets/toc2html.xsl 2006-10-31 23:11:15.000000000 -0600 +diff -upr yelp-2.18.1-pre/stylesheets/toc2html.xsl yelp-2.18.1-post/stylesheets/toc2html.xsl +--- yelp-2.18.1-pre/stylesheets/toc2html.xsl 2007-03-07 13:28:48.000000000 -0600 ++++ yelp-2.18.1-post/stylesheets/toc2html.xsl 2007-09-14 10:39:24.000000000 -0500 @@ -8,6 +8,9 @@ <xsl:param name="help_icon"/> <xsl:param name="help_icon_size"/> @@ -1759,4 +1772,3 @@ <!-- tricky recursive xslt --> <xsl:template mode="leftbar.mode" match="toc"> <xsl:param name="curid" select="0"/> -Only in yelp-2.16.1-post/stylesheets: toc2html.xsl~ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org