summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvipng/dvipng-1.14-PATCHES
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2015-03-03 13:30:44 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2015-03-03 13:30:44 +0000
commitd34e62f6c5fec68a9b3cb118a1d0bfcee6302726 (patch)
tree2501fe5204fadcff4955fb5c4fecdd063031e168 /Build/source/texk/dvipng/dvipng-1.14-PATCHES
parentaad1d15f2e5fbef73dec00a613f347abe86036a1 (diff)
dvipng 1.15
git-svn-id: svn://tug.org/texlive/trunk@36426 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipng/dvipng-1.14-PATCHES')
-rw-r--r--Build/source/texk/dvipng/dvipng-1.14-PATCHES/ChangeLog117
-rw-r--r--Build/source/texk/dvipng/dvipng-1.14-PATCHES/TL-Changes20
-rw-r--r--Build/source/texk/dvipng/dvipng-1.14-PATCHES/patch-01-gd-copyright19
-rw-r--r--Build/source/texk/dvipng/dvipng-1.14-PATCHES/patch-02-const15
-rw-r--r--Build/source/texk/dvipng/dvipng-1.14-PATCHES/patch-03-programname62
-rw-r--r--Build/source/texk/dvipng/dvipng-1.14-PATCHES/patch-05-sys_wait17
-rw-r--r--Build/source/texk/dvipng/dvipng-1.14-PATCHES/patch-06-WIN3230
-rw-r--r--Build/source/texk/dvipng/dvipng-1.14-PATCHES/patch-07-w64-ptr79
8 files changed, 0 insertions, 359 deletions
diff --git a/Build/source/texk/dvipng/dvipng-1.14-PATCHES/ChangeLog b/Build/source/texk/dvipng/dvipng-1.14-PATCHES/ChangeLog
deleted file mode 100644
index 77dd844fe5c..00000000000
--- a/Build/source/texk/dvipng/dvipng-1.14-PATCHES/ChangeLog
+++ /dev/null
@@ -1,117 +0,0 @@
-2014-11-05 Peter Breitenlohner <peb@mppmu.mpg.de>
-
- * patch-07-w64-ptr: Fixed a typo.
-
-2014-07-15 Peter Breitenlohner <peb@mppmu.mpg.de>
-
- * patch-07-w64-ptr: Avoid WIN64 warning due to different size.
-
-2013-07-09 Peter Breitenlohner <peb@mppmu.mpg.de>
-
- * COPYING.gd (new): From libgd-2.1.0/COPYING, with '@' => '@@'.
- * patch-01-gd-copyright: Refer to COPYING.gd instead of
- including it into dvipng.texi.
-
- * patch-04-dvigif (removed): Merged into patch-03-programname.
- * patch-03-programname: Use kpse_program_basename().
-
-2012-08-25 Peter Breitenlohner <peb@mppmu.mpg.de>
-
- * patch-06-WIN32: Avoid warning when redefining pipe.
-
-2012-08-01 Peter Breitenlohner <peb@mppmu.mpg.de>
-
- * patch-06-WIN32: Do not redefine snprintf, handled by kpathsea.
- Also, kpathsea has included <fcntl.h>, <io.h>, and <process.h>.
-
-2011-08-03 Peter Breitenlohner <peb@mppmu.mpg.de>
-
- * patch-06-WIN32 (new): Call texlive_gs_init() for MINGW32,
- as for native WIN32, from Akira.
-
-2011-02-07 Peter Breitenlohner <peb@mppmu.mpg.de>
-
- * patch-05-sys_wait (new): #include <sys/wait.h>, not <wait.h>.
- Reported by Nikola Lecic <nikola.lecic@anthesphoria.net>.
-
-2010-12-30 Peter Breitenlohner <peb@mppmu.mpg.de>
-
- * patch-03-programname (new): Use basename() as defined in
- <libgen.h> or xbasename() from kpathsea to extract programname
- from argv[0]. Avoid uninitialized use of programname.
-
- * patch-04-dvigif (new): Check for argv[0] with .exe via
- strcasecmp(), if possible.
-
-2010-12-15 Peter Breitenlohner <peb@mppmu.mpg.de>
-
- * Imported release 1.14 from savannah.nongnu.org.
- * patch-2?-* (removed): Included in 1.14.
-
- * patch-01-gd-copyright (new): Include full gd copyright notice
- into dvipng.texi; seems the safe thing to do.
-
- * patch-02-const (new): Avoid compiler warnings.
-
-2010-10-02 Peter Breitenlohner <peb@mppmu.mpg.de>
-
- * patch-22-win32-bugfix (new): WIN32 bug fix from Akira Kakuto.
-
-2010-03-18 Peter Breitenlohner <peb@mppmu.mpg.de>
-
- * Imported release 1.13 from savannah.nongnu.org.
- * patch-[01]?-* (removed): Included in 1.13.
-
- * patch-20-rpl_malloc (new): Avoid implicit decl of malloc().
- * patch-21-win32 (new): Avoid unnecessary warning in WIN32 code.
-
-2010-03-09 Peter Breitenlohner <peb@mppmu.mpg.de>
-
- * patch-12-set_program_name: Replace kpse_set_progname() by
- kpse_set_program_name().
-
-2010-02-24 Peter Breitenlohner <peb@mppmu.mpg.de>
-
- * patch-10-mmap-for-WIN32 (new): Former MIKTEX code for mmap
- from Fabrice Popineau (?) now used for all WIN32 variants.
- * patch-11-win32-fork-and-pipe (new): WIN32 specific replacement
- for fork and pipe, using code from Akira Kakuto.
-
-2010-02-21 Peter Breitenlohner <peb@mppmu.mpg.de>
-
- * patch-07-always-undef (new): Always undefine min/max before
- redefining them (for MinGW32).
- * patch-08-HAVE_MMAP (new): #include <sys/mman.h> only
- #if defined(HAVE_MMAP) (for MinGW32).
- * patch-09-sleep (new): Use Sleep and #include <stdlib.h>
- (for WIN32/MinGW32).
-
-2010-01-29 Karl Berry <karl@tug.org>
-
- * patch-06-mathptmx (new): Do not use \usepackage{mathptmx}
- in test_dvipng.tex.
-
-2009-06-12 Peter Breitenlohner <peb@mppmu.mpg.de>
-
- * patch-05-warnings (new): Avoid more compiler warnings.
-
-2009-06-09 Peter Breitenlohner <peb@mppmu.mpg.de>
-
- * patch-04-static (new): Avoid warnings when compiling with
- 'gcc --Wmissing-prototypes'.
-
-2009-02-22 Peter Breitenlohner <peb@mppmu.mpg.de>
-
- * patch-03-have-ft2 (new): Bug fix - skip FT2 code when
- compiling without FT2 library.
-
-2009-03-25 Peter Breitenlohner <peb@mppmu.mpg.de>
-
- * patch-02-use-ifdef (new): Use #ifdef instead of #if to avoid
- preprocessor warnings.
-
-2009-03-24 Peter Breitenlohner <peb@mppmu.mpg.de>
-
- * patch-01-portability (new): Portability fix - put variable
- declarations at the beginning of the block.
-
diff --git a/Build/source/texk/dvipng/dvipng-1.14-PATCHES/TL-Changes b/Build/source/texk/dvipng/dvipng-1.14-PATCHES/TL-Changes
deleted file mode 100644
index d082d0662f5..00000000000
--- a/Build/source/texk/dvipng/dvipng-1.14-PATCHES/TL-Changes
+++ /dev/null
@@ -1,20 +0,0 @@
-Changes applied to the dvipng-1.14 tree as obtained from:
- http://savannah.nongnu.org/files/?group=dvipng
-
-Removed:
- configure
- install-sh
- mkinstalldirs
-
-Added libgd-2.1.0/COPYING as COPYING.gd, replacing '@' => '@@'.
-
-Created Autoconf macro files ../m4/gs-device.m4 and ../m4/makeinfo.m4
- adapting code in aclocal.m4.
-
-Copied these files to ../doc/:
- COPYING.gd
- dvipng.texi
- install.texi
- macros.texi
- readme.texi
-
diff --git a/Build/source/texk/dvipng/dvipng-1.14-PATCHES/patch-01-gd-copyright b/Build/source/texk/dvipng/dvipng-1.14-PATCHES/patch-01-gd-copyright
deleted file mode 100644
index 53e8509ad16..00000000000
--- a/Build/source/texk/dvipng/dvipng-1.14-PATCHES/patch-01-gd-copyright
+++ /dev/null
@@ -1,19 +0,0 @@
- Add libgd-2.1.0/COPYING as COPYING.gd, replacing '@' => '@@'.
-
-diff -ur -x COPYING.gd dvipng-1.14.orig/dvipng.texi dvipng-1.14/dvipng.texi
---- dvipng-1.14.orig/dvipng.texi 2010-12-06 21:07:18.000000000 +0100
-+++ dvipng-1.14/dvipng.texi 2013-07-09 10:01:11.000000000 +0200
-@@ -954,6 +954,13 @@
- Smith, Jason Riedy, Wolfram Krause, Reinhard Kotucha, Takeshi Abe, and
- Waldeck Schutzer.
-
-+Use of the @code{gd} library requires inclusion of the following
-+copyright notice, which applies to the @code{gd} library:
-+
-+@quotation
-+@include COPYING.gd
-+@end quotation
-+
- @ifset man
- @c man begin NOTES
- The full manual is accessible in info format, on most systems by typing
diff --git a/Build/source/texk/dvipng/dvipng-1.14-PATCHES/patch-02-const b/Build/source/texk/dvipng/dvipng-1.14-PATCHES/patch-02-const
deleted file mode 100644
index ef9dcd0200f..00000000000
--- a/Build/source/texk/dvipng/dvipng-1.14-PATCHES/patch-02-const
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ur dvipng-1.14.orig/special.c dvipng-1.14/special.c
---- dvipng-1.14.orig/special.c 2010-12-06 11:14:22.000000000 +0100
-+++ dvipng-1.14/special.c 2010-12-15 16:01:07.000000000 +0100
-@@ -44,9 +44,9 @@
- struct pscode {
- struct pscode* next;
- char* special; /* complete special */
-- char* code; /* PS string, null if a file */
-+ const char* code; /* PS string, null if a file */
- char* filename; /* file name, null if a string */
-- char* postcode; /* post PS string */
-+ const char* postcode; /* post PS string */
- struct filemmap fmmap; /* file mmap */
- };
-
diff --git a/Build/source/texk/dvipng/dvipng-1.14-PATCHES/patch-03-programname b/Build/source/texk/dvipng/dvipng-1.14-PATCHES/patch-03-programname
deleted file mode 100644
index 2a1d4467340..00000000000
--- a/Build/source/texk/dvipng/dvipng-1.14-PATCHES/patch-03-programname
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -ur -x COPYING.gd dvipng-1.14.orig/misc.c dvipng-1.14/misc.c
---- dvipng-1.14.orig/misc.c 2010-09-30 12:13:40.000000000 +0200
-+++ dvipng-1.14/misc.c 2013-07-09 11:49:56.600160931 +0200
-@@ -47,24 +47,43 @@
- int32_t number; /* Temporary storage for numeric parameter */
- char *dviname=NULL; /* Name of dvi file */
- char *outname=NULL; /* Name of output file */
-+ char *base; /* basename of argv[0] */
-
-- if (argv[0]) {
-+#ifdef HAVE_LIBKPATHSEA
-+ /* we certainly don't want to modify argv[0]. */
-+ programname = xstrdup (argv[0] ? argv[0] : PACKAGE_NAME);
-+# ifdef HAVE_KPSE_PROGRAM_BASENAME
-+ base = kpse_program_basename (programname);
-+# else
-+ base = xstrdup (xbasename (programname));
-+ {
-+ char *dot = strrchr (base, '.');
-+ if (dot && FILESTRCASEEQ (dot, ".exe"))
-+ *dot = 0;
-+ }
-+# endif
-+#else
-+ /* we certainly don't want to modify argv[0]. */
-+ programname = strdup (argv[0] ? argv[0] : PACKAGE_NAME);
-+ base = strrchr (programname, '/');
-+ if (base)
-+ base++;
-+ else
-+ base = programname;
-+#endif
- #ifdef HAVE_GDIMAGEGIF
-- programname=strrchr(argv[0],'/');
-- if (programname!=NULL)
-- programname++;
-- else
-- programname=argv[0];
-- if (strncmp(programname,"dvigif",6)==0)
-- option_flags |= GIF_OUTPUT;
-+# ifdef HAVE_LIBKPATHSEA
-+ if (FILESTRCASEEQ (base, "dvigif"))
-+# else
-+ if (strncmp(programname,"dvigif",6)==0)
-+# endif
-+ option_flags |= GIF_OUTPUT;
- #endif
-- programname=argv[0];
-- Message(BE_NONQUIET,"This is %s",programname);
-- if (strcmp(basename(programname),PACKAGE_NAME)!=0)
-- Message(BE_NONQUIET," (%s)", PACKAGE_NAME);
-- Message(BE_NONQUIET," %s Copyright 2002-2010 Jan-Ake Larsson\n",
-- PACKAGE_VERSION);
-- }
-+ Message(BE_NONQUIET,"This is %s",programname);
-+ if (strcmp(base,PACKAGE_NAME)!=0)
-+ Message(BE_NONQUIET," (%s)", PACKAGE_NAME);
-+ Message(BE_NONQUIET," %s Copyright 2002-2010 Jan-Ake Larsson\n",
-+ PACKAGE_VERSION);
-
- for (i=1; i<argc; i++) {
- if (*argv[i]=='-') {
diff --git a/Build/source/texk/dvipng/dvipng-1.14-PATCHES/patch-05-sys_wait b/Build/source/texk/dvipng/dvipng-1.14-PATCHES/patch-05-sys_wait
deleted file mode 100644
index 39de7d508e2..00000000000
--- a/Build/source/texk/dvipng/dvipng-1.14-PATCHES/patch-05-sys_wait
+++ /dev/null
@@ -1,17 +0,0 @@
- Posix requires to include <sys/wait.h>, not <wait.h>.
- FreeBSD has no <wait.h>.
-
- From Nikola Lecic <nikola.lecic@anthesphoria.net>.
-
-diff -ur dvipng-1.14.orig/special.c dvipng-1.14/special.c
---- dvipng-1.14.orig/special.c 2010-12-15 16:01:07.000000000 +0100
-+++ dvipng-1.14/special.c 2011-02-07 11:47:08.000000000 +0100
-@@ -26,7 +26,7 @@
-
- #ifndef MIKTEX
- #ifndef WIN32
--#include <wait.h>
-+#include <sys/wait.h>
- #else /* WIN32 */
- #include <fcntl.h>
- #include <io.h>
diff --git a/Build/source/texk/dvipng/dvipng-1.14-PATCHES/patch-06-WIN32 b/Build/source/texk/dvipng/dvipng-1.14-PATCHES/patch-06-WIN32
deleted file mode 100644
index 0107043ab5c..00000000000
--- a/Build/source/texk/dvipng/dvipng-1.14-PATCHES/patch-06-WIN32
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ur dvipng-1.14.orig/dvipng.c dvipng-1.14/dvipng.c
---- dvipng-1.14.orig/dvipng.c 2008-02-08 14:45:25.000000000 +0100
-+++ dvipng-1.14/dvipng.c 2011-08-03 13:34:44.000000000 +0200
-@@ -79,6 +79,10 @@
- kpse_set_program_enabled (kpse_pk_format, makeTexPK, kpse_src_compile);
- #endif
-
-+#ifdef WIN32
-+ texlive_gs_init ();
-+#endif
-+
- initcolor();
- parsestdin = DecodeArgs(argc, argv);
-
-diff -ur dvipng-1.14.orig/special.c dvipng-1.14/special.c
---- dvipng-1.14.orig/special.c 2011-02-07 11:47:08.000000000 +0100
-+++ dvipng-1.14/special.c 2012-08-25 21:36:09.000000000 +0200
-@@ -28,11 +28,8 @@
- #ifndef WIN32
- #include <sys/wait.h>
- #else /* WIN32 */
--#include <fcntl.h>
--#include <io.h>
--#include <process.h>
-+#undef pipe
- #define pipe(p) _pipe(p, 65536, O_BINARY | _O_NOINHERIT)
--#define snprintf _snprintf
- #endif /* WIN32 */
- #endif
-
diff --git a/Build/source/texk/dvipng/dvipng-1.14-PATCHES/patch-07-w64-ptr b/Build/source/texk/dvipng/dvipng-1.14-PATCHES/patch-07-w64-ptr
deleted file mode 100644
index 59c74420322..00000000000
--- a/Build/source/texk/dvipng/dvipng-1.14-PATCHES/patch-07-w64-ptr
+++ /dev/null
@@ -1,79 +0,0 @@
-diff -ur -x COPYING.gd dvipng-1.14.orig/pk.c dvipng-1.14/pk.c
---- dvipng-1.14.orig/pk.c 2010-02-11 15:09:10.000000000 +0100
-+++ dvipng-1.14/pk.c 2014-11-05 12:13:12.000000000 +0100
-@@ -345,8 +345,13 @@
- /* Read char definitions */
- position = skip_specials(position);
- while (*position != PK_POST) {
-+#ifdef _WIN64
-+ DEBUG_PRINT(DEBUG_PK,("\n @%I64d PK CHAR:\t%d",
-+ (__int64)position - (__int64)tfontp->fmmap.data, *position));
-+#else
- DEBUG_PRINT(DEBUG_PK,("\n @%ld PK CHAR:\t%d",
- (long)position - (long)tfontp->fmmap.data, *position));
-+#endif
- if ((tcharptr = malloc(sizeof(struct char_entry))) == NULL)
- Fatal("cannot malloc space for char_entry");
- tcharptr->flag_byte = *position;
-diff -ur -x COPYING.gd dvipng-1.14.orig/special.c dvipng-1.14/special.c
---- dvipng-1.14.orig/special.c 2012-08-25 21:36:09.000000000 +0200
-+++ dvipng-1.14/special.c 2014-07-14 17:29:34.000000000 +0200
-@@ -214,7 +214,7 @@
- savestdout = _dup(fileno(stdout));
- _dup2(pngpipe[WRITE_END], fileno(stdout));
- if ((hchild=
-- (HANDLE)spawnlp(_P_NOWAIT, GS_PATH, GS_PATH, device, resolution,
-+ (HANDLE)_spawnlp(_P_NOWAIT, GS_PATH, GS_PATH, device, resolution,
- "-dBATCH", "-dNOPAUSE", "-q", "-sOutputFile=-",
- "-dTextAlphaBits=4", "-dGraphicsAlphaBits=4",
- (option_flags & NO_GSSAFER) ? "-": "-dSAFER",
-diff -ur -x COPYING.gd dvipng-1.14.orig/tfm.c dvipng-1.14/tfm.c
---- dvipng-1.14.orig/tfm.c 2009-03-26 23:14:01.000000000 +0100
-+++ dvipng-1.14/tfm.c 2014-07-14 20:02:32.000000000 +0200
-@@ -54,8 +54,13 @@
- c=bc;
- position=(unsigned char*)fmmap.data+24+lh*4;
- while(c <= ec) {
-+#ifdef _WIN64
-+ DEBUG_PRINT(DEBUG_TFM,("\n@%I64d TFM METRICS:\t",
-+ (__int64)position - (__int64)fmmap.data));
-+#else
- DEBUG_PRINT(DEBUG_TFM,("\n@%ld TFM METRICS:\t",
- (long)position - (long)fmmap.data));
-+#endif
- tcharptr=xmalloc(sizeof(struct char_entry));
- tcharptr->data=NULL;
- tcharptr->tfmw=width[*position];
-diff -ur -x COPYING.gd dvipng-1.14.orig/vf.c dvipng-1.14/vf.c
---- dvipng-1.14.orig/vf.c 2010-03-17 14:02:35.000000000 +0100
-+++ dvipng-1.14/vf.c 2014-07-14 20:02:33.000000000 +0200
-@@ -79,9 +79,15 @@
- /* Read font definitions */
- position += 8;
- while(*position >= FNT_DEF1 && *position <= FNT_DEF4) {
-+#ifdef _WIN64
-+ DEBUG_PRINT(DEBUG_VF,("\n @%I64d VF:\t%s",
-+ (__int64)position - (__int64)tfontp->fmmap.data,
-+ dvi_commands[*position]));
-+#else
- DEBUG_PRINT(DEBUG_VF,("\n @%ld VF:\t%s",
- (long)position - (long)tfontp->fmmap.data,
- dvi_commands[*position]));
-+#endif
- FontDef(position,tfontp);
- length = dvi_commandlength[*position];
- position += length + *(position + length-1) + *(position+length-2);
-@@ -95,8 +101,13 @@
-
- /* Read char definitions */
- while(*position < FNT_DEF1) {
-+#ifdef _WIN64
-+ DEBUG_PRINT(DEBUG_VF,("\n@%I64d VF CHAR:\t",
-+ (__int64)position - (__int64)tfontp->fmmap.data));
-+#else
- DEBUG_PRINT(DEBUG_VF,("\n@%ld VF CHAR:\t",
- (long)position - (long)tfontp->fmmap.data));
-+#endif
- tcharptr=xmalloc(sizeof(struct char_entry));
- switch (*position) {
- case LONG_CHAR: