Mailinglist Archive: opensuse-commit (1083 mails)
| < Previous | Next > |
commit yelp
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Sat, 01 Sep 2007 13:24:49 +0200
- Message-id: <20070901112449.D6E09678331@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package yelp
checked in at Sat Sep 1 13:24:49 CEST 2007.
--------
--- GNOME/yelp/yelp.changes 2007-08-07 18:12:35.000000000 +0200
+++ /mounts/work_src_done/STABLE/yelp/yelp.changes 2007-09-01 06:50:44.277468000 +0200
@@ -1,0 +2,24 @@
+Sat Sep 1 06:47:46 CEST 2007 - hpj@xxxxxxx
+
+- Add yelp-2.19.90-freed-memory-crash.patch (BGO #469436).
+- Add yelp-2.19.90-freed-memory-crash-2.patch (BGO #469438).
+- Add yelp-2.19.90-no-mime-type-crash.patch (BGO #472128).
+
+-------------------------------------------------------------------
+Fri Aug 31 18:49:48 CEST 2007 - maw@xxxxxxx
+
+- Update to version 2.19.90:
+ + Build fixes
+ + Use x-yelp-index instead of index, unbreaking some docbook
+ files
+ + Write html on demand instead of when idle, fixing info page
+ usage
+ + Add a "phrase not found" message to the find bar
+ + Fix "info <page>" in the serach bar
+ + Register EXSLT extensions
+ + Other bugs (bugzilla.gnome.org) fixed: #447107, #431078,
+ #430365, #381431, #364768, #370167, #358825, #464295, #457082,
+ #462440, #462813, #450168, #463281, #458693, and #462056
+ + Updated translations.
+
+-------------------------------------------------------------------
Old:
----
yelp-2.19.1.tar.bz2
New:
----
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
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yelp.spec ++++++
--- /var/tmp/diff_new_pack.H11524/_old 2007-09-01 13:24:41.000000000 +0200
+++ /var/tmp/diff_new_pack.H11524/_new 2007-09-01 13:24:41.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yelp (Version 2.19.1)
+# spec file for package yelp (Version 2.19.90)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -16,8 +16,8 @@
Requires: gnome-utils susehelp
License: GPL v2 or later, LGPL v2 or later
Group: System/GUI/GNOME
-Version: 2.19.1
-Release: 4
+Version: 2.19.90
+Release: 1
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
@@ -33,6 +33,9 @@
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
PreReq: filesystem gconf2
Requires: gnome-doc-utils rarian
Requires: libbeagle >= 0.2.0
@@ -78,6 +81,9 @@
#%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.*
@@ -119,6 +125,24 @@
%files lang -f %{name}.lang
%changelog
+* Sat Sep 01 2007 - hpj@xxxxxxx
+- Add yelp-2.19.90-freed-memory-crash.patch (BGO #469436).
+- Add yelp-2.19.90-freed-memory-crash-2.patch (BGO #469438).
+- Add yelp-2.19.90-no-mime-type-crash.patch (BGO #472128).
+* Fri Aug 31 2007 - maw@xxxxxxx
+- Update to version 2.19.90:
+ + Build fixes
+ + Use x-yelp-index instead of index, unbreaking some docbook
+ files
+ + Write html on demand instead of when idle, fixing info page
+ usage
+ + Add a "phrase not found" message to the find bar
+ + Fix "info <page>" in the serach bar
+ + Register EXSLT extensions
+ + Other bugs (bugzilla.gnome.org) fixed: #447107, #431078,
+ [#430365], #381431, #364768, #370167, #358825, #464295, #457082,
+ [#462440], #462813, #450168, #463281, #458693, and #462056
+ + Updated translations.
* Tue Aug 07 2007 - maw@xxxxxxx
- Split off a -lang subpackage.
* Sat Aug 04 2007 - maw@xxxxxxx
++++++ yelp-2.19.90-freed-memory-crash-2.patch ++++++
diff -upr yelp-2.19.90-pre/src/yelp-window.c yelp-2.19.90-post/src/yelp-window.c
--- yelp-2.19.90-pre/src/yelp-window.c 2007-08-13 15:49:46.000000000 -0500
+++ yelp-2.19.90-post/src/yelp-window.c 2007-08-22 16:52:10.000000000 -0500
@@ -1008,6 +1008,8 @@ yelp_window_load (YelpWindow *window, co
doc = priv->current_document;
} else {
g_free (priv->base_uri);
+ priv->base_uri = NULL;
+
switch (type) {
case YELP_RRN_TYPE_TOC:
doc = yelp_toc_get ();
@@ -1037,6 +1039,7 @@ 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);
break;
case YELP_RRN_TYPE_EXTERNAL:
@@ -1046,6 +1049,9 @@ yelp_window_load (YelpWindow *window, co
gchar *cmd = NULL;
gint status = 0;
GError *error = NULL;
+
+ priv->base_uri = g_strdup ("file:///fakefile");
+
cmd = g_strdup_printf ("gnome-open %s", uri);
if (!g_spawn_command_line_sync (cmd, &str_stdout, &str_stderr, &status, &error)) {
g_free (error);
@@ -1063,8 +1069,10 @@ yelp_window_load (YelpWindow *window, co
return;
}
}
+ break;
default:
+ priv->base_uri = g_strdup ("file:///fakefile");
break;
}
}
++++++ yelp-2.19.90-freed-memory-crash.patch ++++++
diff -upr yelp-2.19.90-pre/src/yelp-transform.c yelp-2.19.90-post/src/yelp-transform.c
--- yelp-2.19.90-pre/src/yelp-transform.c 2007-08-13 15:49:46.000000000 -0500
+++ yelp-2.19.90-post/src/yelp-transform.c 2007-08-22 16:17:11.000000000 -0500
@@ -342,6 +342,7 @@ xslt_yelp_document (xsltTransformContext
{
YelpTransform *transform;
xmlChar *page_id = NULL;
+ gchar *temp;
xmlChar *page_buf;
gint buf_size;
xsltStylesheetPtr style = NULL;
@@ -363,7 +364,9 @@ xslt_yelp_document (xsltTransformContext
page_id = xsltEvalAttrValueTemplate (ctxt, inst,
(const xmlChar *) "href",
NULL);
- if (page_id == NULL) {
+ if (page_id == NULL || *page_id == '\0') {
+ if (page_id)
+ xmlFree (page_id);
xsltTransformError (ctxt, NULL, inst,
_("No href attribute found on yelp:document"));
/* FIXME: put a real error here */
@@ -401,10 +404,15 @@ xslt_yelp_document (xsltTransformContext
ctxt->insert = old_insert;
g_mutex_lock (transform->mutex);
- g_hash_table_insert (transform->chunks, page_id, page_buf);
- g_async_queue_push (transform->queue, g_strdup ((gchar *) page_id));
+
+ temp = g_strdup (page_id);
+ xmlFree (page_id);
+
+ g_async_queue_push (transform->queue, g_strdup ((gchar *) temp));
+ g_hash_table_insert (transform->chunks, temp, page_buf);
transform->idle_funcs++;
g_idle_add ((GSourceFunc) transform_chunk, transform);
+
g_mutex_unlock (transform->mutex);
done:
++++++ yelp-2.19.90-no-mime-type-crash.patch ++++++
diff -upr yelp-2.19.90-pre/src/yelp-utils.c yelp-2.19.90-post/src/yelp-utils.c
--- yelp-2.19.90-pre/src/yelp-utils.c 2007-08-13 15:49:46.000000000 -0500
+++ yelp-2.19.90-post/src/yelp-utils.c 2007-08-30 23:16:20.000000000 -0500
@@ -73,7 +73,8 @@ resolve_process_ghelp (char *uri, gchar
else
mime = gnome_vfs_get_mime_type (*result);
- if (g_str_equal (mime, "text/xml") ||
+ if (!mime ||
+ g_str_equal (mime, "text/xml") ||
g_str_equal (mime, "application/docbook+xml") ||
g_str_equal (mime, "application/xml"))
type = YELP_RRN_TYPE_DOC;
++++++ yelp-2.19.1.tar.bz2 -> yelp-2.19.90.tar.bz2 ++++++
++++ 41168 lines of diff (skipped)
++++++ yelp-desktop.patch ++++++
--- /var/tmp/diff_new_pack.H11524/_old 2007-09-01 13:24:43.000000000 +0200
+++ /var/tmp/diff_new_pack.H11524/_new 2007-09-01 13:24:43.000000000 +0200
@@ -1,16 +1,13 @@
Index: yelp.desktop.in.in
-================================================================================
---- yelp.desktop.in.in
+===================================================================
+--- yelp.desktop.in.in.orig
+++ yelp.desktop.in.in
-@@ -1,9 +1,9 @@
+@@ -1,7 +1,7 @@
[Desktop Entry]
Encoding=UTF-8
_Name=Help
-_Comment=Get help with GNOME
+_GenericName=Get help with GNOME
Exec=yelp
--Icon=gnome-help.png
-+Icon=gnome-help
+ Icon=gnome-help
StartupNotify=true
- Terminal=false
- Type=Application
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |