diff --git a/ChangeLog b/ChangeLog index 577b5fd79d..bc1b049acf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +2003-12-12 Manish Singh + + * Makefile.am + * app/composite/Makefile.am + * themes/Default/images/Makefile.am: comestics. + + * app/gui/color-notebook.c (color_notebook_new): no need to cast to + G_OBJECT for g_signal_connect. + + * plug-ins/common/mkgen.pl + * plug-ins/common/plugin-defs.pl: properly handle the libgimpoldpreview + stuff. + + * plug-ins/common/Makefile.am: regenerated. + + * plug-ins/common/decompose.c: cbrt() is in C99, so check for that + in addition to GNU libc. + 2003-12-12 Hans Breuer [ diff --git a/Makefile.am b/Makefile.am index 8a761c3b4f..6f1fbcbf21 100644 --- a/Makefile.am +++ b/Makefile.am @@ -60,7 +60,7 @@ EXTRA_DIST = \ intltool-extract.in \ intltool-merge.in \ intltool-update.in \ - makefile.msc \ + makefile.msc \ po-libgimp/update.sh \ po-plug-ins/update.sh \ po-script-fu/update.sh diff --git a/app/composite/Makefile.am b/app/composite/Makefile.am index 7a026c00dd..a14157e4ce 100644 --- a/app/composite/Makefile.am +++ b/app/composite/Makefile.am @@ -64,7 +64,7 @@ regenerate: gimp-composite-generic.o gimp-composite-mmx.o gimp-composite-sse.o g EXTRA_DIST = \ make-installer.py \ - makefile.msc \ + makefile.msc \ ns.py diff --git a/app/dialogs/color-dialog.c b/app/dialogs/color-dialog.c index c0d3cc9319..926897aaa5 100644 --- a/app/dialogs/color-dialog.c +++ b/app/dialogs/color-dialog.c @@ -170,7 +170,7 @@ color_notebook_new (GimpViewable *viewable, cnp->selection); gtk_widget_show (cnp->selection); - g_signal_connect (G_OBJECT (cnp->selection), "color_changed", + g_signal_connect (cnp->selection, "color_changed", G_CALLBACK (color_notebook_color_changed), cnp); diff --git a/app/gui/color-notebook.c b/app/gui/color-notebook.c index c0d3cc9319..926897aaa5 100644 --- a/app/gui/color-notebook.c +++ b/app/gui/color-notebook.c @@ -170,7 +170,7 @@ color_notebook_new (GimpViewable *viewable, cnp->selection); gtk_widget_show (cnp->selection); - g_signal_connect (G_OBJECT (cnp->selection), "color_changed", + g_signal_connect (cnp->selection, "color_changed", G_CALLBACK (color_notebook_color_changed), cnp); diff --git a/app/widgets/gimpcolordialog.c b/app/widgets/gimpcolordialog.c index c0d3cc9319..926897aaa5 100644 --- a/app/widgets/gimpcolordialog.c +++ b/app/widgets/gimpcolordialog.c @@ -170,7 +170,7 @@ color_notebook_new (GimpViewable *viewable, cnp->selection); gtk_widget_show (cnp->selection); - g_signal_connect (G_OBJECT (cnp->selection), "color_changed", + g_signal_connect (cnp->selection, "color_changed", G_CALLBACK (color_notebook_color_changed), cnp); diff --git a/plug-ins/common/Makefile.am b/plug-ins/common/Makefile.am index 698181cdbb..1625b8817a 100644 --- a/plug-ins/common/Makefile.am +++ b/plug-ins/common/Makefile.am @@ -191,12 +191,12 @@ AlienMap_SOURCES = \ AlienMap.c AlienMap_LDADD = \ + $(top_builddir)/plug-ins/libgimpoldpreview/libgimpoldpreview.a \ $(top_builddir)/libgimp/libgimpui-$(LT_RELEASE).la \ $(top_builddir)/libgimpwidgets/libgimpwidgets-$(LT_RELEASE).la \ $(top_builddir)/libgimp/libgimp-$(LT_RELEASE).la \ $(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \ $(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \ - $(top_builddir)/plug-ins/libgimpoldpreview/libgimpoldpreview.a \ @GTK_LIBS@ \ @INTLLIBS@ @@ -204,12 +204,12 @@ AlienMap2_SOURCES = \ AlienMap2.c AlienMap2_LDADD = \ + $(top_builddir)/plug-ins/libgimpoldpreview/libgimpoldpreview.a \ $(top_builddir)/libgimp/libgimpui-$(LT_RELEASE).la \ $(top_builddir)/libgimpwidgets/libgimpwidgets-$(LT_RELEASE).la \ $(top_builddir)/libgimp/libgimp-$(LT_RELEASE).la \ $(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \ $(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \ - $(top_builddir)/plug-ins/libgimpoldpreview/libgimpoldpreview.a \ @GTK_LIBS@ \ @INTLLIBS@ @@ -320,12 +320,12 @@ blinds_SOURCES = \ blinds.c blinds_LDADD = \ + $(top_builddir)/plug-ins/libgimpoldpreview/libgimpoldpreview.a \ $(top_builddir)/libgimp/libgimpui-$(LT_RELEASE).la \ $(top_builddir)/libgimpwidgets/libgimpwidgets-$(LT_RELEASE).la \ $(top_builddir)/libgimp/libgimp-$(LT_RELEASE).la \ $(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \ $(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \ - $(top_builddir)/plug-ins/libgimpoldpreview/libgimpoldpreview.a \ @GTK_LIBS@ \ @INTLLIBS@ @@ -678,12 +678,12 @@ flarefx_SOURCES = \ flarefx.c flarefx_LDADD = \ + $(top_builddir)/plug-ins/libgimpoldpreview/libgimpoldpreview.a \ $(top_builddir)/libgimp/libgimpui-$(LT_RELEASE).la \ $(top_builddir)/libgimpwidgets/libgimpwidgets-$(LT_RELEASE).la \ $(top_builddir)/libgimp/libgimp-$(LT_RELEASE).la \ $(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \ $(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \ - $(top_builddir)/plug-ins/libgimpoldpreview/libgimpoldpreview.a \ @GTK_LIBS@ \ @INTLLIBS@ @@ -809,12 +809,12 @@ glasstile_SOURCES = \ glasstile.c glasstile_LDADD = \ + $(top_builddir)/plug-ins/libgimpoldpreview/libgimpoldpreview.a \ $(top_builddir)/libgimp/libgimpui-$(LT_RELEASE).la \ $(top_builddir)/libgimpwidgets/libgimpwidgets-$(LT_RELEASE).la \ $(top_builddir)/libgimp/libgimp-$(LT_RELEASE).la \ $(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \ $(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \ - $(top_builddir)/plug-ins/libgimpoldpreview/libgimpoldpreview.a \ @GTK_LIBS@ \ @INTLLIBS@ @@ -846,12 +846,12 @@ grid_SOURCES = \ grid.c grid_LDADD = \ + $(top_builddir)/plug-ins/libgimpoldpreview/libgimpoldpreview.a \ $(top_builddir)/libgimp/libgimpui-$(LT_RELEASE).la \ $(top_builddir)/libgimpwidgets/libgimpwidgets-$(LT_RELEASE).la \ $(top_builddir)/libgimp/libgimp-$(LT_RELEASE).la \ $(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \ $(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \ - $(top_builddir)/plug-ins/libgimpoldpreview/libgimpoldpreview.a \ @GTK_LIBS@ \ @INTLLIBS@ @@ -927,12 +927,12 @@ illusion_SOURCES = \ illusion.c illusion_LDADD = \ + $(top_builddir)/plug-ins/libgimpoldpreview/libgimpoldpreview.a \ $(top_builddir)/libgimp/libgimpui-$(LT_RELEASE).la \ $(top_builddir)/libgimpwidgets/libgimpwidgets-$(LT_RELEASE).la \ $(top_builddir)/libgimp/libgimp-$(LT_RELEASE).la \ $(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \ $(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \ - $(top_builddir)/plug-ins/libgimpoldpreview/libgimpoldpreview.a \ @GTK_LIBS@ \ @INTLLIBS@ @@ -952,12 +952,12 @@ jigsaw_SOURCES = \ jigsaw.c jigsaw_LDADD = \ + $(top_builddir)/plug-ins/libgimpoldpreview/libgimpoldpreview.a \ $(top_builddir)/libgimp/libgimpui-$(LT_RELEASE).la \ $(top_builddir)/libgimpwidgets/libgimpwidgets-$(LT_RELEASE).la \ $(top_builddir)/libgimp/libgimp-$(LT_RELEASE).la \ $(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \ $(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \ - $(top_builddir)/plug-ins/libgimpoldpreview/libgimpoldpreview.a \ @GTK_LIBS@ \ @INTLLIBS@ @@ -1028,12 +1028,12 @@ max_rgb_SOURCES = \ max_rgb.c max_rgb_LDADD = \ + $(top_builddir)/plug-ins/libgimpoldpreview/libgimpoldpreview.a \ $(top_builddir)/libgimp/libgimpui-$(LT_RELEASE).la \ $(top_builddir)/libgimpwidgets/libgimpwidgets-$(LT_RELEASE).la \ $(top_builddir)/libgimp/libgimp-$(LT_RELEASE).la \ $(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \ $(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \ - $(top_builddir)/plug-ins/libgimpoldpreview/libgimpoldpreview.a \ @GTK_LIBS@ \ @INTLLIBS@ @@ -1090,12 +1090,12 @@ nlfilt_SOURCES = \ nlfilt.c nlfilt_LDADD = \ + $(top_builddir)/plug-ins/libgimpoldpreview/libgimpoldpreview.a \ $(top_builddir)/libgimp/libgimpui-$(LT_RELEASE).la \ $(top_builddir)/libgimpwidgets/libgimpwidgets-$(LT_RELEASE).la \ $(top_builddir)/libgimp/libgimp-$(LT_RELEASE).la \ $(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \ $(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \ - $(top_builddir)/plug-ins/libgimpoldpreview/libgimpoldpreview.a \ @GTK_LIBS@ \ @INTLLIBS@ @@ -1103,12 +1103,12 @@ noisify_SOURCES = \ noisify.c noisify_LDADD = \ + $(top_builddir)/plug-ins/libgimpoldpreview/libgimpoldpreview.a \ $(top_builddir)/libgimp/libgimpui-$(LT_RELEASE).la \ $(top_builddir)/libgimpwidgets/libgimpwidgets-$(LT_RELEASE).la \ $(top_builddir)/libgimp/libgimp-$(LT_RELEASE).la \ $(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \ $(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \ - $(top_builddir)/plug-ins/libgimpoldpreview/libgimpoldpreview.a \ @GTK_LIBS@ \ @INTLLIBS@ @@ -1126,12 +1126,12 @@ nova_SOURCES = \ nova.c nova_LDADD = \ + $(top_builddir)/plug-ins/libgimpoldpreview/libgimpoldpreview.a \ $(top_builddir)/libgimp/libgimpui-$(LT_RELEASE).la \ $(top_builddir)/libgimpwidgets/libgimpwidgets-$(LT_RELEASE).la \ $(top_builddir)/libgimp/libgimp-$(LT_RELEASE).la \ $(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \ $(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \ - $(top_builddir)/plug-ins/libgimpoldpreview/libgimpoldpreview.a \ @GTK_LIBS@ \ @INTLLIBS@ @@ -1211,12 +1211,12 @@ plasma_SOURCES = \ plasma.c plasma_LDADD = \ + $(top_builddir)/plug-ins/libgimpoldpreview/libgimpoldpreview.a \ $(top_builddir)/libgimp/libgimpui-$(LT_RELEASE).la \ $(top_builddir)/libgimpwidgets/libgimpwidgets-$(LT_RELEASE).la \ $(top_builddir)/libgimp/libgimp-$(LT_RELEASE).la \ $(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \ $(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \ - $(top_builddir)/plug-ins/libgimpoldpreview/libgimpoldpreview.a \ @GTK_LIBS@ \ @INTLLIBS@ @@ -1261,12 +1261,12 @@ polar_SOURCES = \ polar.c polar_LDADD = \ + $(top_builddir)/plug-ins/libgimpoldpreview/libgimpoldpreview.a \ $(top_builddir)/libgimp/libgimpui-$(LT_RELEASE).la \ $(top_builddir)/libgimpwidgets/libgimpwidgets-$(LT_RELEASE).la \ $(top_builddir)/libgimp/libgimp-$(LT_RELEASE).la \ $(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \ $(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \ - $(top_builddir)/plug-ins/libgimpoldpreview/libgimpoldpreview.a \ @GTK_LIBS@ \ @INTLLIBS@ @@ -1711,12 +1711,12 @@ waves_SOURCES = \ waves.c waves_LDADD = \ + $(top_builddir)/plug-ins/libgimpoldpreview/libgimpoldpreview.a \ $(top_builddir)/libgimp/libgimpui-$(LT_RELEASE).la \ $(top_builddir)/libgimpwidgets/libgimpwidgets-$(LT_RELEASE).la \ $(top_builddir)/libgimp/libgimp-$(LT_RELEASE).la \ $(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \ $(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \ - $(top_builddir)/plug-ins/libgimpoldpreview/libgimpoldpreview.a \ @GTK_LIBS@ \ @INTLLIBS@ @@ -1759,12 +1759,12 @@ wind_SOURCES = \ wind.c wind_LDADD = \ + $(top_builddir)/plug-ins/libgimpoldpreview/libgimpoldpreview.a \ $(top_builddir)/libgimp/libgimpui-$(LT_RELEASE).la \ $(top_builddir)/libgimpwidgets/libgimpwidgets-$(LT_RELEASE).la \ $(top_builddir)/libgimp/libgimp-$(LT_RELEASE).la \ $(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \ $(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \ - $(top_builddir)/plug-ins/libgimpoldpreview/libgimpoldpreview.a \ @GTK_LIBS@ \ @INTLLIBS@ diff --git a/plug-ins/common/decompose.c b/plug-ins/common/decompose.c index 2f78e05549..bcddb627bd 100644 --- a/plug-ins/common/decompose.c +++ b/plug-ins/common/decompose.c @@ -40,8 +40,8 @@ #include "libgimp/stdplugins-intl.h" -#ifndef __GLIBC__ -/* cbrt() is a GNU extension */ +/* cbrt() is a GNU extension, which C99 accepted */ +#if !defined (__GLIBC__) && !(defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) #define cbrt(x) (pow(x, 1.0/3.0)) #endif diff --git a/plug-ins/common/mkgen.pl b/plug-ins/common/mkgen.pl index 710ad75eec..7fb4cb5308 100755 --- a/plug-ins/common/mkgen.pl +++ b/plug-ins/common/mkgen.pl @@ -53,12 +53,13 @@ EXTRA_DIST = \\ plugin-defs.pl$extra INCLUDES = \\ - -I\$(top_srcdir) \\ - \@GTK_CFLAGS\@ \\ - \@X_CFLAGS\@ \\ - \@EXIF_CFLAGS\@ \\ - \@SVG_CFLAGS\@ \\ - \@WMF_CFLAGS\@ \\ + -I\$(top_srcdir) \\ + -I\$(top_srcdir)/plug-ins/libgimpoldpreview \\ + \@GTK_CFLAGS\@ \\ + \@X_CFLAGS\@ \\ + \@EXIF_CFLAGS\@ \\ + \@SVG_CFLAGS\@ \\ + \@WMF_CFLAGS\@ \\ -I\$(includedir) libexec_PROGRAMS = \\ @@ -115,7 +116,7 @@ foreach (sort keys %plugins) { if (exists $plugins{$_}->{libsupp}) { my @lib = split(/:/, $plugins{$_}->{libsupp}); foreach $lib (@lib) { - $libgimp = "\$(top_builddir)/plug-ins/$lib/lib$lib.a\t\\\n\t$libgimp"; + $libgimp = "\$(top_builddir)/plug-ins/lib$lib/lib$lib.a\t\\\n\t$libgimp"; } } diff --git a/plug-ins/common/plugin-defs.pl b/plug-ins/common/plugin-defs.pl index 31de55a9be..260ef8eede 100644 --- a/plug-ins/common/plugin-defs.pl +++ b/plug-ins/common/plugin-defs.pl @@ -1,6 +1,6 @@ %plugins = ( - 'AlienMap' => { libdep => 'gtk', ui => 1 }, - 'AlienMap2' => { libdep => 'gtk', ui => 1 }, + 'AlienMap' => { libdep => 'gtk', ui => 1, libsupp => 'gimpoldpreview' }, + 'AlienMap2' => { libdep => 'gtk', ui => 1, libsupp => 'gimpoldpreview' }, 'CEL' => { libdep => 'gtk', ui => 1 }, 'CML_explorer' => { libdep => 'gtk', ui => 1 }, 'aa' => { libdep => 'gtk', ui => 1, optional => 1 }, @@ -10,7 +10,7 @@ 'apply_lens' => { libdep => 'gtk', ui => 1 }, 'autocrop' => { libdep => 'glib' }, 'autostretch_hsv' => { libdep => 'glib' }, - 'blinds' => { libdep => 'gtk', ui => 1 }, + 'blinds' => { libdep => 'gtk', ui => 1, libsupp => 'gimpoldpreview' }, 'blur' => { libdep => 'gtk', ui => 1 }, 'borderaverage' => { libdep => 'gtk', ui => 1 }, 'bumpmap' => { libdep => 'gtk', ui => 1 }, @@ -40,7 +40,7 @@ 'engrave' => { libdep => 'gtk', ui => 1 }, 'exchange' => { libdep => 'gtk', ui => 1 }, 'film' => { libdep => 'gtk', ui => 1 }, - 'flarefx' => { libdep => 'gtk', ui => 1 }, + 'flarefx' => { libdep => 'gtk', ui => 1, libsupp => 'gimpoldpreview' }, 'fractaltrace' => { libdep => 'gtk', ui => 1 }, 'gauss_iir' => { libdep => 'gtk', ui => 1 }, 'gauss_rle' => { libdep => 'gtk', ui => 1 }, @@ -51,44 +51,44 @@ 'gif' => { libdep => 'gtk', ui => 1 }, 'gifload' => { libdep => 'gtk' }, 'gih' => { libdep => 'gtk', ui => 1 }, - 'glasstile' => { libdep => 'gtk', ui => 1 }, + 'glasstile' => { libdep => 'gtk', ui => 1, libsupp => 'gimpoldpreview' }, 'gqbist' => { libdep => 'gtk', ui => 1 }, 'gradmap' => { libdep => 'glib', ui => 1 }, - 'grid' => { libdep => 'gtk', ui => 1 }, + 'grid' => { libdep => 'gtk', ui => 1, libsupp => 'gimpoldpreview' }, 'gtm' => { libdep => 'gtk', ui => 1 }, 'guillotine' => { libdep => 'glib' }, 'gz' => { libdep => 'glib' }, 'header' => { libdep => 'gtk', ui => 1 }, 'hot' => { libdep => 'gtk', ui => 1 }, 'hrz' => { libdep => 'gtk', ui => 1 }, - 'illusion' => { libdep => 'gtk', ui => 1 }, + 'illusion' => { libdep => 'gtk', ui => 1, libsupp => 'gimpoldpreview' }, 'iwarp' => { libdep => 'gtk', ui => 1 }, - 'jigsaw' => { libdep => 'gtk', ui => 1 }, + 'jigsaw' => { libdep => 'gtk', ui => 1, libsupp => 'gimpoldpreview' }, 'jpeg' => { libdep => 'exif:gtk', ui => 1, optional => 1 }, 'laplace' => { libdep => 'glib', ui => 1 }, 'lic' => { libdep => 'gtk', ui => 1 }, 'mail' => { libdep => 'gtk', ui => 1, optional => 1 }, 'mapcolor' => { libdep => 'gtk', ui => 1 }, - 'max_rgb' => { libdep => 'gtk', ui => 1 }, + 'max_rgb' => { libdep => 'gtk', ui => 1, libsupp => 'gimpoldpreview' }, 'mblur' => { libdep => 'gtk', ui => 1 }, 'mng' => { libdep => 'gtk', ui => 1, optional => 1 }, 'mosaic' => { libdep => 'gtk', ui => 1 }, 'newsprint' => { libdep => 'gtk', ui => 1 }, - 'nlfilt' => { libdep => 'gtk', ui => 1 }, - 'noisify' => { libdep => 'gtk', ui => 1 }, + 'nlfilt' => { libdep => 'gtk', ui => 1 , libsupp => 'gimpoldpreview'}, + 'noisify' => { libdep => 'gtk', ui => 1, libsupp => 'gimpoldpreview' }, 'normalize' => { libdep => 'glib' }, - 'nova' => { libdep => 'gtk', ui => 1 }, + 'nova' => { libdep => 'gtk', ui => 1, libsupp => 'gimpoldpreview' }, 'oilify' => { libdep => 'gtk', ui => 1 }, 'papertile' => { libdep => 'gtk', ui => 1 }, 'pat' => { libdep => 'gtk', ui => 1 }, 'pcx' => { libdep => 'gtk', ui => 1 }, 'pix' => { libdep => 'gtk', ui => 1 }, 'pixelize' => { libdep => 'gtk', ui => 1 }, - 'plasma' => { libdep => 'gtk', ui => 1 }, + 'plasma' => { libdep => 'gtk', ui => 1, libsupp => 'gimpoldpreview' }, 'plugindetails' => { libdep => 'gtk', ui => 1 }, 'png' => { libdep => 'gtk', ui => 1, optional => 1 }, 'pnm' => { libdep => 'gtk', ui => 1 }, - 'polar' => { libdep => 'gtk', ui => 1 }, + 'polar' => { libdep => 'gtk', ui => 1, libsupp => 'gimpoldpreview' }, 'ps' => { libdep => 'gtk', ui => 1 }, 'psd' => { libdep => 'glib' }, 'psd_save' => { libdep => 'gtk', ui => 1 }, @@ -126,11 +126,11 @@ 'vinvert' => { libdep => 'glib' }, 'vpropagate' => { libdep => 'gtk', ui => 1 }, 'warp' => { libdep => 'gtk', ui => 1 }, - 'waves' => { libdep => 'gtk', ui => 1 }, + 'waves' => { libdep => 'gtk', ui => 1, libsupp => 'gimpoldpreview' }, 'webbrowser' => { libdep => 'glib' }, 'whirlpinch' => { libdep => 'gtk', ui => 1 }, 'winclipboard' => { libdep => 'glib', ui => 1, optional => 1 }, - 'wind' => { libdep => 'gtk', ui => 1 }, + 'wind' => { libdep => 'gtk', ui => 1, libsupp => 'gimpoldpreview' }, 'winprint' => { libdep => 'glib', ui => 1, optional => 1 }, 'wmf' => { libdep => 'gtk', ui => 1, optional => 1 }, 'xbm' => { libdep => 'gtk', ui => 1 }, diff --git a/themes/Default/images/Makefile.am b/themes/Default/images/Makefile.am index 28d0ece1f1..17bac97ea6 100644 --- a/themes/Default/images/Makefile.am +++ b/themes/Default/images/Makefile.am @@ -294,9 +294,9 @@ STOCK_IMAGES = \ themedata_DATA = $(STOCK_IMAGES) EXTRA_DIST = \ - $(themedata_DATA) \ - $(WILBER_IMAGES) \ - gimp-dialog-icons.xcf.gz \ + $(themedata_DATA) \ + $(WILBER_IMAGES) \ + gimp-dialog-icons.xcf.gz \ makefile.msc