summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvipng/TLpatches
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-04-07 12:59:36 +0000
committerKarl Berry <karl@freefriends.org>2019-04-07 12:59:36 +0000
commit5c49b577febc466737509e6e7bf3b6a5b57a6433 (patch)
treec83860b4a452bea427445c89acdd0966ecd0f501 /Build/source/texk/dvipng/TLpatches
parentb9cf75b585852edfa3a8487d8eb4f73e505d9e49 (diff)
dvipng-1.16 with parsing fixes
git-svn-id: svn://tug.org/texlive/trunk@50838 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipng/TLpatches')
-rw-r--r--Build/source/texk/dvipng/TLpatches/ChangeLog7
-rw-r--r--Build/source/texk/dvipng/TLpatches/TL-Changes2
-rw-r--r--Build/source/texk/dvipng/TLpatches/patch-02-const15
-rw-r--r--Build/source/texk/dvipng/TLpatches/patch-03-programname62
-rw-r--r--Build/source/texk/dvipng/TLpatches/patch-06-WIN3230
-rw-r--r--Build/source/texk/dvipng/TLpatches/patch-07-w64-ptr57
6 files changed, 8 insertions, 165 deletions
diff --git a/Build/source/texk/dvipng/TLpatches/ChangeLog b/Build/source/texk/dvipng/TLpatches/ChangeLog
index 64d6ffe16c1..79c1f2a641c 100644
--- a/Build/source/texk/dvipng/TLpatches/ChangeLog
+++ b/Build/source/texk/dvipng/TLpatches/ChangeLog
@@ -1,3 +1,10 @@
+2019-04-07 Karl Berry <karl@freefriends.org>
+
+ * patch-02-const,
+ * patch-03-programname,
+ * patch-06-WIN32,
+ * patch-07-w64-ptr: remove; all patches were installed in 1.16.
+
2015-03-04 Peter Breitenlohner <peb@mppmu.mpg.de>
* patch-07-w64-ptr: Better handling of WIN64 ptr->long.
diff --git a/Build/source/texk/dvipng/TLpatches/TL-Changes b/Build/source/texk/dvipng/TLpatches/TL-Changes
index 15cd6bb63db..ea1584bb765 100644
--- a/Build/source/texk/dvipng/TLpatches/TL-Changes
+++ b/Build/source/texk/dvipng/TLpatches/TL-Changes
@@ -1,4 +1,4 @@
-Changes applied to the dvipng-1.15 tree as obtained from:
+Changes applied to the dvipng-1.16 tree as obtained from:
http://savannah.nongnu.org/files/?group=dvipng
Removed:
diff --git a/Build/source/texk/dvipng/TLpatches/patch-02-const b/Build/source/texk/dvipng/TLpatches/patch-02-const
deleted file mode 100644
index f10faef62e4..00000000000
--- a/Build/source/texk/dvipng/TLpatches/patch-02-const
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ur dvipng-1.15.orig/special.c dvipng-1.15/special.c
---- dvipng-1.15.orig/special.c 2015-03-02 20:33:55.000000000 +0100
-+++ dvipng-1.15/special.c 2015-03-03 12:51:18.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/TLpatches/patch-03-programname b/Build/source/texk/dvipng/TLpatches/patch-03-programname
deleted file mode 100644
index e106c3a0789..00000000000
--- a/Build/source/texk/dvipng/TLpatches/patch-03-programname
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -ur dvipng-1.15.orig/misc.c dvipng-1.15/misc.c
---- dvipng-1.15.orig/misc.c 2015-03-02 20:33:56.000000000 +0100
-+++ dvipng-1.15/misc.c 2015-03-03 13:35:10.000000000 +0100
-@@ -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-2015 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-2015 Jan-Ake Larsson\n",
-+ PACKAGE_VERSION);
-
- for (i=1; i<argc; i++) {
- if (*argv[i]=='-') {
diff --git a/Build/source/texk/dvipng/TLpatches/patch-06-WIN32 b/Build/source/texk/dvipng/TLpatches/patch-06-WIN32
deleted file mode 100644
index 252b15abee5..00000000000
--- a/Build/source/texk/dvipng/TLpatches/patch-06-WIN32
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ur dvipng-1.15.orig/dvipng.c dvipng-1.15/dvipng.c
---- dvipng-1.15.orig/dvipng.c 2015-03-02 20:33:56.000000000 +0100
-+++ dvipng-1.15/dvipng.c 2015-03-03 13:04:09.000000000 +0100
-@@ -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 -x COPYING.gd dvipng-1.15.orig/special.c dvipng-1.15/special.c
---- dvipng-1.15.orig/special.c 2015-03-03 12:51:18.000000000 +0100
-+++ dvipng-1.15/special.c 2015-03-03 13:04:09.000000000 +0100
-@@ -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/TLpatches/patch-07-w64-ptr b/Build/source/texk/dvipng/TLpatches/patch-07-w64-ptr
deleted file mode 100644
index 4c4ff5b6064..00000000000
--- a/Build/source/texk/dvipng/TLpatches/patch-07-w64-ptr
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -ur dvipng-1.15.orig/pk.c dvipng-1.15/pk.c
---- dvipng-1.15.orig/pk.c 2015-03-02 20:33:56.000000000 +0100
-+++ dvipng-1.15/pk.c 2015-03-04 08:26:11.000000000 +0100
-@@ -347,7 +347,7 @@
- position = skip_specials(position);
- while (*position != PK_POST) {
- DEBUG_PRINT(DEBUG_PK,("\n @%ld PK CHAR:\t%d",
-- (long)position - (long)tfontp->fmmap.data, *position));
-+ (long)((char *)position - tfontp->fmmap.data), *position));
- if ((tcharptr = malloc(sizeof(struct char_entry))) == NULL)
- Fatal("cannot allocate space for char_entry");
- tcharptr->flag_byte = *position;
-diff -ur dvipng-1.15.orig/special.c dvipng-1.15/special.c
---- dvipng-1.15.orig/special.c 2015-03-03 13:04:09.000000000 +0100
-+++ dvipng-1.15/special.c 2015-03-03 13:11:16.000000000 +0100
-@@ -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 dvipng-1.15.orig/tfm.c dvipng-1.15/tfm.c
---- dvipng-1.15.orig/tfm.c 2015-03-02 20:33:56.000000000 +0100
-+++ dvipng-1.15/tfm.c 2015-03-04 08:27:58.000000000 +0100
-@@ -56,7 +56,7 @@
- position=(unsigned char*)fmmap.data+24+lh*4;
- while(c <= ec) {
- DEBUG_PRINT(DEBUG_TFM,("\n@%ld TFM METRICS:\t",
-- (long)position - (long)fmmap.data));
-+ (long)((char *)position - fmmap.data)));
- if ((tcharptr=malloc(sizeof(struct char_entry)))==NULL)
- Fatal("cannot allocate memory for TFM char entry");
- tcharptr->data=NULL;
-diff -ur dvipng-1.15.orig/vf.c dvipng-1.15/vf.c
---- dvipng-1.15.orig/vf.c 2015-03-02 20:33:56.000000000 +0100
-+++ dvipng-1.15/vf.c 2015-03-04 08:29:50.000000000 +0100
-@@ -80,7 +80,7 @@
- position += 8;
- while(*position >= FNT_DEF1 && *position <= FNT_DEF4) {
- DEBUG_PRINT(DEBUG_VF,("\n @%ld VF:\t%s",
-- (long)position - (long)tfontp->fmmap.data,
-+ (long)((char *)position - tfontp->fmmap.data),
- dvi_commands[*position]));
- FontDef(position,tfontp);
- length = dvi_commandlength[*position];
-@@ -95,7 +95,7 @@
- /* Read char definitions */
- while(*position < FNT_DEF1) {
- DEBUG_PRINT(DEBUG_VF,("\n@%ld VF CHAR:\t",
-- (long)position - (long)tfontp->fmmap.data));
-+ (long)((char *)position - tfontp->fmmap.data)));
- if ((tcharptr=malloc(sizeof(struct char_entry)))==NULL)
- Fatal("cannot allocate memory for VF char entry");
- switch (*position) {