Re: Making mkdep and GDHE...

You wrote (in your message from Thursday 26)
 > Mathieu,
 > 
 > making mkdep is not too difficult. But the tarball misses the
 > man file:
 > 
 >    make: *** No rule to make target `/usr/local/man/man1/mkdep.1',
 > 

Well the mkdep Makefile is not really portable when it comes to man
pages. I need to improve that.

 > So, now gdhe builds, but not completely:
 > 
 >   make[2]: Entering directory `/tmp/gdhe-3.2/modules/tkjpeg'
 >   gcc -pipe -c -fPIC -o jTclChanSrc.o -I./client -I./Togl -I../..
 >   -I/usr/X11R6/include  -I/usr/include/tcl8.4
 >   -I/usr/include/tcl8.4/tk-private/generic -g -O  jTclChanSrc.c
 >   gcc -pipe -c -fPIC -o jmem.o -I./client -I./Togl -I../..
 >   -I/usr/X11R6/include  -I/usr/include/tcl8.4
 >   -I/usr/include/tcl8.4/tk-private/generic -g -O  jmem.c
 >   gcc -pipe -c -fPIC -o tkjpeg.o -I./client -I./Togl -I../..
 >   -I/usr/X11R6/include  -I/usr/include/tcl8.4
 >   -I/usr/include/tcl8.4/tk-private/generic -g -O  tkjpeg.c
 >   tkjpeg.c: In function `jpegFileReadProc':
 >   tkjpeg.c:305: error: too few arguments to function `Tk_PhotoPutBlock'
 >   tkjpeg.c: In function `jpegDataReadProc':
 >   tkjpeg.c:407: error: too few arguments to function `Tk_PhotoPutBlock'
 >   tkjpeg.c: In function `JpegPhotoChannelRead':
 >   tkjpeg.c:526: error: too few arguments to function `Tk_PhotoPutBlock'
 >   tkjpeg.c: In function `registerJpegFormat':
 >   tkjpeg.c:559: let op: doorgeven van argument 3 van `Tcl_CreateCommand'
 >   van incompatibel pointertype
 > (The last line means that the passing of the argument number 3 is of
 > an incompatible pointertype).
 > 

Looks like Tk 8.4 made an incompatible change to
Tk_PhotoPutBlock(). Can you try the following patch ?

Index: modules/tkjpeg/tkjpeg.c
===================================================================
RCS file: /usr/local/cvs_hilare/gdhe/modules/tkjpeg/tkjpeg.c,v
retrieving revision 1.3
diff -u -u -r1.3 tkjpeg.c
--- modules/tkjpeg/tkjpeg.c	9 Feb 2003 16:31:28 -0000	1.3
+++ modules/tkjpeg/tkjpeg.c	27 Jun 2003 12:03:39 -0000
@@ -302,7 +302,13 @@
         }
         block.height = count;
 	/* Ecriture dans la photo */
+#if TK_MAJOR_VERSION == 8 && TK_MINOR_VERSION <= 3
         Tk_PhotoPutBlock(imageHandle, &block, destX, destY, width, count);
+#else
+        Tk_PhotoPutBlock(imageHandle, &block, destX, destY, width, 
+	    count, TK_PHOTO_COMPOSITE_SET);
+#endif
+	
         destY += count;
     }
     /* Fini, on libere les donnees */
@@ -404,7 +410,12 @@
         }
         block.height = count;
 	/* Ecriture dans la photo */
+#if TK_MAJOR_VERSION == 8 && TK_MINOR_VERSION <= 3
         Tk_PhotoPutBlock(imageHandle, &block, destX, destY, width, count);
+#else
+        Tk_PhotoPutBlock(imageHandle, &block, destX, destY, width, 
+	    count, TK_PHOTO_COMPOSITE_SET);
+#endif
         destY += count;
     }
     /* Fini, on libere les donnees */
@@ -523,7 +534,13 @@
         }
         block.height = count;
 	/* Ecriture dans la photo */
+#if TK_MAJOR_VERSION == 8 && TK_MINOR_VERSION <= 3
         Tk_PhotoPutBlock(photoHandle, &block, 0, destY, fileWidth, count);
+#else
+        Tk_PhotoPutBlock(photoHandle, &block, 0, destY, fileWidth, 
+	    count, TK_PHOTO_COMPOSITE_SET);
+#endif
+	
         destY += count;
     }
     /* Fini, on libere les donnees */