Patches to 1.2.0 for --with-included-gettext and HP-UX 11.00
1. HP-UX 11.00 does not have finite() but does have isfinite() as a macro in math.h 2. If --with-included-gettext is specified, need to -I$(top_srcdir)/intl 3. Fix for AM_WITH_NLS on Solaris -- albert chin ([EMAIL PROTECTED]) -- snip snip --- libgimp/gimpmath.h.orig Wed Dec 27 21:37:51 2000 +++ libgimp/gimpmath.h Wed Dec 27 21:39:32 2000 @@ -82,13 +82,19 @@ #define gimp_deg_to_rad(angle) ((angle) * (2.0 * G_PI) / 360.0) #define gimp_rad_to_deg(angle) ((angle) * 360.0 / (2.0 * G_PI)) +#ifdef HAVE_FINITE +#define FINITE(x) finite(x) +#else +#ifdef HAVE_ISFINITE +#define FINITE(x) isfinite(x) +#else #ifdef G_OS_WIN32 #define FINITE(x) _finite(x) #else #ifdef __EMX__ #define FINITE(x) isfinite(x) -#else -#define FINITE(x) finite(x) +#endif +#endif #endif #endif --- plug-ins/dbbrowser/Makefile.am.orig Tue Dec 26 02:52:05 2000 +++ plug-ins/dbbrowser/Makefile.am Tue Dec 26 02:52:36 2000 @@ -16,6 +16,7 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/intl\ $(GTK_CFLAGS) \ -I$(includedir) --- plug-ins/script-fu/Makefile.am.orig Tue Dec 26 02:58:14 2000 +++ plug-ins/script-fu/Makefile.am Tue Dec 26 02:58:42 2000 @@ -31,6 +31,7 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/intl\ $(GTK_CFLAGS) \ -I$(includedir) --- plug-ins/FractalExplorer/Makefile.am.orig Tue Dec 26 03:00:30 2000 +++ plug-ins/FractalExplorer/Makefile.amTue Dec 26 03:00:44 2000 @@ -22,6 +22,7 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/intl\ $(GTK_CFLAGS) \ -I$(includedir) --- plug-ins/Lighting/Makefile.am.orig Tue Dec 26 03:02:48 2000 +++ plug-ins/Lighting/Makefile.am Tue Dec 26 03:03:01 2000 @@ -30,6 +30,7 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/intl\ -I$(top_srcdir)/plug-ins/libgck \ $(GTK_CFLAGS) \ -I$(includedir) --- plug-ins/MapObject/Makefile.am.orig Tue Dec 26 03:04:25 2000 +++ plug-ins/MapObject/Makefile.am Tue Dec 26 03:04:38 2000 @@ -32,6 +32,7 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/intl\ -I$(top_srcdir)/plug-ins/libgck \ $(GTK_CFLAGS) \ -I$(includedir) --- plug-ins/bmp/Makefile.am.orig Tue Dec 26 03:07:05 2000 +++ plug-ins/bmp/Makefile.amTue Dec 26 03:09:19 2000 @@ -12,6 +12,7 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/intl\ $(GTK_CFLAGS) \ -I$(includedir) --- plug-ins/faxg3/Makefile.am.orig Tue Dec 26 03:11:59 2000 +++ plug-ins/faxg3/Makefile.am Tue Dec 26 03:12:34 2000 @@ -15,6 +15,7 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/intl\ $(GLIB_CFLAGS) \ -I$(includedir) --- plug-ins/fits/Makefile.am.orig Tue Dec 26 03:13:29 2000 +++ plug-ins/fits/Makefile.am Tue Dec 26 03:13:36 2000 @@ -11,6 +11,7 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/intl\ $(GTK_CFLAGS) \ -I$(includedir) --- plug-ins/flame/Makefile.am.orig Tue Dec 26 03:17:07 2000 +++ plug-ins/flame/Makefile.am Tue Dec 26 03:17:24 2000 @@ -19,6 +19,7 @@ INCLUDES = \ -DLOCALEDIR=\""$(localedir)"\" \ -I$(top_srcdir) \ + -I$(top_srcdir)/intl\ $(GTK_CFLAGS) \ -I$(includedir) --- plug-ins/fp/Makefile.am.origTue Dec 26 03:19:10 2000 +++ plug-ins/fp/Makefile.am Tue Dec 26 03:19:23 2000 @@ -16,6 +16,7 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/intl\ $(GTK_CFLAGS) \ -I$(includedir) --- plug-ins/gap/Makefile.am.orig Tue Dec 26 03:20:24 2000 +++ plug-ins/gap/Makefile.amTue Dec 26 03:20:38 2000 @@ -205,6 +205,7 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/intl\ $(GTK_CFLAGS) \ -I$(includedir) --- plug-ins/gdyntext/gdyntextcompat.h.orig Mon Dec 25 14:02:35 2000 +++ plug-ins/gdyntext/gdyntextcompat.h Mon Dec 25 14:02:45 2000 @@ -64,7 +64,9 @@ /* gimp-1.1.14+ function names reorganization forgotten something */ #if defined(GIMP_HAVE_PARASITES) GIMP_MICRO_VERSION 14 +#ifdef __GNUC__ # warning Replacing missing function 'gimp_drawable_parasite_find' +#endif # define gimp_drawable_parasite_find gimp_drawable_parasite_find #endif --- plug-ins/gdyntext/Makefile.am.orig Tue Dec 26 03:23:48 2000 +++ plug-ins/gdyntext/Makefile.am Tue Dec 26 03:23:57 2000 @@ -48,6 +48,7 @@ INCLUDES = \
Re: Patches to 1.2.0 for --with-included-gettext and HP-UX 11.00
On Thu, Dec 28, 2000 at 11:49:47AM -0600, Albert Chin-A-Young wrote: 1. HP-UX 11.00 does not have finite() but does have isfinite() as a macro in math.h Oops. Try this patch instead. -- albert chin ([EMAIL PROTECTED]) -- snip snip --- configure.in.orig Tue Dec 26 00:58:35 2000 +++ configure.inThu Dec 28 14:22:02 2000 @@ -138,6 +138,8 @@ changequote([,])dnl +AC_CHECK_HEADERS(math.h ieeefp.h) + dnl DU4 native cc currently needs -std1 for ANSI mode (instead of KR) AC_MSG_CHECKING([for extra flags to get ANSI library prototypes]) gimp_save_LIBS=$LIBS @@ -348,6 +350,20 @@ AC_FUNC_ALLOCA +dnl Check for finite or isfinite +AC_CHECK_FUNCS(finite, , [ + AC_MSG_CHECKING(for finite in math.h) + AC_TRY_LINK([#include math.h], [double f = 0.0; finite (f)], [ +AC_DEFINE(HAVE_FINITE) +AC_MSG_RESULT(yes)], [ +AC_MSG_RESULT(no) +AC_MSG_CHECKING(for isfinite in math.h) +AC_TRY_LINK([#include math.h], [float f = 0.0; isfinite(f)], [ + AC_DEFINE(HAVE_ISFINITE) + AC_MSG_RESULT(yes)], AC_MSG_RESULT(no))])]) +AC_SUBST(HAVE_FINITE) +AC_SUBST(HAVE_ISFINITE) + dnl Check for sys/select.h AC_MSG_CHECKING([fd_set and sys/select]) --- config.h.in.origWed Dec 27 21:31:43 2000 +++ config.h.in Thu Dec 28 14:06:00 2000 @@ -186,3 +186,15 @@ /* Define if you have the i library (-li). */ #undef HAVE_LIBI + +/* Define if you have the math.h header file. */ +#undef HAVE_MATH_H + +/* Define if you have ieeefp.h. */ +#undef HAVE_IEEEFP_H + +/* Define if you have the finite() function. */ +#undef HAVE_FINITE + +/* Define if you have isfinite(). */ +#undef HAVE_ISFINITE --- libgimp/gimpmath.h.orig Wed Dec 27 21:37:51 2000 +++ libgimp/gimpmath.h Thu Dec 28 14:07:54 2000 @@ -24,7 +24,12 @@ #ifndef __GIMPMATH_H__ #define __GIMPMATH_H__ +#ifdef HAVE_MATH_H #include math.h +#endif +#ifdef HAVE_IEEEFP_H +#include ieeefp.h +#endif #ifdef G_OS_WIN32 #include float.h @@ -82,13 +87,19 @@ #define gimp_deg_to_rad(angle) ((angle) * (2.0 * G_PI) / 360.0) #define gimp_rad_to_deg(angle) ((angle) * 360.0 / (2.0 * G_PI)) +#ifdef HAVE_FINITE +#define FINITE(x) finite(x) +#else +#ifdef HAVE_ISFINITE +#define FINITE(x) isfinite(x) +#else #ifdef G_OS_WIN32 #define FINITE(x) _finite(x) #else #ifdef __EMX__ #define FINITE(x) isfinite(x) -#else -#define FINITE(x) finite(x) +#endif +#endif #endif #endif
Re: GIMP 1.2.0 and IRIX
On Thu, Dec 28, 2000 at 01:12:28AM +0100, Sven Neumann wrote: Hi, Albert Chin-A-Young [EMAIL PROTECTED] writes: On IRIX 6.2 and 6.5 with GIMP 1.2.0: $ gimp /opt/TWWfsw/gimp12/bin/gimp: Failed to load one of the brushes in the brush pipe "/opt/TWWfsw/gimp12/share/gimp/1.2/brushes/SketchBrush-64.gih" /opt/TWWfsw/gimp12/bin/gimp: Warning: Failed to load brush pipe "/opt/TWWfsw/gimp12/share/gimp/1.2/brushes/SketchBrush-64.gih" /opt/TWWfsw/gimp12/bin/gimp: Failed to load one of the brushes in the brush pipe "/opt/TWWfsw/gimp12/share/gimp/1.2/brushes/SketchBrush-16.gih" /opt/TWWfsw/gimp12/bin/gimp: Warning: Failed to load brush pipe "/opt/TWWfsw/gimp12/share/gimp/1.2/brushes/SketchBrush-16.gih" /opt/TWWfsw/gimp12/bin/gimp: Failed to load one of the brushes in the brush pipe "/opt/TWWfsw/gimp12/share/gimp/1.2/brushes/SketchBrush-32.gih" /opt/TWWfsw/gimp12/bin/gimp: Warning: Failed to load brush pipe "/opt/TWWfsw/gimp12/share/gimp/1.2/brushes/SketchBrush-32.gih" $ ls -ld /opt/TWWfsw/gimp12/share/gimp/1.2/brushes/SketchBrush-64.gih -rw-r--r--1 root sys20818 Dec 26 22:32 /opt/TWWfsw/gimp12/share/gimp/1.2/brushes/SketchBrush-64.gih The fix is to revert to data/brushes/SketchBrush* from 1.1.32. Any reason the version of these three files in 1.2.0 is different than from 1.1.32? Yes, the old format was braindead and while the new is still bad, it does not suck that much. We tried to keep backward-compatibility with the old format and this piece of code might bite you here. I can not reproduce the problem here, but you could help me to locate it by explicetely checking if you can load and use the pepper.gbr file (which provides the "Pepper" pixmap brush). I can successfully use pepper.gbr. File-Open loads it in just fine and I can select the brush in File-Dialogs-Brushes. FYI, I have no problems with Solaris 8/SPARC nor Tru64 UNIX 4.0D/5.0. Trying to File-Open SketchBrush-16.gih returns: Couldn't load one brush in the pipe, giving up. Ditto for SketchBrush-32.gih and SketchBrush-64.gih. -- albert chin ([EMAIL PROTECTED])
GIMP 1.2.0 and IRIX
On IRIX 6.2 and 6.5 with GIMP 1.2.0: $ gimp /opt/TWWfsw/gimp12/bin/gimp: Failed to load one of the brushes in the brush pipe "/opt/TWWfsw/gimp12/share/gimp/1.2/brushes/SketchBrush-64.gih" /opt/TWWfsw/gimp12/bin/gimp: Warning: Failed to load brush pipe "/opt/TWWfsw/gimp12/share/gimp/1.2/brushes/SketchBrush-64.gih" /opt/TWWfsw/gimp12/bin/gimp: Failed to load one of the brushes in the brush pipe "/opt/TWWfsw/gimp12/share/gimp/1.2/brushes/SketchBrush-16.gih" /opt/TWWfsw/gimp12/bin/gimp: Warning: Failed to load brush pipe "/opt/TWWfsw/gimp12/share/gimp/1.2/brushes/SketchBrush-16.gih" /opt/TWWfsw/gimp12/bin/gimp: Failed to load one of the brushes in the brush pipe "/opt/TWWfsw/gimp12/share/gimp/1.2/brushes/SketchBrush-32.gih" /opt/TWWfsw/gimp12/bin/gimp: Warning: Failed to load brush pipe "/opt/TWWfsw/gimp12/share/gimp/1.2/brushes/SketchBrush-32.gih" $ ls -ld /opt/TWWfsw/gimp12/share/gimp/1.2/brushes/SketchBrush-64.gih -rw-r--r--1 root sys20818 Dec 26 22:32 /opt/TWWfsw/gimp12/share/gimp/1.2/brushes/SketchBrush-64.gih The fix is to revert to data/brushes/SketchBrush* from 1.1.32. Any reason the version of these three files in 1.2.0 is different than from 1.1.32? -- albert chin ([EMAIL PROTECTED])
Re: GIMP 1.2.0 and IRIX
On Wed, Dec 27, 2000 at 01:16:26AM -0600, Albert Chin-A-Young wrote: On IRIX 6.2 and 6.5 with GIMP 1.2.0: $ gimp /opt/TWWfsw/gimp12/bin/gimp: Failed to load one of the brushes in the brush pipe "/opt/TWWfsw/gimp12/share/gimp/1.2/brushes/SketchBrush-64.gih" /opt/TWWfsw/gimp12/bin/gimp: Warning: Failed to load brush pipe "/opt/TWWfsw/gimp12/share/gimp/1.2/brushes/SketchBrush-64.gih" /opt/TWWfsw/gimp12/bin/gimp: Failed to load one of the brushes in the brush pipe "/opt/TWWfsw/gimp12/share/gimp/1.2/brushes/SketchBrush-16.gih" /opt/TWWfsw/gimp12/bin/gimp: Warning: Failed to load brush pipe "/opt/TWWfsw/gimp12/share/gimp/1.2/brushes/SketchBrush-16.gih" /opt/TWWfsw/gimp12/bin/gimp: Failed to load one of the brushes in the brush pipe "/opt/TWWfsw/gimp12/share/gimp/1.2/brushes/SketchBrush-32.gih" /opt/TWWfsw/gimp12/bin/gimp: Warning: Failed to load brush pipe "/opt/TWWfsw/gimp12/share/gimp/1.2/brushes/SketchBrush-32.gih" $ ls -ld /opt/TWWfsw/gimp12/share/gimp/1.2/brushes/SketchBrush-64.gih -rw-r--r--1 root sys20818 Dec 26 22:32 /opt/TWWfsw/gimp12/share/gimp/1.2/brushes/SketchBrush-64.gih The fix is to revert to data/brushes/SketchBrush* from 1.1.32. Any reason the version of these three files in 1.2.0 is different than from 1.1.32? Oops, I mean 1.1.30. 1.1.32 has the same SketchBrush* files as in 1.2.0. -- albert chin ([EMAIL PROTECTED])
