diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-02-01 08:54:01 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-02-01 08:54:01 +0000 |
commit | f305f996df6d2e2d7d63748aee9a3cfbd89f9b30 (patch) | |
tree | c7485bc4d0fa8cdc424147e387731c759d8de507 /Build/source | |
parent | c26c1f4883a0efc030ad4a020814a5d84f5ce402 (diff) |
dvi2tty: Record recent change as patch applied to upstream
git-svn-id: svn://tug.org/texlive/trunk@32840 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r-- | Build/source/texk/dvi2tty/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/texk/dvi2tty/dvi2tty-5.3.4-PATCHES/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/texk/dvi2tty/dvi2tty-5.3.4-PATCHES/patch-09-win32 | 91 |
3 files changed, 95 insertions, 5 deletions
diff --git a/Build/source/texk/dvi2tty/ChangeLog b/Build/source/texk/dvi2tty/ChangeLog index d2a8f00c9d5..f198d58abf4 100644 --- a/Build/source/texk/dvi2tty/ChangeLog +++ b/Build/source/texk/dvi2tty/ChangeLog @@ -1,8 +1,3 @@ -2014-02-01 TANAKA Takuji <KXD02663@nifty.ne.jp> - - * dvi2tty.c, dvi2tty.h, disdvi.c: - Allow Unicode filename. (Windows only) - 2013-01-29 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am: Allow subdir-objects. diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.4-PATCHES/ChangeLog b/Build/source/texk/dvi2tty/dvi2tty-5.3.4-PATCHES/ChangeLog index 00507bff7ec..99beb8c2957 100644 --- a/Build/source/texk/dvi2tty/dvi2tty-5.3.4-PATCHES/ChangeLog +++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4-PATCHES/ChangeLog @@ -1,3 +1,7 @@ +2014-02-01 TANAKA Takuji <KXD02663@nifty.ne.jp> + + * patch-09-win32 (new): Allow Unicode filename (Windows only). + 2013-06-28 Peter Breitenlohner <peb@mppmu.mpg.de> * patch-08-config_h (new): First include <kpathsea/config.h>. diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.4-PATCHES/patch-09-win32 b/Build/source/texk/dvi2tty/dvi2tty-5.3.4-PATCHES/patch-09-win32 new file mode 100644 index 00000000000..cd1c4c30738 --- /dev/null +++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4-PATCHES/patch-09-win32 @@ -0,0 +1,91 @@ +diff -ur dvi2tty-5.3.4.orig/disdvi.c dvi2tty-5.3.4/disdvi.c +--- dvi2tty-5.3.4.orig/disdvi.c 2013-06-28 15:02:13.000000000 +0200 ++++ dvi2tty-5.3.4/disdvi.c 2014-02-01 06:40:06.000000000 +0100 +@@ -49,6 +49,9 @@ + # define NO_DEBUG 1 + # include <kpathsea/config.h> + # include <kpathsea/lib.h> ++#if defined(WIN32) ++# include <kpathsea/variable.h> ++#endif + #endif + + #include <stdio.h> +@@ -66,6 +69,10 @@ + #if defined(THINK_C) + # include "macintosh.h" + #endif ++#if defined(WIN32) && defined(KPATHSEA) ++#undef fopen ++#define fopen fsyscp_fopen ++#endif + + + /* +@@ -153,6 +160,17 @@ + register int i; + unsigned long fontnum; + ++#if defined(WIN32) && defined(KPATHSEA) ++ char **av, *enc; ++ int ac; ++ kpse_set_program_name(argv[0], "disdvi"); ++ enc = kpse_var_value("command_line_encoding"); ++ if (get_command_line_args_utf8(enc, &ac, &av)) { ++ argv = av; ++ argc = ac; ++ } ++#endif ++ + #if defined(THINK_C) + argc = process_disdvi_command_line(&argv); + #endif +diff -ur dvi2tty-5.3.4.orig/dvi2tty.c dvi2tty-5.3.4/dvi2tty.c +--- dvi2tty-5.3.4.orig/dvi2tty.c 2012-09-06 21:51:41.000000000 +0200 ++++ dvi2tty-5.3.4/dvi2tty.c 2014-02-01 06:40:06.000000000 +0100 +@@ -31,6 +31,10 @@ + # include "macintosh.h" + #endif + ++#if defined(WIN32) && defined(KPATHSEA) ++#undef fopen ++#define fopen fsyscp_fopen ++#endif + + + /* +@@ -155,6 +159,9 @@ + int main(int argc, char **argv) + #endif + { ++#if defined(WIN32) && defined(KPATHSEA) ++ char *enc; ++#endif + + #if defined(THINK_C) + argc = process_dvi_command_line(&argv); +@@ -163,6 +170,11 @@ + progname = *argv; + Argc = argc; + Argv = argv; ++#if defined(WIN32) && defined(KPATHSEA) ++ kpse_set_program_name(argv[0], "dvi2tty"); ++ enc = kpse_var_value("command_line_encoding"); ++ get_command_line_args_utf8(enc, &Argc, &Argv); ++#endif + + #ifdef WIN32 + set_enc_string ("sjis", "default"); +diff -ur dvi2tty-5.3.4.orig/dvi2tty.h dvi2tty-5.3.4/dvi2tty.h +--- dvi2tty-5.3.4.orig/dvi2tty.h 2013-06-28 15:02:13.000000000 +0200 ++++ dvi2tty-5.3.4/dvi2tty.h 2014-02-01 06:40:06.000000000 +0100 +@@ -29,6 +29,9 @@ + # define NO_DEBUG 1 + # include <kpathsea/config.h> + # include <kpathsea/readable.h> ++#if defined(WIN32) ++# include <kpathsea/variable.h> ++#endif + # include <sys/types.h> + # include <sys/stat.h> + #else |