Update to "gimp-0.99.26" using changes supplied by Bernd Sieker.

8 files changed, 33 insertions, 286 deletions

diff --git a/graphics/gimp/patches/patch-aa b/graphics/gimp/patches/patch-aa
index 05994ede962..0cdcb11198f 100644
--- a/graphics/gimp/patches/patch-aa
+++ b/graphics/gimp/patches/patch-aa
@@ -1,20 +1,20 @@
---- configure.in.orig	Mon Jan 26 04:44:47 1998
-+++ configure.in	Fri Jan 30 03:55:00 1998
-@@ -121,7 +121,7 @@
- dnl Test for libtiff
-   if test -z "$LIBTIFF_LIB"; then
-     AC_CHECK_LIB(tiff, TIFFReadScanline,
--      TIFF='tiff'; LIBTIFF_LIB='-ltiff',
-+      TIFF='tiff'; LIBTIFF_LIB='-ltiff -lz -ljpeg',
-       AC_CHECK_LIB(tiff, TIFFWriteScanline,
-         TIFF='tiff'; LIBTIFF_LIB='-ltiff -lz -ljpeg',
-         AC_MSG_WARN(*** TIFF plug-in will not be built ***), -lz -ljpeg -lm), -lm)
-@@ -156,7 +156,7 @@
-       GIMPTCL='gimptcl'; LIBTCL_LIB="-l$with_tcl -l$with_tk $DL_LIBRARY",
-       AC_MSG_WARN(*** gimptcl plug-in will not be built ***), -lm $DL_LIBRARY),
-     AC_CHECK_LIB(tcl, Tcl_StaticPackage,
--      GIMPTCL='gimptcl'; LIBTCL_LIB="-ltcl -ltk $DL_LIBRARY",
-+      GIMPTCL='gimptcl'; LIBTCL_LIB="-ltcl80 -ltk80 $DL_LIBRARY",
-       AC_MSG_WARN(*** gimptcl plug-in will not be built ***), -lm $DL_LIBRARY))
-   fi
+--- configure.orig	Wed Apr  8 10:16:20 1998
++++ configure	Tue Apr 14 12:47:47 1998
+@@ -634,7 +634,7 @@
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
+ 
+-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
++test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+ 
+ echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
+ echo "configure:641: checking whether build environment is sane" >&5
+@@ -2228,7 +2228,7 @@
+ fi
+ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-  TIFF='tiff'; LIBTIFF_LIB='-ltiff'
++  TIFF='tiff'; LIBTIFF_LIB='-ltiff -lz -ljpeg'
+ else
+   echo "$ac_t""no" 1>&6
+ echo "configure: warning: *** TIFF plug-in will not be built (TIFF header files not found) ***" 1>&2
diff --git a/graphics/gimp/patches/patch-ab b/graphics/gimp/patches/patch-ab
index 737f98c412c..2a51a7f5d62 100644
--- a/graphics/gimp/patches/patch-ab
+++ b/graphics/gimp/patches/patch-ab
@@ -1,38 +1,15 @@
---- configure.orig	Mon Jan 26 08:07:08 1998
-+++ configure	Fri Jan 30 03:53:22 1998
-@@ -2773,7 +2773,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  TIFF='tiff'; LIBTIFF_LIB='-ltiff'
-+  TIFF='tiff'; LIBTIFF_LIB='-ltiff -lz -ljpeg'
- else
-   echo "$ac_t""no" 1>&6
- echo $ac_n "checking for TIFFWriteScanline in -ltiff""... $ac_c" 1>&6
-@@ -3039,14 +3039,14 @@
- fi
+--- plug-ins/mail/mail.c.orig	Mon Nov 24 23:04:27 1997
++++ plug-ins/mail/mail.c	Tue Apr 14 00:43:26 1998
+@@ -88,9 +88,9 @@
+    * As always: The utility of this plugin is left as an exercise for the reader
+    *
+  */
+-#ifndef MAILER
+-#define MAILER "/usr/lib/sendmail"
+-#endif
++
++#include <paths.h>
++#define MAILER _PATH_SENDMAIL
  
