diff options
Diffstat (limited to 'Build/source/texk/dvipdfmx/dvipdfmx-20110309-PATCHES')
5 files changed, 8 insertions, 120 deletions
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110309-PATCHES/ChangeLog b/Build/source/texk/dvipdfmx/dvipdfmx-20110309-PATCHES/ChangeLog index 14248ea1044..6b7722c5768 100644 --- a/Build/source/texk/dvipdfmx/dvipdfmx-20110309-PATCHES/ChangeLog +++ b/Build/source/texk/dvipdfmx/dvipdfmx-20110309-PATCHES/ChangeLog @@ -1,3 +1,9 @@ +2011-03-09 Peter Breitenlohner <peb@mppmu.mpg.de> + + Imported snapshot 20110309. + * patch-01-dpxfile, patch-02-manpage, patch-03-sys_wait_h + (removed): Now all in the distributed snapshot. + 2011-03-08 Peter Breitenlohner <peb@mppmu.mpg.de> * patch-03-sys_wait_h (new): Check for sys/wait.h, in order to diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110309-PATCHES/TL-Changes b/Build/source/texk/dvipdfmx/dvipdfmx-20110309-PATCHES/TL-Changes index 83ded5d25c8..76dca020da9 100644 --- a/Build/source/texk/dvipdfmx/dvipdfmx-20110309-PATCHES/TL-Changes +++ b/Build/source/texk/dvipdfmx/dvipdfmx-20110309-PATCHES/TL-Changes @@ -1,5 +1,5 @@ -Changes applied to the dvipdfmx-20110305 tree as obtained from: - http://project.ktug.or.kr/dvipdfmx/snapshot/latest/dvipdfmx-20110305.tar.gz +Changes applied to the dvipdfmx-20110309 tree as obtained from: + http://project.ktug.or.kr/dvipdfmx/snapshot/latest/dvipdfmx-20110309.tar.gz Removed: NEWS diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110309-PATCHES/patch-01-dpxfile b/Build/source/texk/dvipdfmx/dvipdfmx-20110309-PATCHES/patch-01-dpxfile deleted file mode 100644 index e72bd2025b9..00000000000 --- a/Build/source/texk/dvipdfmx/dvipdfmx-20110309-PATCHES/patch-01-dpxfile +++ /dev/null @@ -1,77 +0,0 @@ -diff -ur dvipdfmx-20110305.orig/src/dpxfile.c dvipdfmx-20110305/src/dpxfile.c ---- dvipdfmx-20110305.orig/src/dpxfile.c 2011-03-06 04:06:59.000000000 +0100 -+++ dvipdfmx-20110305/src/dpxfile.c 2011-03-07 18:31:04.000000000 +0100 -@@ -36,7 +36,6 @@ - #include "dpxfile.h" - - #include <kpathsea/lib.h> --#include <kpathsea/concatn.h> - #include <string.h> - #ifdef WIN32 - #include <io.h> -@@ -210,9 +209,9 @@ - *pp = '\0'; - if ((pp = strchr (buf, ' ')) || (pp = strchr (buf, '\t'))) { - #ifdef WIN32 -- *qv = concatn ("\"", buf, "\"", NULL); -+ *qv = concat3 ("\"", buf, "\""); - #else -- *qv = concatn ("'", buf, "'", NULL); -+ *qv = concat3 ("'", buf, "'"); - #endif - } else { - *qv = concat (buf, ""); -@@ -223,7 +222,7 @@ - } - *qv = NULL; - #ifdef WIN32 -- ret = spawnvp (_P_WAIT, *cmdv, cmdv); -+ ret = spawnvp (_P_WAIT, *cmdv, (const char* const*) cmdv); - #else - i = fork (); - if (i < 0) -@@ -765,14 +764,14 @@ - # define __TMPDIR "/tmp" - # define TEMPLATE "/dvipdfmx.XXXXXX" - { -- char *_tmpd; -+ const char *_tmpd; - int _fd = -1; - # ifdef HAVE_GETENV - _tmpd = getenv("TMPDIR"); - if (!_tmpd) -- _tmpd = (char *) __TMPDIR; -+ _tmpd = __TMPDIR; - # else -- _tmpd = (char *) __TMPDIR; -+ _tmpd = __TMPDIR; - # endif /* HAVE_GETENV */ - tmp = NEW(strlen(_tmpd) + strlen(TEMPLATE) + 1, char); - strcpy(tmp, _tmpd); -@@ -825,7 +824,7 @@ - unsigned char version) - { - char *cmd = NULL; -- char *p, *q; -+ const char *p, *q; - size_t n, size; - int error = 0; - -@@ -837,7 +836,7 @@ - size = strlen(cmdtmpl) + strlen(input) + strlen(output) + 3; - cmd = NEW(size, char); - memset(cmd, 0, size); -- for (n = 0, p = (char *) cmdtmpl; *p != 0; p++) { -+ for (n = 0, p = cmdtmpl; *p != 0; p++) { - #define need(s,l,m,n) \ - if ((l) + (n) >= (m)) { \ - (m) += (n) + 128; \ -@@ -865,7 +864,7 @@ - } - case 'v': /* Version number, e.g. 1.4 */ { - char buf[16]; -- sprintf(buf, "1.%hu", version); -+ sprintf(buf, "1.%hu", (unsigned short) version); - need(cmd, n, size, strlen(buf)); - strcpy(cmd + n, buf); n += strlen(buf); - break; diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110309-PATCHES/patch-02-manpage b/Build/source/texk/dvipdfmx/dvipdfmx-20110309-PATCHES/patch-02-manpage deleted file mode 100644 index 03359f2cb9e..00000000000 --- a/Build/source/texk/dvipdfmx/dvipdfmx-20110309-PATCHES/patch-02-manpage +++ /dev/null @@ -1,29 +0,0 @@ -diff -ur dvipdfmx-20110305.orig/man/extractbb.1 dvipdfmx-20110305/man/extractbb.1 ---- dvipdfmx-20110305.orig/man/extractbb.1 2009-11-19 02:31:31.000000000 +0100 -+++ dvipdfmx-20110305/man/extractbb.1 2011-02-11 12:30:03.000000000 +0100 -@@ -1,12 +1,15 @@ - .TH "EXTRACTBB" "1" "30 August 2009" "20090708" "DVIPDFMx" - .PP - .SH "NAME" --extractbb \- extract bounding box information from graphics files -+extractbb, ebb \- extract bounding box information from graphics files - .PP - .SH "SYNOPSIS" - .PP --.BR extractbb " [ " -v " | " -q " ] [ " -O " ] [ " -m " | " -x " ] " --.I file ... -+.B extractbb -+.RB [ \-v | \-q ] -+.RB [ \-O ] -+.RB [ \-m | \-x ] -+.IR file \&.\&.\&. - .PP - .SH "DESCRIPTION" - .PP -@@ -79,4 +82,5 @@ - This manual page was also written by the DVIPDFMx project team, - based on a manual page Frank K\[:u]ster <frank@kuesterei\&.ch> - wrote for the Debian GNU/Linux system\&. --It may be used and modified by others without contacting the authors\&. -+It may be used, modified, and/or redistributed by others without -+contacting the authors\&. diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110309-PATCHES/patch-03-sys_wait_h b/Build/source/texk/dvipdfmx/dvipdfmx-20110309-PATCHES/patch-03-sys_wait_h deleted file mode 100644 index 8c797c111f8..00000000000 --- a/Build/source/texk/dvipdfmx/dvipdfmx-20110309-PATCHES/patch-03-sys_wait_h +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur dvipdfmx-20110305.orig/configure.in dvipdfmx-20110305/configure.in ---- dvipdfmx-20110305.orig/configure.in 2011-03-05 06:30:10.000000000 +0100 -+++ dvipdfmx-20110305/configure.in 2011-03-07 20:34:53.000000000 +0100 -@@ -79,7 +79,7 @@ - dnl Checks for header files. - AC_HEADER_STDC - AC_CHECK_HEADERS(unistd.h) --AC_CHECK_HEADERS(stdint.h inttypes.h sys/types.h) -+AC_CHECK_HEADERS(stdint.h inttypes.h sys/types.h sys/wait.h) - - dnl Checks for library functions. - AC_FUNC_MEMCMP |