Commit 548806ab authored by Jody Goldberg's avatar Jody Goldberg Committed by Jody Goldberg

Clear some old patches from the tree and regen the SuSE 10.0 patch

2006-03-31  Jody Goldberg <jody@gnome.org>

	* configure.in : force libgsf < 1.13.0
	  gsf_xml_in_parse was renamed to gsf_xml_in_doc_parse in newer
	  versions.
	* README : ditto.
parent 10be042c
2006-03-31 Jody Goldberg <jody@gnome.org>
* configure.in : force libgsf < 1.13.0
gsf_xml_in_parse was renamed to gsf_xml_in_doc_parse in newer
versions.
* README : ditto.
2006-03-14 Jody Goldberg <jody@gnome.org>
* configure.in : post release bump and mark as dormant.
......
......@@ -19,6 +19,7 @@ You need: Debian package name
libgnomeprint >= 2.5.2 libgnomeprint2.2-dev
libgnomeprintui >= 2.5.2 libgnomeprintui2.2-dev
libgsf >= 1.12.2 libgsf-1-dev
libgsf < 1.13.0 newer versions changed api
libglade >= 2.3.6 libglade2-dev
intltool >= 0.27.2 intltool
gnome-xml >= 2.4.12 libxml2-dev
......@@ -28,6 +29,7 @@ You need: Debian package name
Optionally:
libgsf-gnome >= 1.12.2 libgsf-gnome-1-dev
libgsf-gnome < 1.13.0 newer versions changed api
libgnome >= 2.0.0 libgnome2-dev
libgnomeui >= 2.0.0 libgnomeui-dev
libbonobo >= 2.0.0 libbonobo2-dev
......
......@@ -99,6 +99,7 @@ gnumeric_reqs="
gobject-2.0 >= 2.4.0
gmodule-2.0 >= 2.4.0
libgsf-1 >= 1.12.2
libgsf-1 < 1.13.0
libxml-2.0 >= 2.4.12
pango >= 1.4.0
pangoft2 >= 1.4.0
......@@ -118,6 +119,7 @@ gnumeric_gnome_reqs="
libgnome-2.0 >= 2.0.0
libgnomeui-2.0 >= 2.0.0
libgsf-gnome-1 >= 1.12.2
libgsf-gnome-1 < 1.13.0
"
ui_msg=
......
......@@ -1279,7 +1279,6 @@ xml_sax_object_start (GsfXMLIn *gsf_state, xmlChar const **attrs)
{
XMLSaxParseState *state = (XMLSaxParseState *)gsf_state;
char const *type_name = gsf_state->node->name;
char *tmp;
int tmp_int;
SheetObject *so;
......@@ -1341,7 +1340,7 @@ xml_sax_object_start (GsfXMLIn *gsf_state, xmlChar const **attrs)
so->anchor.offset +2, so->anchor.offset +3);
} else if (!strcmp (attrs[0], "ObjectanchorType")) {
int i[4], count;
sscanf (tmp, "%d %d %d %d", i+0, i+1, i+2, i+3);
sscanf (attrs[1], "%d %d %d %d", i+0, i+1, i+2, i+3);
for (count = 4; count-- > 0 ; )
so->anchor.type[count] = i[count];
......
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