From e3bf33121c4c802a2ddebdf4e4870163a5ed2a2d Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Fri, 27 Oct 2006 11:50:56 +0000 Subject: [PATCH] configure.in plug-ins/common/plugin-defs.pl reverted changes from 2006-10-27 Sven Neumann * configure.in * plug-ins/common/plugin-defs.pl * plug-ins/common/Makefile.am: reverted changes from 2006-04-06 and build screenshot plug-in optionally again. Fixes bug #364852. * plug-ins/common/mkgen.pl: reverted addition of 'extralibs' parameter that was introduced for the screenshot plug-in only. --- ChangeLog | 10 ++++++++++ app/file/file-utils.c | 3 +-- configure.in | 3 ++- plug-ins/common/Makefile.am | 3 ++- plug-ins/common/mkgen.pl | 2 +- plug-ins/common/plugin-defs.pl | 4 ++-- 6 files changed, 18 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index df66b66b98..01f584bb01 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2006-10-27 Sven Neumann + + * configure.in + * plug-ins/common/plugin-defs.pl + * plug-ins/common/Makefile.am: reverted changes from 2006-04-06 + and build screenshot plug-in optionally again. Fixes bug #364852. + + * plug-ins/common/mkgen.pl: reverted addition of 'extralibs' + parameter that was introduced for the screenshot plug-in only. + 2006-10-27 Michael Natterer * app/core/gimp-transform-region.c (gimp_transform_region): diff --git a/app/file/file-utils.c b/app/file/file-utils.c index aa9fc81cd0..c3afac1ffb 100644 --- a/app/file/file-utils.c +++ b/app/file/file-utils.c @@ -518,8 +518,7 @@ file_utils_save_thumbnail (GimpImage *image, GimpImagefile *imagefile; imagefile = gimp_imagefile_new (image->gimp, uri); - success = gimp_imagefile_save_thumbnail (imagefile, NULL, - image); + success = gimp_imagefile_save_thumbnail (imagefile, NULL, image); g_object_unref (imagefile); } diff --git a/configure.in b/configure.in index f643c49e57..d1b7b8ff57 100644 --- a/configure.in +++ b/configure.in @@ -1501,9 +1501,11 @@ AM_CONDITIONAL(BUILD_SCRIPT_FU, test "x$have_script_fu" == "xyes") if test x"$os_win32" = xno; then MAIL='mail$(EXEEXT)' + SCREENSHOT='screenshot$(EXEEXT)' fi AC_SUBST(MAIL) +AC_SUBST(SCREENSHOT) ############################################################ @@ -1891,7 +1893,6 @@ Optional Plug-Ins: TWAIN (MacOS X): $mac_twain_ok TWAIN (Win32): $os_win32 URI: $uri_plugin - Win Snap: $os_win32 Windows ICO $have_libpng WMF: $have_libwmf XJT: $have_xjt diff --git a/plug-ins/common/Makefile.am b/plug-ins/common/Makefile.am index 7ef09f94c7..7aee1ef744 100644 --- a/plug-ins/common/Makefile.am +++ b/plug-ins/common/Makefile.am @@ -145,7 +145,7 @@ libexec_PROGRAMS = \ rotate \ sample_colorize \ scatter_hsv \ - screenshot \ + $(SCREENSHOT) \ sel_gauss \ semiflatten \ sharpen \ @@ -191,6 +191,7 @@ EXTRA_PROGRAMS = \ png \ poppler \ psp \ + screenshot \ svg \ tiff \ wmf \ diff --git a/plug-ins/common/mkgen.pl b/plug-ins/common/mkgen.pl index 40099a6220..ccaccff844 100755 --- a/plug-ins/common/mkgen.pl +++ b/plug-ins/common/mkgen.pl @@ -121,7 +121,7 @@ foreach (sort keys %plugins) { $libgimp .= "\t\t\\\n\t\$(libgimpbase)"; my $optlib = ""; - if (exists $plugins{$_}->{optional} || exists $plugins{$_}->{extralibs} ) { + if (exists $plugins{$_}->{optional}) { my $name = exists $plugins{$_}->{libopt} ? $plugins{$_}->{libopt} : $_; $optlib = "\n\t\$(LIB\U$name\E)\t\t\\"; } diff --git a/plug-ins/common/plugin-defs.pl b/plug-ins/common/plugin-defs.pl index 8e7d61d59a..b43dc9a6b3 100644 --- a/plug-ins/common/plugin-defs.pl +++ b/plug-ins/common/plugin-defs.pl @@ -67,7 +67,7 @@ 'iwarp' => { libdep => 'gtk', ui => 1 }, 'jigsaw' => { libdep => 'gtk', ui => 1 }, 'laplace' => { libdep => 'glib', ui => 1 }, - 'lcms' => { libdep => 'glib', optional => 1, extralibs => 1 }, + 'lcms' => { libdep => 'glib', optional => 1 }, 'lens' => { libdep => 'gtk', ui => 1 }, 'lic' => { libdep => 'gtk', ui => 1 }, 'mail' => { libdep => 'gtk', ui => 1, optional => 1 }, @@ -108,7 +108,7 @@ 'rotate' => { libdep => 'glib' }, 'sample_colorize' => { libdep => 'gtk', ui => 1 }, 'scatter_hsv' => { libdep => 'gtk', ui => 1 }, - 'screenshot' => { libdep => 'gtk', ui => 1, extralibs => 1 }, + 'screenshot' => { libdep => 'gtk', ui => 1, optional => 1 }, 'sel_gauss' => { libdep => 'gtk', ui => 1, cflags => 'MMX_EXTRA_CFLAGS' }, 'semiflatten' => { libdep => 'glib' }, 'sharpen' => { libdep => 'gtk', ui => 1 },