Mercurial > mxe-octave
changeset 4863:e5acf1d94d33
transfig: update to v3.2.7a
* src/transfig.mk: update version, checksum
* src/transfig-1-fixes.patch: update patch
| author | John Donoghue |
|---|---|
| date | Fri, 19 Oct 2018 15:37:38 -0400 |
| parents | c2ac58e063b5 |
| children | b0e1e4363cf0 |
| files | src/transfig-1-fixes.patch src/transfig.mk |
| diffstat | 2 files changed, 37 insertions(+), 86 deletions(-) [+] |
line wrap: on
line diff
--- a/src/transfig-1-fixes.patch Fri Oct 19 15:15:04 2018 -0400 +++ b/src/transfig-1-fixes.patch Fri Oct 19 15:37:38 2018 -0400 @@ -1,96 +1,47 @@ -diff -ur fig2dev-3.2.6-rc.orig/fig2dev/dev/genbitmaps.c fig2dev-3.2.6-rc/fig2dev/dev/genbitmaps.c ---- fig2dev-3.2.6-rc.orig/fig2dev/dev/genbitmaps.c 2016-07-21 12:56:13.331222524 -0400 -+++ fig2dev-3.2.6-rc/fig2dev/dev/genbitmaps.c 2016-07-21 13:01:11.202891975 -0400 -@@ -160,7 +160,9 @@ - if (tfp != stdout) - fclose(tfp); +diff -ur fig2dev-3.2.7a.orig/fig2dev/dev/genbitmaps.c fig2dev-3.2.7a/fig2dev/dev/genbitmaps.c +--- fig2dev-3.2.7a.orig/fig2dev/dev/genbitmaps.c 2018-10-19 15:28:40.513608360 -0400 ++++ fig2dev-3.2.7a/fig2dev/dev/genbitmaps.c 2018-10-19 15:30:51.900907004 -0400 +@@ -232,8 +232,9 @@ + if (to) + sprintf(com + n, " >'%s'", to); + } +- ++#if !defined (__WIN32__) || defined (__CYGWIN__) + (void) signal(SIGPIPE, bitmaps_broken_pipe); ++#endif + if ((tfp = popen(com, "w")) == 0) { + fprintf(stderr, "fig2dev: Can't open pipe to ghostscript\n"); + fprintf(stderr, "command was: %s\n", com); +@@ -275,7 +276,9 @@ -+#if ! defined (__WIN32__) || defined (__CYGWIN__) - (void) signal(SIGPIPE, gs_broken_pipe); -+#endif - if ((tfp = popen(gscom,"w" )) == 0) { - fprintf(stderr,"fig2dev: Can't open pipe to ghostscript\n"); - fprintf(stderr,"command was: %s\n", gscom); -@@ -191,7 +193,9 @@ - fprintf(stderr,"command was: %s\n", gscom); - return -1; - } + status = pclose(tfp); + tfp = 0; /* Otherwise main() tries to close tfp again */ +#if ! defined (__WIN32__) || defined (__CYGWIN__) (void) signal(SIGPIPE, SIG_DFL); +#endif - /* all ok so far */ - status = 0; -diff -ur fig2dev-3.2.6-rc.orig/fig2dev/dev/genpdf.c fig2dev-3.2.6-rc/fig2dev/dev/genpdf.c ---- fig2dev-3.2.6-rc.orig/fig2dev/dev/genpdf.c 2016-07-21 13:04:33.941910210 -0400 -+++ fig2dev-3.2.6-rc/fig2dev/dev/genpdf.c 2016-07-21 13:05:54.091731415 -0400 -@@ -56,7 +56,9 @@ - sprintf(gscom, - "gs -q -dNOPAUSE -sAutoRotatePages=None -dAutoFilterColorImages=false -dColorImageFilter=/DCTEncode -sDEVICE=pdfwrite -dPDFSETTINGS=/prepress -sOutputFile=\'%s\' - -c quit", - ofile); + if (status != 0) { + fputs("Error in ghostcript or netpbm command\n", stderr); +diff -ur fig2dev-3.2.7a.orig/fig2dev/dev/genpdf.c fig2dev-3.2.7a/fig2dev/dev/genpdf.c +--- fig2dev-3.2.7a.orig/fig2dev/dev/genpdf.c 2018-10-19 15:28:40.509608259 -0400 ++++ fig2dev-3.2.7a/fig2dev/dev/genpdf.c 2018-10-19 15:31:31.761906076 -0400 +@@ -95,7 +95,9 @@ + "-dAutoFilterColorImages=false -dColorImageFilter=/DCTEncode " + "-sDEVICE=pdfwrite -dPDFSETTINGS=/prepress -o '%s' -", + GSEXE, ofile); +#if !defined (__WIN32__) || defined (__CYGWIN__) - (void) signal(SIGPIPE, gs_broken_pipe); + (void) signal(SIGPIPE, pdf_broken_pipe); +#endif - if ((tfp = popen(gscom,"w" )) == 0) { - fprintf(stderr,"fig2dev: Can't open pipe to ghostscript\n"); - fprintf(stderr,"command was: %s\n", gscom); -@@ -82,7 +84,9 @@ - fprintf(stderr,"command was: %s\n", gscom); - return -1; + if ((tfp = popen(com, "w")) == 0) { + fprintf(stderr, "fig2dev: Cannot open pipe to ghostscript\n"); + fprintf(stderr, "command was: %s\n", com); +@@ -125,7 +127,9 @@ + free(com); + return -1; } +#if !defined (__WIN32__) || defined (__CYGWIN__) (void) signal(SIGPIPE, SIG_DFL); +#endif - - /* all ok so far */ - -diff -ur fig2dev-3.2.6-rc.orig/fig2dev/dev/genps.c fig2dev-3.2.6-rc/fig2dev/dev/genps.c ---- fig2dev-3.2.6-rc.orig/fig2dev/dev/genps.c 2016-07-21 13:13:08.193346910 -0400 -+++ fig2dev-3.2.6-rc/fig2dev/dev/genps.c 2016-07-21 13:14:08.520459655 -0400 -@@ -120,8 +120,10 @@ - static bool ellipse_exist(F_compound *ob); - static bool approx_spline_exist(F_compound *ob); - static void draw_gridline(float x1, float y1, float x2, float y2); -+#ifdef HAVE_X11_XPM_H - static void convert_xpm_colors(unsigned char cmap[3][MAXCOLORMAPSIZE], - XpmColor *coltabl, int ncols); -+#endif - static void genps_itp_spline(F_spline *s); - static void genps_ctl_spline(F_spline *s); + free(com); -diff -ur fig2dev-3.2.6-rc.orig/fig2dev/lib/realloc.c fig2dev-3.2.6-rc/fig2dev/lib/realloc.c ---- fig2dev-3.2.6-rc.orig/fig2dev/lib/realloc.c 2016-07-21 13:17:46.898252242 -0400 -+++ fig2dev-3.2.6-rc/fig2dev/lib/realloc.c 2016-07-21 13:23:33.706176197 -0400 -@@ -37,6 +37,8 @@ - void * - rpl_realloc(void *p, size_t n) - { -+ void * result; -+ - if (n == 0) { - n = 1; - free(p); -@@ -49,6 +51,7 @@ - result = malloc(n); - } else { - result = realloc(p, n); -+ } - - return result; - } -Only in fig2dev-3.2.6-rc/fig2dev/dev: .genemf.c.swp -diff -ur fig2dev-3.2.6-rc.orig/fig2dev/dev/readpng.c fig2dev-3.2.6-rc/fig2dev/dev/readpng.c ---- fig2dev-3.2.6-rc.orig/fig2dev/dev/readpng.c 2016-07-21 13:26:42.408414261 -0400 -+++ fig2dev-3.2.6-rc/fig2dev/dev/readpng.c 2016-07-21 13:34:28.790596818 -0400 -@@ -18,6 +18,11 @@ - #include "colors.h" /* rgb2luminance() */ - #include <png.h> - -+#if defined(__WIN32__) && !defined(__CYGWIN__) -+ #include <string.h> -+ #define bcopy(a,b,c) memcpy(a,b,c) -+#endif -+ - /* return codes: 1 : success - 0 : invalid file - */ + return 0;
--- a/src/transfig.mk Fri Oct 19 15:15:04 2018 -0400 +++ b/src/transfig.mk Fri Oct 19 15:37:38 2018 -0400 @@ -3,8 +3,8 @@ PKG := transfig $(PKG)_IGNORE := -$(PKG)_VERSION := 3.2.6a -$(PKG)_CHECKSUM := e09145435f3306010eb006f9d7e118fccf77cd2b +$(PKG)_VERSION := 3.2.7a +$(PKG)_CHECKSUM := 279af6b65f95f0543c3bed6658096f28b738b40e $(PKG)_SUBDIR := fig2dev-$($(PKG)_VERSION) $(PKG)_FILE := fig2dev-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/mcj/$($(PKG)_FILE)