diff options
Diffstat (limited to 'app-office/dia/files')
| -rw-r--r-- | app-office/dia/files/0.94-disable_python_gtk_import.patch | 10 | ||||
| -rw-r--r-- | app-office/dia/files/dia-0.94-db2man.patch | 21 | ||||
| -rw-r--r-- | app-office/dia/files/dia-0.94-gcc4.patch | 23 | ||||
| -rw-r--r-- | app-office/dia/files/dia-0.94-help.patch | 82 | ||||
| -rw-r--r-- | app-office/dia/files/dia-0.94-no_font_cache.patch | 18 | ||||
| -rw-r--r-- | app-office/dia/files/dia-0.94-pkgconfig.patch | 10 | ||||
| -rw-r--r-- | app-office/dia/files/dia-0.94-png.patch | 127 | ||||
| -rw-r--r-- | app-office/dia/files/dia-0.94-secure-eval.patch | 52 | ||||
| -rw-r--r-- | app-office/dia/files/dia-0.94_xfigoverflowfix.patch | 202 | ||||
| -rw-r--r-- | app-office/dia/files/digest-dia-0.94-r3 | 3 | ||||
| -rw-r--r-- | app-office/dia/files/digest-dia-0.94-r4 | 6 | ||||
| -rw-r--r-- | app-office/dia/files/digest-dia-0.94-r5 | 6 |
12 files changed, 0 insertions, 560 deletions
diff --git a/app-office/dia/files/0.94-disable_python_gtk_import.patch b/app-office/dia/files/0.94-disable_python_gtk_import.patch deleted file mode 100644 index ec93f258bfc3..000000000000 --- a/app-office/dia/files/0.94-disable_python_gtk_import.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.in~ 2004-08-17 16:03:26.000000000 +0100 -+++ configure.in 2005-04-27 18:35:43.231299642 +0100 -@@ -401,7 +401,6 @@ - - if test "x$with_python" != xno; then - AM_PATH_PYTHON(1.5.2) -- AM_CHECK_PYMOD(gtk,,,[AC_MSG_ERROR(could not find pygtk module)]) - AM_CHECK_PYTHON_HEADERS - AM_CHECK_PYTHON_LIB - diff --git a/app-office/dia/files/dia-0.94-db2man.patch b/app-office/dia/files/dia-0.94-db2man.patch deleted file mode 100644 index c1abb4a09da1..000000000000 --- a/app-office/dia/files/dia-0.94-db2man.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -NurdB dia-0.94/configure.in dia-0.94-patched/configure.in ---- dia-0.94/configure.in 2005-07-12 02:54:25.000000000 -0500 -+++ dia-0.94-patched/configure.in 2005-07-12 02:57:37.000000000 -0500 -@@ -386,14 +386,9 @@ - - dnl Have to have the nwalsh docbook.xsl, which does manpages. - dnl RedHat installs it in a version-numbered place. Grumpf. --db2man_file= --for file in \ -- /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl \ -- /usr/share/sgml/docbook/xsl-stylesheets-\*/manpages/docbook.xsl; do -- if test -f $file; then db2man_file=$file; break; fi --done --AM_CONDITIONAL(HAVE_DB2MAN, test "x$db2man_file" != x) --AC_SUBST(DB2MAN, "$db2man_file") -+AC_PATH_PROG(XSLTPROC, xsltproc, no) -+AM_CONDITIONAL(HAVE_DB2MAN, test "x$XSLTPROC" != xno) -+AC_SUBST(DB2MAN, "http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl") - - dnl Handling for Python - AC_ARG_WITH(python, diff --git a/app-office/dia/files/dia-0.94-gcc4.patch b/app-office/dia/files/dia-0.94-gcc4.patch deleted file mode 100644 index 134c429435c0..000000000000 --- a/app-office/dia/files/dia-0.94-gcc4.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -ur dia-0.94-orig/objects/custom/shape_info.h dia-0.94/objects/custom/shape_info.h ---- dia-0.94-orig/objects/custom/shape_info.h 2005-04-15 18:45:52.000000000 -0400 -+++ dia-0.94/objects/custom/shape_info.h 2005-04-15 18:36:55.000000000 -0400 -@@ -166,7 +166,6 @@ - - void shape_info_realise(ShapeInfo* info); - void shape_info_print(ShapeInfo *info); --void parse_path(ShapeInfo *info, const char *path_str, DiaSvgGraphicStyle *s); - - /*MC 11/03 handy g_new0 variant for struct with variable size */ - #define g_new0_ext(struct_type, ext_size) \ -diff -ur dia-0.94-orig/plug-ins/python/pydia-object.h dia-0.94/plug-ins/python/pydia-object.h ---- dia-0.94-orig/plug-ins/python/pydia-object.h 2005-04-15 18:45:13.000000000 -0400 -+++ dia-0.94/plug-ins/python/pydia-object.h 2005-04-15 18:46:31.000000000 -0400 -@@ -22,7 +22,7 @@ - - #include <Python.h> - --#include "object.h" -+#include "lib/object.h" - - typedef struct { - PyObject_HEAD diff --git a/app-office/dia/files/dia-0.94-help.patch b/app-office/dia/files/dia-0.94-help.patch deleted file mode 100644 index 9daf87f3080e..000000000000 --- a/app-office/dia/files/dia-0.94-help.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff -NurdB dia-0.94-orig/app/commands.c dia-0.94/app/commands.c ---- dia-0.94-orig/app/commands.c 2005-03-16 20:02:59.000000000 -0500 -+++ dia-0.94/app/commands.c 2005-03-16 21:13:01.000000000 -0500 -@@ -518,6 +518,9 @@ - void - help_manual_callback(gpointer data, guint action, GtkWidget *widget) - { -+#ifdef GNOME -+ gnome_help_display("dia", NULL, NULL); -+#else - char *helpdir, *helpindex = NULL, *command; - guint bestscore = G_MAXINT; - GDir *dp; -@@ -579,6 +582,7 @@ - #endif - - g_free(helpindex); -+#endif /* GNOME */ - } - - void -diff -NurdB dia-0.94-orig/doc/en/Makefile.in dia-0.94/doc/en/Makefile.in ---- dia-0.94-orig/doc/en/Makefile.in 2005-03-16 20:02:59.000000000 -0500 -+++ dia-0.94/doc/en/Makefile.in 2005-03-17 01:41:43.000000000 -0500 -@@ -317,13 +317,13 @@ - # ********** Begin of section some packagers may need to modify ********** - # This variable (docdir) specifies where the documents should be installed. - # This default value should work for most packages. --docdir = $(datadir)/gnome/help/$(docname)/$(lang) -+@HAVE_GNOME_FALSE@helpdir = $(pkgdatadir)/help -+@HAVE_GNOME_TRUE@helpdir = $(datadir)/gnome/help/dia -+docdir = $(helpdir)/$(lang) - - # ********** You should not have to edit below this line ********** - xml_files = $(entities) $(docname).xml --EXTRA_DIST = $(xml_files) $(omffile) \ -- dia.1 \ -- dia.dbk \ -+xml_files += \ - authors.xml \ - dia.xml \ - entities.xml \ -@@ -338,10 +338,6 @@ - usage-objects-special.xml \ - usage-objects.xml \ - usage-quickstart.xml \ -- graphics/line_props.png \ -- graphics/home_network.png \ -- graphics/line_icon.png \ -- graphics/greendots.png - - CLEANFILES = omf_timestamp - omf_dest_dir = $(datadir)/omf/@PACKAGE@ -diff -NurdB dia-0.94-orig/doc/pl/Makefile.in dia-0.94/doc/pl/Makefile.in ---- dia-0.94-orig/doc/pl/Makefile.in 2005-03-16 20:02:59.000000000 -0500 -+++ dia-0.94/doc/pl/Makefile.in 2005-03-17 01:42:44.000000000 -0500 -@@ -313,11 +313,13 @@ - # ********** Begin of section some packagers may need to modify ********** - # This variable (docdir) specifies where the documents should be installed. - # This default value should work for most packages. --docdir = $(datadir)/gnome/help/$(docname)/$(lang) -+@HAVE_GNOME_FALSE@helpdir = $(pkgdatadir)/help -+@HAVE_GNOME_TRUE@helpdir = $(datadir)/gnome/help/dia -+docdir = $(helpdir)/$(lang) - - # ********** You should not have to edit below this line ********** - xml_files = $(entities) $(docname).xml --EXTRA_DIST = $(xml_files) $(omffile) \ -+xml_files += \ - authors.xml \ - dia.xml \ - intro.xml \ -@@ -330,9 +332,6 @@ - usage-objects-special.xml \ - usage-objects.xml \ - usage-quickstart.xml \ -- graphics/line_props.png \ -- graphics/home_network.png \ -- graphics/greendots.png - - CLEANFILES = omf_timestamp - omf_dest_dir = $(datadir)/omf/@PACKAGE@ diff --git a/app-office/dia/files/dia-0.94-no_font_cache.patch b/app-office/dia/files/dia-0.94-no_font_cache.patch deleted file mode 100644 index 9e13979e2ab0..000000000000 --- a/app-office/dia/files/dia-0.94-no_font_cache.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- dia-0.94/lib/font.c 2004-12-17 21:51:41.000000000 +0000 -+++ dia-0.94/lib/font.c.new 2004-12-17 22:58:38.379589320 +0000 -@@ -628,6 +628,7 @@ - item->string = g_strdup(string); - item->font = font; - -+#if 0 - /* If it's in the cache, use that instead. */ - cached = g_hash_table_lookup(layoutcache, item); - if (cached != NULL) { -@@ -637,6 +638,7 @@ - cached->usecount ++; - return cached->layout; - } -+#endif - - dia_font_ref(font); - diff --git a/app-office/dia/files/dia-0.94-pkgconfig.patch b/app-office/dia/files/dia-0.94-pkgconfig.patch deleted file mode 100644 index 9859f6d89e64..000000000000 --- a/app-office/dia/files/dia-0.94-pkgconfig.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.in 2006/01/15 00:17:25 1.1 -+++ configure.in 2006/01/15 00:17:38 -@@ -53,7 +53,6 @@ AC_SUBST(APP_LIBS) - dnl Checks for libraries - - AM_PATH_GLIB_2_0(2.0.0) --AM_PATH_GTK_2_0(2.0.0) - - GTK_MODULES="gtk+-2.0 libxml-2.0 gdk-pixbuf-2.0" - PKG_CHECK_MODULES(PANGOVERSION, pango >= 1.1.5, , diff --git a/app-office/dia/files/dia-0.94-png.patch b/app-office/dia/files/dia-0.94-png.patch deleted file mode 100644 index 84ca2ae4d4c4..000000000000 --- a/app-office/dia/files/dia-0.94-png.patch +++ /dev/null @@ -1,127 +0,0 @@ -diff -ur dia-0.94/sheets/ER/Makefile.am dia-0.94-png/sheets/ER/Makefile.am ---- dia-0.94/sheets/ER/Makefile.am 2004-08-16 15:56:30.000000000 +0800 -+++ dia-0.94-png/sheets/ER/Makefile.am 2005-11-02 16:56:49.000000000 +0800 -@@ -1,7 +1,7 @@ - ERsheetdir = $(pkgdatadir)/sheets/ER - - PIX = \ -- weakentity.xpm -+ weakentity.png - - ERsheet_DATA = $(PIX) - -diff -ur dia-0.94/sheets/GRAFCET/Makefile.am dia-0.94-png/sheets/GRAFCET/Makefile.am ---- dia-0.94/sheets/GRAFCET/Makefile.am 2004-08-16 15:56:30.000000000 +0800 -+++ dia-0.94-png/sheets/GRAFCET/Makefile.am 2005-11-02 17:00:04.000000000 +0800 -@@ -2,12 +2,12 @@ - GRAFCETsheetdir = $(pkgdatadir)/sheets/GRAFCET - - PIX = \ -- etapei.xpm \ -- etapems.xpm \ -- etapeme.xpm \ -- etapemc.xpm \ -- etapesp.xpm \ -- vergent_and.xpm -+ etapei.png \ -+ etapems.png \ -+ etapeme.png \ -+ etapemc.png \ -+ etapesp.png \ -+ vergent_and.png - - GRAFCETsheet_DATA = $(PIX) - EXTRA_DIST = $(PIX) -diff -ur dia-0.94/sheets/Istar/Makefile.am dia-0.94-png/sheets/Istar/Makefile.am ---- dia-0.94/sheets/Istar/Makefile.am 2004-08-16 15:56:31.000000000 +0800 -+++ dia-0.94-png/sheets/Istar/Makefile.am 2005-11-02 17:10:13.000000000 +0800 -@@ -2,16 +2,16 @@ - Istarsheetdir = $(pkgdatadir)/sheets/Istar - - PIX = \ -- agent.xpm \ -- decomposition.xpm \ -- dependency.xpm \ -- goal.xpm \ -- means_ends.xpm \ -- neg_contrib.xpm \ -- pos_contrib.xpm \ -- position.xpm \ -- role.xpm \ -- task.xpm -+ agent.png \ -+ decomposition.png \ -+ dependency.png \ -+ goal.png \ -+ means_ends.png \ -+ neg_contrib.png \ -+ pos_contrib.png \ -+ position.png \ -+ role.png \ -+ task.png - - Istarsheet_DATA = $(PIX) - EXTRA_DIST = $(PIX) -diff -ur dia-0.94/sheets/Jackson/Makefile.am dia-0.94-png/sheets/Jackson/Makefile.am ---- dia-0.94/sheets/Jackson/Makefile.am 2004-08-16 15:56:31.000000000 +0800 -+++ dia-0.94-png/sheets/Jackson/Makefile.am 2005-11-02 17:11:00.000000000 +0800 -@@ -2,9 +2,9 @@ - Jacksonsheetdir = $(pkgdatadir)/sheets/Jackson - - PIX = \ -- designed_domain.xpm \ -- machine_domain.xpm \ -- req_phen.xpm -+ designed_domain.png \ -+ machine_domain.png \ -+ req_phen.png - - Jacksonsheet_DATA = $(PIX) - EXTRA_DIST = $(PIX) -diff -ur dia-0.94/sheets/KAOS/Makefile.am dia-0.94-png/sheets/KAOS/Makefile.am ---- dia-0.94/sheets/KAOS/Makefile.am 2004-08-16 15:56:31.000000000 +0800 -+++ dia-0.94-png/sheets/KAOS/Makefile.am 2005-11-02 18:16:47.000000000 +0800 -@@ -2,24 +2,24 @@ - KAOSsheetdir = $(pkgdatadir)/sheets/KAOS - - PIX = \ -- and-complete-ref.xpm \ -- and-ref.xpm \ -- assumption.xpm \ -- capable-of.xpm \ -- conflicts.xpm \ -- controls.xpm \ -- input.xpm \ -- monitors.xpm \ -- obstacle.xpm \ -- obstructs.xpm \ -- op-ref.xpm \ -- or-complete-ref.xpm \ -- or-ref.xpm \ -- output.xpm \ -- performs.xpm \ -- requirement.xpm \ -- responsibility.xpm \ -- softgoal.xpm -+ and-complete-ref.png \ -+ and-ref.png \ -+ assumption.png \ -+ capable-of.png \ -+ conflicts.png \ -+ controls.png \ -+ input.png \ -+ monitors.png \ -+ obstacle.png \ -+ obstructs.png \ -+ op-ref.png \ -+ or-complete-ref.png \ -+ or-ref.png \ -+ output.png \ -+ performs.png \ -+ requirement.png \ -+ responsibility.png \ -+ softgoal.png - - KAOSsheet_DATA = $(PIX) - EXTRA_DIST = $(PIX) - diff --git a/app-office/dia/files/dia-0.94-secure-eval.patch b/app-office/dia/files/dia-0.94-secure-eval.patch deleted file mode 100644 index 7126dc78838c..000000000000 --- a/app-office/dia/files/dia-0.94-secure-eval.patch +++ /dev/null @@ -1,52 +0,0 @@ -Index: plug-ins/python/diasvg_import.py -=================================================================== ---- plug-ins/python/diasvg_import.py (revision 7) -+++ plug-ins/python/diasvg_import.py (working copy) -@@ -54,6 +54,10 @@ - return (int(m.group(1)) / 255.0, int(m.group(2)) / 255.0, int(m.group(2)) / 255.0) - # any more ugly color definitions not compatible with pango_color_parse() ? - return string.strip(s) -+ -+def eval_secure(s): -+ return string.translate(s, string.maketrans("\"()", "___")) -+ - class Object : - def __init__(self) : - self.props = {"x" : 0, "y" : 0, "stroke" : "none"} -@@ -65,7 +69,8 @@ - sp2 = string.split(string.strip(s1), ":") - if len(sp2) == 2 : - try : -- eval("self." + string.replace(sp2[0], "-", "_") + "(\"" + string.strip(sp2[1]) + "\")") -+ eval("self." + eval_secure(string.replace(sp2[0], "-", "_")) + -+ "(\"" + eval_secure(string.strip(sp2[1])) + "\")") - except AttributeError : - self.props[sp2[0]] = string.strip(sp2[1]) - def x(self, s) : -@@ -282,7 +287,7 @@ - def CopyProps(self, dest) : - # to be used to inherit group props to childs _before_ they get their own - for p in self.props.keys() : -- sf = "dest." + string.replace(p, "-", "_") + "(\"" + str(self.props[p]) + "\")" -+ sf = "dest." + eval_secure(string.replace(p, "-", "_")) + "(\"" + eval_secure(str(self.props[p])) + "\")" - try : # accessor first - eval(sf) - except : -@@ -561,7 +566,7 @@ - o = Group() - stack.append(o) - else : -- s = string.capitalize(name) + "()" -+ s = eval_secure(string.capitalize(name)) + "()" - try : - o = eval(s) - except : -@@ -575,7 +580,7 @@ - ma = string.replace(a, "-", "_") - # e.g. xlink:href -> xlink__href - ma = string.replace(ma, ":", "__") -- s = "o." + ma + "(\"" + attrs[a] + "\")" -+ s = "o." + eval_secure(ma) + "(\"" + eval_secure(attrs[a]) + "\")" - try : - eval(s) - except AttributeError, msg : diff --git a/app-office/dia/files/dia-0.94_xfigoverflowfix.patch b/app-office/dia/files/dia-0.94_xfigoverflowfix.patch deleted file mode 100644 index 0462b9274b80..000000000000 --- a/app-office/dia/files/dia-0.94_xfigoverflowfix.patch +++ /dev/null @@ -1,202 +0,0 @@ ---- dia-0.94/plug-ins/xfig/xfig-import.c.orig 2004-08-16 09:56:21.000000000 +0200 -+++ dia-0.94/plug-ins/xfig/xfig-import.c 2006-03-29 21:40:21.000000000 +0200 -@@ -441,11 +441,17 @@ - static Color - fig_color(int color_index) - { -- if (color_index == -1) -+ if (color_index <= -1) - return color_black; /* Default color */ -- if (color_index < FIG_MAX_DEFAULT_COLORS) -+ else if (color_index < FIG_MAX_DEFAULT_COLORS) - return fig_default_colors[color_index]; -- else return fig_colors[color_index-FIG_MAX_DEFAULT_COLORS]; -+ else if (color_index < FIG_MAX_USER_COLORS) -+ return fig_colors[color_index-FIG_MAX_DEFAULT_COLORS]; -+ else { -+ message_error(_("Color index %d too high, only 512 colors allowed. Using black instead."), -+ color_index); -+ return color_black; -+ } - } - - static Color -@@ -563,23 +569,25 @@ - static int - fig_read_n_points(FILE *file, int n, Point **points) { - int i; -- Point *new_points; -- -- new_points = (Point*)g_malloc(sizeof(Point)*n); -+ GArray *points_list = g_array_sized_new(FALSE, FALSE, sizeof(Point), n); - - for (i = 0; i < n; i++) { - int x,y; -+ Point p; - if (fscanf(file, " %d %d ", &x, &y) != 2) { - message_error(_("Error while reading %dth of %d points: %s\n"), - i, n, strerror(errno)); -- free(new_points); -+ g_array_free(points_list, TRUE); - return FALSE; - } -- new_points[i].x = x/FIG_UNIT; -- new_points[i].y = y/FIG_UNIT; -+ p.x = x/FIG_UNIT; -+ p.y = y/FIG_UNIT; -+ g_array_append_val(points_list, p); - } - fscanf(file, "\n"); -- *points = new_points; -+ -+ *points = (Point *)points_list->data; -+ g_array_free(points_list, FALSE); - return TRUE; - } - -@@ -683,7 +691,7 @@ - return text_buf; - } - --static GList *depths[1000]; -+static GList *depths[FIG_MAX_DEPTHS]; - - /* If there's something in the compound stack, we ignore the depth field, - as it will be determined by the group anyway */ -@@ -693,6 +701,26 @@ - level. Best we can do now. */ - static int compound_depth; - -+/** Add an object at a given depth. This function checks for depth limits -+ * and updates the compound depth if needed. -+ * -+ * @param newobj An object to add. If we're inside a compound, this -+ * doesn't really add the object. -+ * @param depth A depth as in the Fig format, max 999 -+ */ -+static void -+add_at_depth(DiaObject *newobj, int depth) { -+ if (depth < 0 || depth >= FIG_MAX_DEPTHS) { -+ message_error(_("Depth %d of of range, only 0-%d allowed.\n"), -+ depth, FIG_MAX_DEPTHS-1); -+ depth = FIG_MAX_DEPTHS - 1; -+ } -+ if (compound_stack == NULL) -+ depths[depth] = g_list_append(depths[depth], newobj); -+ else -+ if (compound_depth > depth) compound_depth = depth; -+} -+ - static DiaObject * - fig_read_ellipse(FILE *file, DiagramData *dia) { - int sub_type; -@@ -749,10 +777,7 @@ - /* Angle -- can't rotate yet */ - - /* Depth field */ -- if (compound_stack == NULL) -- depths[depth] = g_list_append(depths[depth], newobj); -- else -- if (compound_depth > depth) compound_depth = depth; -+ add_at_depth(newobj, depth); - - return newobj; - } -@@ -885,10 +910,7 @@ - /* Cap style */ - - /* Depth field */ -- if (compound_stack == NULL) -- depths[depth] = g_list_append(depths[depth], newobj); -- else -- if (compound_depth > depth) compound_depth = depth; -+ add_at_depth(newobj, depth); - exit: - prop_list_free(props); - g_free(forward_arrow_info); -@@ -1111,10 +1133,7 @@ - /* Cap style */ - - /* Depth field */ -- if (compound_stack == NULL) -- depths[depth] = g_list_append(depths[depth], newobj); -- else -- if (compound_depth > depth) compound_depth = depth; -+ add_at_depth(newobj, depth); - exit: - prop_list_free(props); - g_free(forward_arrow_info); -@@ -1202,10 +1221,7 @@ - /* Cap style */ - - /* Depth field */ -- if (compound_stack == NULL) -- depths[depth] = g_list_append(depths[depth], newobj); -- else -- if (compound_depth > depth) compound_depth = depth; -+ add_at_depth(newobj, depth); - - exit: - g_free(forward_arrow_info); -@@ -1298,10 +1314,7 @@ - newobj->ops->set_props(newobj, props); - - /* Depth field */ -- if (compound_stack == NULL) -- depths[depth] = g_list_append(depths[depth], newobj); -- else -- if (compound_depth > depth) compound_depth = depth; -+ add_at_depth(newobj, depth); - - exit: - if (text_buf != NULL) free(text_buf); -@@ -1347,6 +1360,12 @@ - return FALSE; - } - -+ if (colornumber < 32 || colornumber > FIG_MAX_USER_COLORS) { -+ message_error(_("Color number %d out of range 0..%d. Discarding color.\n"), -+ colornumber, FIG_MAX_USER_COLORS); -+ return FALSE; -+ } -+ - color.red = ((colorvalues & 0x00ff0000)>>16) / 255.0; - color.green = ((colorvalues & 0x0000ff00)>>8) / 255.0; - color.blue = (colorvalues & 0x000000ff) / 255.0; -@@ -1393,7 +1412,7 @@ - } - /* Group extends don't really matter */ - if (compound_stack == NULL) -- compound_depth = 999; -+ compound_depth = FIG_MAX_DEPTHS - 1; - compound_stack = g_slist_append(compound_stack, NULL); - return TRUE; - break; -@@ -1551,7 +1570,7 @@ - for (i = 0; i < FIG_MAX_USER_COLORS; i++) { - fig_colors[i] = color_black; - } -- for (i = 0; i < 1000; i++) { -+ for (i = 0; i < FIG_MAX_DEPTHS; i++) { - depths[i] = NULL; - } - -@@ -1606,7 +1625,7 @@ - } while (TRUE); - - /* Now we can reorder for the depth fields */ -- for (i = 0; i < 1000; i++) { -+ for (i = 0; i < FIG_MAX_DEPTHS; i++) { - if (depths[i] != NULL) - layer_add_objects_first(dia->active_layer, depths[i]); - } ---- dia-0.94/plug-ins/xfig/xfig.h 2004-08-16 03:56:21.000000000 -0400 -+++ dia-0.94.new/plug-ins/xfig/xfig.h 2006-04-20 17:19:28.000000000 -0400 -@@ -6,6 +6,7 @@ - - #define FIG_MAX_DEFAULT_COLORS 32 - #define FIG_MAX_USER_COLORS 512 -+#define FIG_MAX_DEPTHS 1000 - /* 1200 PPI */ - #define FIG_UNIT 472.440944881889763779527559055118 - /* 1/80 inch */ diff --git a/app-office/dia/files/digest-dia-0.94-r3 b/app-office/dia/files/digest-dia-0.94-r3 deleted file mode 100644 index bf65aff6064c..000000000000 --- a/app-office/dia/files/digest-dia-0.94-r3 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 63584224912dab49fed8d2cf87ea2d85 dia-0.94.tar.bz2 3348869 -RMD160 a3f220e4c6304afdd6977f985756515c9aed1545 dia-0.94.tar.bz2 3348869 -SHA256 0a621123806d78ad66c3ee34a2e3509cca371d73c0694969c17c2081e259f259 dia-0.94.tar.bz2 3348869 diff --git a/app-office/dia/files/digest-dia-0.94-r4 b/app-office/dia/files/digest-dia-0.94-r4 deleted file mode 100644 index 7a48511bc812..000000000000 --- a/app-office/dia/files/digest-dia-0.94-r4 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 8905a098072f0dbd22a14ea86e790b85 dia-0.94-sheets-png.tar.bz2 5449 -RMD160 3d2ca1d0ac68a3a4690d1edc5c5a3619a7e274fc dia-0.94-sheets-png.tar.bz2 5449 -SHA256 9f55f52f4ea8dae7f5333757d538a279924ec0cd6838857d7e7121c69b1c5629 dia-0.94-sheets-png.tar.bz2 5449 -MD5 63584224912dab49fed8d2cf87ea2d85 dia-0.94.tar.bz2 3348869 -RMD160 a3f220e4c6304afdd6977f985756515c9aed1545 dia-0.94.tar.bz2 3348869 -SHA256 0a621123806d78ad66c3ee34a2e3509cca371d73c0694969c17c2081e259f259 dia-0.94.tar.bz2 3348869 diff --git a/app-office/dia/files/digest-dia-0.94-r5 b/app-office/dia/files/digest-dia-0.94-r5 deleted file mode 100644 index 7a48511bc812..000000000000 --- a/app-office/dia/files/digest-dia-0.94-r5 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 8905a098072f0dbd22a14ea86e790b85 dia-0.94-sheets-png.tar.bz2 5449 -RMD160 3d2ca1d0ac68a3a4690d1edc5c5a3619a7e274fc dia-0.94-sheets-png.tar.bz2 5449 -SHA256 9f55f52f4ea8dae7f5333757d538a279924ec0cd6838857d7e7121c69b1c5629 dia-0.94-sheets-png.tar.bz2 5449 -MD5 63584224912dab49fed8d2cf87ea2d85 dia-0.94.tar.bz2 3348869 -RMD160 a3f220e4c6304afdd6977f985756515c9aed1545 dia-0.94.tar.bz2 3348869 -SHA256 0a621123806d78ad66c3ee34a2e3509cca371d73c0694969c17c2081e259f259 dia-0.94.tar.bz2 3348869 |