dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

configure.in plug-ins/common/plugin-defs.pl reverted changes from 

2006-10-27  Sven Neumann  <sven@gimp.org>

	* 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.
This commit is contained in:
Sven Neumann 2006-10-27 11:50:56 +00:00 committed by Sven Neumann
parent 3230844107
commit e3bf33121c
6 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2006-10-27 Sven Neumann <sven@gimp.org>
* 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 <mitch@gimp.org>
* app/core/gimp-transform-region.c (gimp_transform_region):

3
app/file/file-utils.c
View File

@ -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);
}

3
configure.in
View File

@ -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

3
plug-ins/common/Makefile.am
View File

@ -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 \

2
plug-ins/common/mkgen.pl
View File

@ -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\\";
}

4
plug-ins/common/plugin-defs.pl
View File

@ -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 },