SOURCES: xfig-config.patch, xfig-mkstemp.diff - updated

[arekm]

Author: arekm                        Date: Sun Apr 27 20:30:58 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

---- Files affected:
SOURCES:
   xfig-config.patch (1.6 -> 1.7) , xfig-mkstemp.diff (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/xfig-config.patch
diff -u SOURCES/xfig-config.patch:1.6 SOURCES/xfig-config.patch:1.7
--- SOURCES/xfig-config.patch:1.6	Fri Jun  4 21:19:10 2004
+++ SOURCES/xfig-config.patch	Sun Apr 27 22:30:53 2008
@@ -45,9 +45,9 @@
 @@ -116,7 +116,7 @@
  
  #ifdef USEXPM
- XPMLIBDIR = $(USRLIBDIR)
--XPMINC = -I/usr/include/X11
-+XPMINC = -I/usr/X11R6/include/X11
+ XPMLIBDIR = /usr/local/lib
+-XPMINC = -I/usr/local/include/X11
++XPMINC = -I/usr/include/X11
  #endif
  
  XCOMM Uncomment the following definiton if you want to use the small icons

================================================================
Index: SOURCES/xfig-mkstemp.diff
diff -u SOURCES/xfig-mkstemp.diff:1.3 SOURCES/xfig-mkstemp.diff:1.4
--- SOURCES/xfig-mkstemp.diff:1.3	Thu Apr 22 01:08:23 2004
+++ SOURCES/xfig-mkstemp.diff	Sun Apr 27 22:30:53 2008
@@ -10,30 +10,28 @@
      char        tmpfile[PATH_MAX],
  		pixnam[PATH_MAX],
  		errnam[PATH_MAX],
-@@ -284,9 +284,21 @@
+@@ -280,9 +280,19 @@
  	fclose(tmpfp);
      }
-     /* make name /TMPDIR/xfig-pic.pix */
--    sprintf(pixnam, "%s/%s%06d.pix", TMPDIR, "xfig-pic", getpid());
-+	snprintf(pixnam, sizeof(pixnam), "%s/xfig-pic.XXXXXX", TMPDIR);
-+	if ((fd = mkstemp(pixnam)) == -1) {
+     /* make name /TMPDIR/xfig-pic######.pix */
+-    sprintf(pixnam, "%s/%s%06d.pix", TMPDIR, "xfig-pic", tempseq);
++    snprintf(pixnam, sizeof(pixnam), "%s/xfig-pic.XXXXXX", TMPDIR);
++    if ((fd = mkstemp(pixnam)) == -1) {
 +	    file_msg("Couldn't open tmp file %s, %s", pixnam, strerror(errno));
 +	    return False;
-+	}
-+	close(fd);
-+
++    }
++    close(fd);
      /* and file name for any error messages from gs */
--    sprintf(errnam, "%s/%s%06d.err", TMPDIR, "xfig-pic", getpid());
+-    sprintf(errnam, "%s/%s%06d.err", TMPDIR, "xfig-pic", tempseq);
 +    snprintf(errnam, sizeof(errnam), "%s/xfig-picerr.XXXXXX", TMPDIR);
-+	if ((fd = mkstemp(errnam)) == -1) {
++    if ((fd = mkstemp(errnam)) == -1) {
 +	    file_msg("Couldn't open tmp file %s, %s", errnam, strerror(errno));
 +	    return False;
-+	}
-+	close(fd);
-+
++    }
++    close(fd);
+     tempseq++;
+ 
      /* generate gs command line */
-     /* for monochrome, use pbm */
-     if (tool_cells <= 2 || appres.monochrome) {
 diff -urN xfig.3.2.5-alpha4.org/f_readgif.c xfig.3.2.5-alpha4/f_readgif.c
 --- xfig.3.2.5-alpha4.org/f_readgif.c	2004-04-22 00:49:19.369846072 +0200
 +++ xfig.3.2.5-alpha4/f_readgif.c	2004-04-22 00:52:30.625770752 +0200
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/xfig-config.patch?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/xfig-mkstemp.diff?r1=1.3&r2=1.4&f=u