Commit 33474c07 authored by Luca Ferretti's avatar Luca Ferretti Committed by Luca Ferretti

new file new file new file apply patches needed by scroollkeeper to make

2006-07-25  Luca Ferretti  <elle.uca@libero.it>

	* patches/scrollkeeper_clean_xml_validation_context.patch: new file
	* patches/scrollkeeper_language_fix.patch: new file
	* patches/scrollkeeper_rw_offset_fix.patch: new file
	* modulesets/gnome-2.*: apply patches needed by scroollkeeper to make
	Yelp works and Yelp developers happy. For more info see
	http://live.gnome.org/Yelp

	Note: remove $Prefix/share/jhbuild/packagedb.xml to rebuild it.
parent a31ca81f
2006-07-25 Luca Ferretti <elle.uca@libero.it>
* patches/scrollkeeper_clean_xml_validation_context.patch: new file
* patches/scrollkeeper_language_fix.patch: new file
* patches/scrollkeeper_rw_offset_fix.patch: new file
* modulesets/gnome-2.*: apply patches needed by scroollkeeper to make
Yelp works and Yelp developers happy. For more info see
http://live.gnome.org/Yelp
Note: remove $Prefix/share/jhbuild/packagedb.xml to rebuild it.
2006-07-24 Vincent Untz <vuntz@gnome.org>
* modulesets/gnome-2.16.modules: gnome-panel depends on dbus-glib
......
......@@ -46,6 +46,11 @@
<dep package="libxslt"/>
<dep package="intltool"/>
</dependencies>
<patches>
<patch file="scrollkeeper_clean_xml_validation_context.patch" strip="1"/>
<patch file="scrollkeeper_language_fix.patch" strip="1"/>
<patch file="scrollkeeper_rw_offset_fix.patch" strip="1"/>
</patches>
</tarball>
<include href="freedesktop.modules"/>
......
......@@ -46,6 +46,11 @@
<dep package="libxslt"/>
<dep package="intltool"/>
</dependencies>
<patches>
<patch file="scrollkeeper_clean_xml_validation_context.patch" strip="1"/>
<patch file="scrollkeeper_language_fix.patch" strip="1"/>
<patch file="scrollkeeper_rw_offset_fix.patch" strip="1"/>
</patches>
</tarball>
<autotools id="iso-codes">
......
......@@ -54,6 +54,11 @@
<dep package="libxslt"/>
<dep package="intltool"/>
</dependencies>
<patches>
<patch file="scrollkeeper_clean_xml_validation_context.patch" strip="1"/>
<patch file="scrollkeeper_language_fix.patch" strip="1"/>
<patch file="scrollkeeper_rw_offset_fix.patch" strip="1"/>
</patches>
</tarball>
<autotools id="iso-codes">
......
......@@ -58,6 +58,11 @@
<dep package="libxslt"/>
<dep package="intltool"/>
</dependencies>
<patches>
<patch file="scrollkeeper_clean_xml_validation_context.patch" strip="1"/>
<patch file="scrollkeeper_language_fix.patch" strip="1"/>
<patch file="scrollkeeper_rw_offset_fix.patch" strip="1"/>
</patches>
</tarball>
<autotools id="iso-codes">
......
--- scrollkeeper-0.3.14/libs/install.c.mitr 2004-01-02 23:20:46.000000000 +0100
+++ scrollkeeper-0.3.14/libs/install.c 2004-01-02 23:21:04.000000000 +0100
@@ -187,6 +187,7 @@
return 0;
} else {
xmlValidCtxt cvp;
+ memset (&cvp, 0, sizeof (cvp));
cvp.userData = (char *) &outputprefs;
cvp.error = (xmlValidityErrorFunc) sk_dtd_validation_message;
cvp.warning = (xmlValidityWarningFunc) sk_dtd_validation_message;
diff -Nur scrollkeeper-0.3.14.orig/libs/i18n.c scrollkeeper-0.3.14/libs/i18n.c
--- scrollkeeper-0.3.14.orig/libs/i18n.c 2003-11-10 00:05:36.000000000 +0100
+++ scrollkeeper-0.3.14/libs/i18n.c 2005-08-26 22:55:13.000000000 +0200
@@ -206,7 +206,7 @@
count++;
}
- tab = (char ***)malloc(sizeof(char **) * count);
+ tab = (char ***)malloc(sizeof(char **) * (count + 1));
str = strdup(lang);
check_ptr(str, "");
diff -Nur scrollkeeper-0.3.14/libs/i18n.c scrollkeeper-0.3.14.new/libs/i18n.c
--- scrollkeeper-0.3.14/libs/i18n.c 2006-01-28 16:05:17.000000000 +0100
+++ scrollkeeper-0.3.14.new/libs/i18n.c 2006-01-28 16:05:40.000000000 +0100
@@ -118,7 +118,7 @@
if ((i & ~mask) == 0) {
int length = strlen(language) + strlen(territory)
+ strlen(codeset) + strlen(modifier);
- char *var = (char *) malloc(sizeof(char) * length);
+ char *var = (char *) malloc(sizeof(char) * (length+1));
check_ptr(var, "");
strcpy(var, language);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment