diff options
Diffstat (limited to 'Build/source/texk/dvipng/dvipng-1.12-PATCHES')
5 files changed, 80 insertions, 0 deletions
diff --git a/Build/source/texk/dvipng/dvipng-1.12-PATCHES/ChangeLog b/Build/source/texk/dvipng/dvipng-1.12-PATCHES/ChangeLog index 7dd3700d32c..486dad3f1ae 100644 --- a/Build/source/texk/dvipng/dvipng-1.12-PATCHES/ChangeLog +++ b/Build/source/texk/dvipng/dvipng-1.12-PATCHES/ChangeLog @@ -1,3 +1,17 @@ +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. diff --git a/Build/source/texk/dvipng/dvipng-1.12-PATCHES/patch-06-mathptmx b/Build/source/texk/dvipng/dvipng-1.12-PATCHES/patch-06-mathptmx new file mode 100644 index 00000000000..a4256949735 --- /dev/null +++ b/Build/source/texk/dvipng/dvipng-1.12-PATCHES/patch-06-mathptmx @@ -0,0 +1,15 @@ +diff -ur dvipng-1.12.orig/test_dvipng.tex dvipng-1.12/test_dvipng.tex +--- dvipng-1.12.orig/test_dvipng.tex 2008-02-08 14:45:23.000000000 +0100 ++++ dvipng-1.12/test_dvipng.tex 2010-01-29 01:21:38.000000000 +0100 +@@ -16,10 +16,9 @@ + % License along with this program. If not, see + % <http://www.gnu.org/licenses/>. + % +-% Copyright (C) 2002-2008 Jan-{\AA}ke Larsson ++% Copyright (C) 2002-2010 Jan-{\AA}ke Larsson + + \documentclass{article} +-\usepackage{mathptmx} + %\usepackage[active,textmath]{preview} + \usepackage{color} + \pagestyle{empty} diff --git a/Build/source/texk/dvipng/dvipng-1.12-PATCHES/patch-07-always-undef b/Build/source/texk/dvipng/dvipng-1.12-PATCHES/patch-07-always-undef new file mode 100644 index 00000000000..36721a7bc5c --- /dev/null +++ b/Build/source/texk/dvipng/dvipng-1.12-PATCHES/patch-07-always-undef @@ -0,0 +1,16 @@ + Always undefine min/max before redefining them (for MinGW32). + +diff -ur dvipng-1.12.orig/dvipng.h dvipng-1.12/dvipng.h +--- dvipng-1.12.orig/dvipng.h 2009-10-01 11:14:10.000000000 +0200 ++++ dvipng-1.12/dvipng.h 2010-02-20 18:20:53.496938715 +0100 +@@ -518,10 +518,8 @@ + #ifdef HAVE_GDIMAGEPNGEX + EXTERN int compression INIT(1); + #endif +-#ifdef MIKTEX + #undef min + #undef max +-#endif /* MIKTEX */ + # define max(x,y) if ((y)>(x)) x = y + # define min(x,y) if ((y)<(x)) x = y + diff --git a/Build/source/texk/dvipng/dvipng-1.12-PATCHES/patch-08-HAVE_MMAP b/Build/source/texk/dvipng/dvipng-1.12-PATCHES/patch-08-HAVE_MMAP new file mode 100644 index 00000000000..09e9b74c479 --- /dev/null +++ b/Build/source/texk/dvipng/dvipng-1.12-PATCHES/patch-08-HAVE_MMAP @@ -0,0 +1,14 @@ + #include <sys/mman.h> only #if defined(HAVE_MMAP) (for MinGW32). + +diff -ur dvipng-1.12.orig/misc.c dvipng-1.12/misc.c +--- dvipng-1.12.orig/misc.c 2009-10-01 00:39:28.000000000 +0200 ++++ dvipng-1.12/misc.c 2010-02-20 18:38:56.057886522 +0100 +@@ -29,7 +29,7 @@ + #define basename xbasename + #endif + #include <fcntl.h> /* open/close */ +-#ifndef MIKTEX ++#ifdef HAVE_MMAP + #include <sys/mman.h> + #endif + #include <sys/stat.h> diff --git a/Build/source/texk/dvipng/dvipng-1.12-PATCHES/patch-09-sleep b/Build/source/texk/dvipng/dvipng-1.12-PATCHES/patch-09-sleep new file mode 100644 index 00000000000..bcf0585200c --- /dev/null +++ b/Build/source/texk/dvipng/dvipng-1.12-PATCHES/patch-09-sleep @@ -0,0 +1,21 @@ +diff -ur dvipng-1.12.orig/dvi.c dvipng-1.12/dvi.c +--- dvipng-1.12.orig/dvi.c 2009-10-01 00:45:04.000000000 +0200 ++++ dvipng-1.12/dvi.c 2010-02-21 18:13:07.221302550 +0100 +@@ -30,9 +30,14 @@ + # ifdef HAVE_LIBGEN_H + # include <libgen.h> + # else +-# define basename xbasename +-#endif +-# define SLEEP sleep(1) ++# define basename xbasename ++# endif ++# ifdef WIN32 ++# define SLEEP Sleep(1000) ++# include <stdlib.h> ++# else ++# define SLEEP sleep(1) ++# endif /* WIN32 */ + #endif /* MIKTEX */ + #include <sys/stat.h> + |