diff -urN sodipodi-0.34.orig/configure sodipodi-0.34/configure --- sodipodi-0.34.orig/configure Thu Feb 12 02:00:11 2004 +++ sodipodi-0.34/configure Thu Feb 12 10:13:47 2004 @@ -7572,7 +7572,7 @@ # cross-compilation, but unfortunately the echo tests do not # yet detect zsh echo's removal of \ escapes. Also zsh mangles # `"' quotes if we put them in here... so don't! - archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring' + archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags $(test .$module = .no && echo -install_name $rpath/$soname $verstring)' # We need to add '_' to the symbols in $export_symbols first #_LT_AC_TAGVAR(archive_expsym_cmds, )="$_LT_AC_TAGVAR(archive_cmds, )"' && strip -s $export_symbols' hardcode_direct=yes @@ -13520,7 +13520,8 @@ # cross-compilation, but unfortunately the echo tests do not # yet detect zsh echo's removal of \ escapes. Also zsh mangles # `"' quotes if we put them in here... so don't! - archive_cmds_GCJ='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring' + archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags $(test .$module = .no && echo -install_name $rpath/$soname $verstring)' +# archive_cmds_GCJ='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring' # We need to add '_' to the symbols in $export_symbols first #_LT_AC_TAGVAR(archive_expsym_cmds, GCJ)="$_LT_AC_TAGVAR(archive_cmds, GCJ)"' && strip -s $export_symbols' hardcode_direct_GCJ=yes diff -urN sodipodi-0.34.orig/src/Makefile.in sodipodi-0.34/src/Makefile.in --- sodipodi-0.34.orig/src/Makefile.in Thu Feb 12 01:59:53 2004 +++ sodipodi-0.34/src/Makefile.in Thu Feb 12 09:57:56 2004 @@ -441,7 +441,7 @@ ${win32_ldflags} -sodipodi_LDFLAGS = -Wl,--export-dynamic $(kdeldflags) +sodipodi_LDFLAGS = $(kdeldflags) noinst_PROGRAMS = spsvgview diff -urN sodipodi-0.34.orig/src/helper/action.c sodipodi-0.34/src/helper/action.c --- sodipodi-0.34.orig/src/helper/action.c Sat Nov 15 21:41:21 2003 +++ sodipodi-0.34/src/helper/action.c Thu Feb 12 10:04:00 2004 @@ -12,7 +12,7 @@ */ #include -#include +#include #include diff -urN sodipodi-0.34.orig/src/helper/bezier-utils.c sodipodi-0.34/src/helper/bezier-utils.c --- sodipodi-0.34.orig/src/helper/bezier-utils.c Sun Feb 8 22:42:13 2004 +++ sodipodi-0.34/src/helper/bezier-utils.c Thu Feb 12 10:04:42 2004 @@ -22,7 +22,7 @@ #define notBEZIER_DEBUG #include -#include +#include #include #include diff -urN sodipodi-0.34.orig/src/helper/units.h sodipodi-0.34/src/helper/units.h --- sodipodi-0.34.orig/src/helper/units.h Thu Nov 28 21:18:50 2002 +++ sodipodi-0.34/src/helper/units.h Thu Feb 12 09:57:58 2004 @@ -44,7 +44,7 @@ * The base absolute unit is 1/72th of an inch (we are gnome PRINT, so sorry SI) */ -enum { +typedef enum { SP_UNIT_DIMENSIONLESS = (1 << 0), /* For percentages and like */ SP_UNIT_ABSOLUTE = (1 << 1), /* Real world distances - i.e. mm, cm... */ SP_UNIT_DEVICE = (1 << 2), /* Semi-real device-dependent distances i.e. pixels */ diff -urN sodipodi-0.34.orig/src/libarikkei/arikkei-dict.c sodipodi-0.34/src/libarikkei/arikkei-dict.c --- sodipodi-0.34.orig/src/libarikkei/arikkei-dict.c Tue Nov 18 07:16:48 2003 +++ sodipodi-0.34/src/libarikkei/arikkei-dict.c Thu Feb 12 09:57:58 2004 @@ -12,7 +12,7 @@ * */ -#include +#include #include #include "arikkei-dict.h" diff -urN sodipodi-0.34.orig/src/libarikkei/arikkei-strlib.c sodipodi-0.34/src/libarikkei/arikkei-strlib.c --- sodipodi-0.34.orig/src/libarikkei/arikkei-strlib.c Tue Feb 3 05:29:44 2004 +++ sodipodi-0.34/src/libarikkei/arikkei-strlib.c Thu Feb 12 09:57:58 2004 @@ -14,7 +14,7 @@ #include #include -#include +#include #include #include "arikkei-strlib.h" diff -urN sodipodi-0.34.orig/src/libarikkei/arikkei-token.c sodipodi-0.34/src/libarikkei/arikkei-token.c --- sodipodi-0.34.orig/src/libarikkei/arikkei-token.c Tue Nov 18 07:16:48 2003 +++ sodipodi-0.34/src/libarikkei/arikkei-token.c Thu Feb 12 09:57:58 2004 @@ -12,7 +12,7 @@ * */ -#include +#include #include #include "arikkei-token.h" diff -urN sodipodi-0.34.orig/src/libnr/nr-pathops.c sodipodi-0.34/src/libnr/nr-pathops.c --- sodipodi-0.34.orig/src/libnr/nr-pathops.c Sat Feb 7 07:33:04 2004 +++ sodipodi-0.34/src/libnr/nr-pathops.c Thu Feb 12 10:05:10 2004 @@ -20,7 +20,7 @@ #define QROUND(v) (floor (QUANT * (v) + 0.5) / QUANT) #include -#include +#include #include #include diff -urN sodipodi-0.34.orig/src/widgets/ruler.c sodipodi-0.34/src/widgets/ruler.c --- sodipodi-0.34.orig/src/widgets/ruler.c Tue Dec 9 06:03:10 2003 +++ sodipodi-0.34/src/widgets/ruler.c Thu Feb 12 13:22:16 2004 @@ -121,7 +121,7 @@ { GtkWidget *widget; GdkGC *gc, *bg_gc; - GdkFont *font; + GdkFont *font=NULL; gint i, j; gint width, height; gint xthickness; @@ -145,11 +145,12 @@ gc = widget->style->fg_gc[GTK_STATE_NORMAL]; bg_gc = widget->style->bg_gc[GTK_STATE_NORMAL]; - font = gtk_style_get_font(widget->style); + font = widget->style->font_desc; xthickness = widget->style->xthickness; ythickness = widget->style->ythickness; - digit_height = font->ascent; /* assume descent == 0 ? */ - + if (font) digit_height = font->ascent; /* assume descent == 0 ? */ + else digit_height=0; + width = widget->allocation.height; height = widget->allocation.width;// - ythickness * 2; @@ -231,6 +232,7 @@ for (j = 0; j < (int) strlen (unit_str); j++) { digit_str[0] = unit_str[j]; + if (font) gdk_draw_string (ruler->backing_store, font, gc, xthickness + 1, pos + digit_height * (j + 1) + 1, @@ -246,7 +248,7 @@ { GtkWidget *widget; GdkGC *gc, *bg_gc; - GdkFont *font; + GdkFont *font=NULL; gint i; gint width, height; gint xthickness; @@ -273,12 +275,12 @@ gc = widget->style->fg_gc[GTK_STATE_NORMAL]; bg_gc = widget->style->bg_gc[GTK_STATE_NORMAL]; - font = gtk_style_get_font(widget->style); + font = widget->style->font_desc; xthickness = widget->style->xthickness; ythickness = widget->style->ythickness; - digit_height = font->ascent; /* assume descent == 0 ? */ - + if (font) digit_height = font->ascent; /* assume descent == 0 ? */ + else digit_height=0; width = widget->allocation.width; height = widget->allocation.height;// - ythickness * 2; @@ -336,7 +338,8 @@ pos, height - length + ythickness); /* draw label */ if (i == 0) { - sprintf (unit_str, "%d", (int) cur); + sprintf (unit_str, "%d", (int) cur); + if (font) gdk_draw_string (ruler->backing_store, font, gc, pos + 2, ythickness + font->ascent - 1, unit_str); diff -urN sodipodi-0.34.orig/src/xml/repr-io.c sodipodi-0.34/src/xml/repr-io.c --- sodipodi-0.34.orig/src/xml/repr-io.c Wed Feb 11 01:29:14 2004 +++ sodipodi-0.34/src/xml/repr-io.c Thu Feb 12 09:57:59 2004 @@ -11,7 +11,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include +#include #include #include #include