- else
--  echo $ac_n "checking for Tcl_StaticPackage in -ltcl""... $ac_c" 1>&6
--echo "configure:3044: checking for Tcl_StaticPackage in -ltcl" >&5
-+  echo $ac_n "checking for Tcl_StaticPackage in -ltcl80""... $ac_c" 1>&6
-+echo "configure:3044: checking for Tcl_StaticPackage in -ltcl80" >&5
- ac_lib_var=`echo tcl'_'Tcl_StaticPackage | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-ltcl -lm $DL_LIBRARY $LIBS"
-+LIBS="-ltcl80 -lm $DL_LIBRARY $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 3052 "configure"
- #include "confdefs.h"
-@@ -3074,7 +3074,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  GIMPTCL='gimptcl'; LIBTCL_LIB="-ltcl -ltk $DL_LIBRARY"
-+  GIMPTCL='gimptcl'; LIBTCL_LIB="-ltcl80 -ltk80 $DL_LIBRARY"
- else
-   echo "$ac_t""no" 1>&6
- echo "configure: warning: *** gimptcl plug-in will not be built ***" 1>&2
+ #ifndef UUENCODE
+ #define UUENCODE "uuencode"
diff --git a/graphics/gimp/patches/patch-ac b/graphics/gimp/patches/patch-ac
deleted file mode 100644
index cf4765b0b79..00000000000
--- a/graphics/gimp/patches/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- plug-ins/gimptcl/gtclConst.c.orig	Thu Jan 29 01:34:11 1998
-+++ plug-ins/gimptcl/gtclConst.c	Thu Jan 29 01:35:21 1998
-@@ -27,7 +27,7 @@
-  */
- 
- #include <stdlib.h>
--#include <tcl.h>
-+#include <tcl8.0/tcl.h>
- 
- #include <glib.h>
- #include <libgimp/gimp.h>
diff --git a/graphics/gimp/patches/patch-ad b/graphics/gimp/patches/patch-ad
deleted file mode 100644
index a07475554e3..00000000000
--- a/graphics/gimp/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
---- plug-ins/gimptcl/gtclMain.c.orig	Thu Jan 29 01:34:18 1998
-+++ plug-ins/gimptcl/gtclMain.c	Thu Jan 29 01:35:15 1998
-@@ -29,8 +29,8 @@
- #include <string.h>
- #include <stdlib.h>
- #include <libgimp/gimp.h>
--#include <tcl.h>
--#include <tk.h>
-+#include <tcl8.0/tcl.h>
-+#include <tk8.0/tk.h>
- 
- #include "gtcl.h"
- 
diff --git a/graphics/gimp/patches/patch-ae b/graphics/gimp/patches/patch-ae
deleted file mode 100644
index 2da72a1c964..00000000000
--- a/graphics/gimp/patches/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- plug-ins/gimptcl/gtclPDB.c.orig	Thu Jan 29 01:34:27 1998
-+++ plug-ins/gimptcl/gtclPDB.c	Thu Jan 29 01:34:52 1998
-@@ -27,7 +27,7 @@
-  */
- 
- #include <ctype.h>
--#include <tcl.h>
-+#include <tcl8.0/tcl.h>
- #include <stdlib.h>
- #include <string.h>
- #include <libgimp/gimp.h>
diff --git a/graphics/gimp/patches/patch-af b/graphics/gimp/patches/patch-af
deleted file mode 100644
index 5080f0866c8..00000000000
--- a/graphics/gimp/patches/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- plug-ins/gimptcl/gtcl_misc.c.orig	Thu Jan 29 01:34:33 1998
-+++ plug-ins/gimptcl/gtcl_misc.c	Thu Jan 29 01:35:02 1998
-@@ -29,7 +29,7 @@
- #include <ctype.h>
- #include <stdlib.h>
- #include <string.h>
--#include <tcl.h>
-+#include <tcl8.0/tcl.h>
- #include <libgimp/gimp.h>
- #include "gtcl.h"
- 
diff --git a/graphics/gimp/patches/patch-ag b/graphics/gimp/patches/patch-ag
deleted file mode 100644
index 025ef7c2fa0..00000000000
--- a/graphics/gimp/patches/patch-ag
+++ /dev/null
@@ -1,15 +0,0 @@
---- plug-ins/mail/mail.c.orig	Mon Nov 24 23:04:27 1997
-+++ plug-ins/mail/mail.c	Mon Feb  2 22:10:46 1998
-@@ -88,9 +88,9 @@
-    * As always: The utility of this plugin is left as an exercise for the reader
-    *
-  */
--#ifndef MAILER
--#define MAILER "/usr/lib/sendmail"
--#endif
-+
-+#include <paths.h>
-+#define MAILER _PATH_SENDMAIL
- 
- #ifndef UUENCODE
- #define UUENCODE "uuencode"
diff --git a/graphics/gimp/patches/patch-ah b/graphics/gimp/patches/patch-ah
deleted file mode 100644
index 95a88c7ebfe..00000000000
--- a/graphics/gimp/patches/patch-ah
+++ /dev/null
@@ -1,169 +0,0 @@
---- app/boundary.c	1998/02/11 13:41:55	1.1
-+++ app/boundary.c	1998/02/11 13:42:40
-@@ -21,6 +21,8 @@
- #include "errors.h"
- #include "boundary.h"
- 
-+#include <libgimp/gimpconst.h>
-+
- /* half intensity for mask */
- #define HALF_WAY 127
- 
---- /dev/null	Wed Feb 11 13:37:01 1998
-+++ libgimp/gimpconst.h	Wed Feb 11 13:48:03 1998
-@@ -0,0 +1,41 @@
-+#ifndef GIMPCONST_H_
-+#define GIMPCONST_H_
-+
-+#include <limits.h>
-+
-+#ifndef G_MININT
-+#define G_MININT	INT_MIN
-+#endif
-+#ifndef G_MAXINT
-+#define G_MAXINT	INT_MAX
-+#endif
-+
-+#ifndef G_MINFLOAT
-+#define G_MINFLOAT	FLT_MIN
-+#endif
-+#ifndef G_MAXFLOAT
-+#define G_MAXFLOAT	FLT_MAX
-+#endif
-+
-+#ifndef G_MINDOUBLE
-+#define G_MINDOUBLE	DBL_MIN
-+#endif
-+#ifndef G_MAXDOUBLE
-+#define G_MAXDOUBLE	DBL_MAX
-+#endif
-+
-+#ifndef G_MINSHORT
-+#define G_MINSHORT	SHRT_MIN
-+#endif
-+#ifndef G_MAXSHORT
-+#define G_MAXSHORT	SHRT_MAX
-+#endif
-+
-+#ifndef G_MINLONG
-+#define G_MINLONG	LONG_MIN
-+#endif
-+#ifndef G_MAXLONG
-+#define G_MAXLONG	LONG_MAX
-+#endif
-+
-+#endif /* !GIMPCONST_H_ */
---- libgimp/gimp.h	1998/02/11 11:44:37	1.1
-+++ libgimp/gimp.h	1998/02/11 13:46:57
-@@ -21,6 +21,7 @@
- 
- #include <glib.h>
- #include <libgimp/gimpenums.h>
-+#include <libgimp/gimpconst.h>
- 
- 
- #ifdef __cplusplus
---- app/curves.c	1998/02/11 15:18:01	1.1
-+++ app/curves.c	1998/02/11 15:18:31
-@@ -31,6 +31,8 @@
- #include "interface.h"
- #include "curves.h"
- 
-+#include <libgimp/gimpconst.h>
-+
- #define ROUND(x)  ((int) ((x) + 0.5))
- 
- #define GRAPH              0x1
---- app/gdisplay.c	1998/02/11 15:26:48	1.1
-+++ app/gdisplay.c	1998/02/11 15:27:10
-@@ -46,6 +46,8 @@
- 
- #include "layer_pvt.h"			/* ick. */
- 
-+#include <libgimp/gimpconst.h>
-+
- #define OVERHEAD          25  /*  in units of pixel area  */
- #define EPSILON           5
- 
---- app/levels.c	1998/02/11 15:39:59	1.1
-+++ app/levels.c	1998/02/11 15:40:20
-@@ -30,6 +30,8 @@
- #include "interface.h"
- #include "levels.h"
- 
-+#include <libgimp/gimpconst.h>
-+
- #define LOW_INPUT          0x1
- #define GAMMA              0x2
- #define HIGH_INPUT         0x4
---- app/pixel_region.c	1998/02/11 15:51:31	1.1
-+++ app/pixel_region.c	1998/02/11 15:51:56
-@@ -25,6 +25,8 @@
- 
- #include "tile_manager_pvt.h"
- 
-+#include <libgimp/gimpconst.h>
-+
- typedef struct _PixelRegionHolder PixelRegionHolder;
- 
- struct _PixelRegionHolder
---- plug-ins/gimptcl/Makefile.in	1998/02/11 16:11:03	1.1
-+++ plug-ins/gimptcl/Makefile.in	1998/02/11 16:12:25
-@@ -46,7 +46,7 @@
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
--INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_SCRIPT = ${INSTALL} -m 555
- transform = @program_transform_name@
- 
- NORMAL_INSTALL = :
-@@ -331,7 +331,7 @@
- all: all-recursive all-am
- 
- install-strip:
--	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
-+	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_SCRIPT)' install
- installdirs: installdirs-recursive
- 	$(mkinstalldirs)  $(libexecdir)
- 
---- plug-ins/gimptcl/scripts/Makefile.in	1998/02/11 16:17:39	1.1
-+++ plug-ins/gimptcl/scripts/Makefile.in	1998/02/11 16:18:40
-@@ -46,7 +46,7 @@
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
--INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_SCRIPT = ${INSTALL} -m 0555
- transform = @program_transform_name@
- 
- NORMAL_INSTALL = :
-@@ -174,7 +174,7 @@
- all: Makefile $(SCRIPTS)
- 
- install-strip:
--	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
-+	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_SCRIPT)' install
- installdirs:
- 	$(mkinstalldirs)  $(pluginlibdir)
- 
---- Makefile.in	1998/02/11 16:44:06	1.1
-+++ Makefile.in	1998/02/11 16:44:43
-@@ -46,7 +46,7 @@
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
--INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_SCRIPT = ${INSTALL} -m 0555
- transform = @program_transform_name@
- 
- NORMAL_INSTALL = :
-@@ -333,7 +333,7 @@
- all: all-recursive-am all-am
- 
- install-strip:
--	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
-+	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_SCRIPT)' install
- installdirs: installdirs-recursive
- 	$(mkinstalldirs)  $(gimpdatadir) $(gimpdatadir)
-