diff -Naur gnome-core-1.4.1.old/applets/desk-guide/gwmthumbnail.c gnome-core-1.4.1.new/applets/desk-guide/gwmthumbnail.c --- gnome-core-1.4.1.old/applets/desk-guide/gwmthumbnail.c Fri Oct 26 18:12:47 2001 +++ gnome-core-1.4.1.new/applets/desk-guide/gwmthumbnail.c Tue Jan 28 23:20:47 2003 @@ -29,23 +29,29 @@ /* --- Gdk & GdkPixbuf compat prototypes --- */ +static GdkImage* gdk_image_get (GdkWindow *window, gint x, gint y, gint width, gint height); +static GdkColormap* gdk_window_get_colormap (GdkWindow *window); +static GdkVisual* gdk_window_get_visual (GdkWindow *window); +static GdkImage* gdk_image_new_shared_with_pixmap (GdkWindow *window, gint width, gint height, GdkPixmap **pixmap_p); +static GdkPixbuf* gdk_pixbuf_from_image (GdkImage *image, guint x, guint y, guint width, guint height, GdkColormap *cmap); +static void gdk_pixbuf_copy_from_image (GdkPixbuf *pixbuf, guint dest_x, guint dest_y, @@ -537,7 +543,7 @@ #include #endif /* USE_SHM */ -GdkImage* +static GdkImage* gdk_image_new_shared_with_pixmap (GdkWindow *window, gint width, gint height, @@ -617,7 +623,7 @@ /* fixed gdk_image_get(), so we don't crash if we get an X error */ -GdkImage* +static GdkImage* gdk_image_get (GdkWindow *window, gint x, gint y, @@ -677,7 +683,7 @@ /* instead of bailing on NULL, return the root window's colormap, * also, guard against XErrors */ -GdkColormap* +static GdkColormap* gdk_window_get_colormap (GdkWindow *window) { GdkWindowPrivate *window_private; @@ -708,7 +714,7 @@ /* instead of bailing on NULL, return the root window's visual, also * guard against XErrors */ -GdkVisual* +static GdkVisual* gdk_window_get_visual (GdkWindow *window) { GdkWindowPrivate *window_private; @@ -876,7 +882,7 @@ x, y, width, height, cmap); } -void +static void gdk_pixbuf_copy_from_image (GdkPixbuf *pixbuf, guint dest_x, guint dest_y, @@ -909,7 +915,7 @@ cmap); } -GdkPixbuf* +static GdkPixbuf* gdk_pixbuf_from_image (GdkImage *image, guint x, guint y, diff -Naur gnome-core-1.4.1.old/applets/fish/Makefile.in gnome-core-1.4.1.new/applets/fish/Makefile.in --- gnome-core-1.4.1.old/applets/fish/Makefile.in Sat Jun 8 08:11:15 2002 +++ gnome-core-1.4.1.new/applets/fish/Makefile.in Tue Jan 28 23:20:47 2003 @@ -236,7 +236,7 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I../.. LIBS = @LIBS@ -libfish_applet_la_LDFLAGS = +libfish_applet_la_LDFLAGS = -module libfish_applet_la_LIBADD = libfish_applet_la_OBJECTS = fish.lo COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) diff -Naur gnome-core-1.4.1.old/applets/gen_util/Makefile.in gnome-core-1.4.1.new/applets/gen_util/Makefile.in --- gnome-core-1.4.1.old/applets/gen_util/Makefile.in Sat Jun 8 08:11:21 2002 +++ gnome-core-1.4.1.new/applets/gen_util/Makefile.in Tue Jan 28 23:20:47 2003 @@ -246,7 +246,7 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I../.. LIBS = @LIBS@ -libgen_util_applet_la_LDFLAGS = +libgen_util_applet_la_LDFLAGS = -module libgen_util_applet_la_LIBADD = libgen_util_applet_la_OBJECTS = main.lo mailcheck.lo popcheck.lo \ printer.lo clock.lo remote-helper.lo diff -Naur gnome-core-1.4.1.old/applets/tasklist/Makefile.in gnome-core-1.4.1.new/applets/tasklist/Makefile.in --- gnome-core-1.4.1.old/applets/tasklist/Makefile.in Sat Jun 8 08:11:39 2002 +++ gnome-core-1.4.1.new/applets/tasklist/Makefile.in Tue Jan 28 23:20:47 2003 @@ -259,7 +259,7 @@ tasklist_menu.$(OBJEXT) tasklist_properties.$(OBJEXT) gstc.$(OBJEXT) \ gwmh.$(OBJEXT) tasklist_applet_DEPENDENCIES = ../../panel/libpanel_applet.la -tasklist_applet_LDFLAGS = +tasklist_applet_LDFLAGS = -module COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) diff -Naur gnome-core-1.4.1.old/configure gnome-core-1.4.1.new/configure --- gnome-core-1.4.1.old/configure Sat Jun 8 06:22:54 2002 +++ gnome-core-1.4.1.new/configure Tue Jan 28 23:20:47 2003 @@ -3962,11 +3962,11 @@ ;; darwin* | rhapsody*) - allow_undefined_flag='-undefined suppress' + allow_undefined_flag='-undefined suppress -flat_namespace' # FIXME: Relying on posixy $() will cause problems for # cross-compilation, but unfortunately the echo tests do not # yet detect zsh echo's removal of \ escapes. - archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)' + archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts $(test .$module != .yes && echo -install_name $rpath/$soname $tmp_verstring)' # We need to add '_' to the symbols in $export_symbols first #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' hardcode_direct=yes diff -Naur gnome-core-1.4.1.old/help-browser/gnome-help-browser.c gnome-core-1.4.1.new/help-browser/gnome-help-browser.c --- gnome-core-1.4.1.old/help-browser/gnome-help-browser.c Fri Oct 26 18:13:26 2001 +++ gnome-core-1.4.1.new/help-browser/gnome-help-browser.c Tue Jan 28 23:20:47 2003 @@ -81,8 +81,8 @@ void destroy_server(HelpWindow win); /* MANPATH should probably come from somewhere */ -#define DEFAULT_MANPATH GNOME_PREFIX "/man:/usr/man:/usr/share/man:/usr/local/man:/usr/X11R6/man" -#define DEFAULT_INFOPATH GNOME_PREFIX "/info:/usr/info:/usr/share/info:/usr/local/info" +#define DEFAULT_MANPATH GNOME_PREFIX "/share/man:/usr/share/man:/usr/local/share/man:/usr/X11R6/man" +#define DEFAULT_INFOPATH GNOME_PREFIX "/share/info:/usr/share/info:/usr/local/share/info" /* GHELPPATH probably needs some automatic additions inside toc */ #define DEFAULT_GHELPPATH GNOME_PREFIX "/share/gnome/help:" \ "/opt/gnome/share/gnome/help:" \ diff -Naur gnome-core-1.4.1.old/ltmain.sh gnome-core-1.4.1.new/ltmain.sh --- gnome-core-1.4.1.old/ltmain.sh Sat Jun 8 06:22:40 2002 +++ gnome-core-1.4.1.new/ltmain.sh Tue Jan 28 23:20:47 2003 @@ -2862,6 +2862,11 @@ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then eval cmds=\"$archive_expsym_cmds\" else + if test "x$verstring" = "x0.0"; then + tmp_verstring= + else + tmp_verstring="$verstring" + fi eval cmds=\"$archive_cmds\" fi IFS="${IFS= }"; save_ifs="$IFS"; IFS='~' diff -Naur gnome-core-1.4.1.old/omf-install/Makefile.in gnome-core-1.4.1.new/omf-install/Makefile.in --- gnome-core-1.4.1.old/omf-install/Makefile.in Sat Jun 8 08:11:43 2002 +++ gnome-core-1.4.1.new/omf-install/Makefile.in Tue Jan 28 23:20:59 2003 @@ -300,7 +300,6 @@ -for file in $(srcdir)/*.omf; do \ $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(omf_dest_dir); \ done - -scrollkeeper-update -p $(scrollkeeper_localstate_dir) uninstall-local: -for file in $(srcdir)/*.omf; do \ diff -Naur gnome-core-1.4.1.old/po/Makefile.in.in gnome-core-1.4.1.new/po/Makefile.in.in --- gnome-core-1.4.1.old/po/Makefile.in.in Sat Jun 8 06:22:39 2002 +++ gnome-core-1.4.1.new/po/Makefile.in.in Tue Jan 28 23:20:47 2003 @@ -106,7 +106,10 @@ @catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ cat=`basename $$cat`; \ - lang=`echo $$cat | sed 's/\.gmo$$//'`; \ + case "$$cat" in \ + *.gmo) lang=`echo $$cat | sed 's/\.gmo$$//'` ;; \ + *.mo) lang=`echo $$cat | sed 's/\.mo$$//'` ;; \ + esac; \ dir=$(localedir)/$$lang/LC_MESSAGES; \ $(mkinstalldirs) $(DESTDIR)$$dir; \ if test -r $$cat; then \