MinGW64/WIN64 build fixes

git-svn-id: svn://tug.org/texlive/trunk@35517 c570f23f-e606-0410-a88d-b1316a301751

10 files changed, 63 insertions, 9 deletions

diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/ChangeLog b/Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/ChangeLog
index 8e45faff786..1d1f37acc82 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/ChangeLog
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-05  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* patch-04-mingw64 (new): Required for MinGW64, but why?
+
 2014-06-19  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* patch-03-unsigned (new): Avoid undefined behaviour.
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/patch-04-mingw64 b/Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/patch-04-mingw64
new file mode 100644
index 00000000000..9232116055d
--- /dev/null
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3-PATCHES/patch-04-mingw64
@@ -0,0 +1,21 @@
+diff -ur cjkutils-4.8.3.orig/hbf2gf/hbf2gf.w cjkutils-4.8.3/hbf2gf/hbf2gf.w
+--- cjkutils-4.8.3.orig/hbf2gf/hbf2gf.w	2014-06-19 12:44:16.000000000 +0200
++++ cjkutils-4.8.3/hbf2gf/hbf2gf.w	2014-11-05 12:56:50.000000000 +0100
+@@ -486,7 +486,7 @@
+ @d GF_ID 131
+ @d PRE   247@#
+ 
+-@d header " hbf2gf output "
++@d headertstring " hbf2gf output "
+ 
+ @<Prototypes@>=
+ static void write_pre(void);
+@@ -502,7 +502,7 @@
+     struct tm *time_now;
+ 
+ 
+-    strcpy(out_s, header);@#
++    strcpy(out_s, headertstring);@#
+ 
+     secs_now = time(NULL); /* system date and time */
+     time_now = localtime(&secs_now);
diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/hbf2gf.w b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/hbf2gf.w
index 20663537a94..21fd1df2e53 100644
--- a/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/hbf2gf.w
+++ b/Build/source/texk/cjkutils/cjkutils-4.8.3/hbf2gf/hbf2gf.w
@@ -486,7 +486,7 @@ no terminating NULL byte.
 @d GF_ID 131
 @d PRE   247@#
 
-@d header " hbf2gf output "
+@d headertstring " hbf2gf output "
 
 @<Prototypes@>=
 static void write_pre(void);
@@ -502,7 +502,7 @@ static void write_pre(void)
     struct tm *time_now;
 
 
-    strcpy(out_s, header);@#
+    strcpy(out_s, headertstring);@#
 
     secs_now = time(NULL); /* system date and time */
     time_now = localtime(&secs_now);
diff --git a/Build/source/texk/cjkutils/hbf2gf.c b/Build/source/texk/cjkutils/hbf2gf.c
index 598b86cd765..14d296f6767 100644
--- a/Build/source/texk/cjkutils/hbf2gf.c
+++ b/Build/source/texk/cjkutils/hbf2gf.c
@@ -41,7 +41,7 @@
 #define GF_ID 131
 #define PRE 247 \
 
-#define header " hbf2gf output " \
+#define headerstring " hbf2gf output " \
 
 #define BOC 67
 #define BOC1 68
@@ -798,7 +798,7 @@ time_t secs_now;
 struct tm*time_now;
 
 
-strcpy(out_s,header);
+strcpy(out_s,headerstring);
 
 secs_now= time(NULL);
 time_now= localtime(&secs_now);
diff --git a/Build/source/texk/dvipng/dvipng-1.14-PATCHES/ChangeLog b/Build/source/texk/dvipng/dvipng-1.14-PATCHES/ChangeLog
index 1e057bcdd1c..77dd844fe5c 100644
--- a/Build/source/texk/dvipng/dvipng-1.14-PATCHES/ChangeLog
+++ b/Build/source/texk/dvipng/dvipng-1.14-PATCHES/ChangeLog
@@ -1,3 +1,7 @@
+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.
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
index 585e1d91288..59c74420322 100644
--- 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
@@ -1,13 +1,13 @@
 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-07-14 19:59:20.000000000 +0200
++++ 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));
++			  (__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));
diff --git a/Build/source/texk/dvipng/dvipng-1.14/pk.c b/Build/source/texk/dvipng/dvipng-1.14/pk.c
index 303db8f5132..0806bc778e0 100644
--- a/Build/source/texk/dvipng/dvipng-1.14/pk.c
+++ b/Build/source/texk/dvipng/dvipng-1.14/pk.c
@@ -347,7 +347,7 @@ void InitPK(struct font_entry * tfontp)
   while (*position != PK_POST) {
 #ifdef _WIN64
     DEBUG_PRINT(DEBUG_PK,("\n  @%I64d PK CHAR:\t%d",
-			  (__int64)position - (_int64)tfontp->fmmap.data, *position));
+			  (__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));
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.104-PATCHES/ChangeLog b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.104-PATCHES/ChangeLog
index 9ccfa86dfeb..00cdb181c7b 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.104-PATCHES/ChangeLog
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.104-PATCHES/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-05  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* patch-01-win64 (new): Required for MinGW64.
+
 2014-07-08  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Import lcdf-typetools-2.104.
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.104-PATCHES/patch-01-win64 b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.104-PATCHES/patch-01-win64
new file mode 100644
index 00000000000..7f94fdc77bc
--- /dev/null
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.104-PATCHES/patch-01-win64
@@ -0,0 +1,21 @@
+diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.104.orig/liblcdf/error.cc lcdf-typetools-2.104/liblcdf/error.cc
+--- lcdf-typetools-2.104.orig/liblcdf/error.cc	2013-09-17 15:40:15.000000000 +0200
++++ lcdf-typetools-2.104/liblcdf/error.cc	2014-11-05 12:19:23.000000000 +0100
+@@ -320,7 +320,7 @@
+ #define ErrH		ErrorHandler
+ 
+ static char *
+-do_number(unsigned long num, char *after_last, int base, int flags)
++do_number(uintptr_t num, char *after_last, int base, int flags)
+ {
+     const char *digits =
+ 	((flags & ErrH::cf_uppercase) ? "0123456789ABCDEF" : "0123456789abcdef");
+@@ -668,7 +668,7 @@
+ 	    }
+ 	    void *v = va_arg(val, void *);
+ 	    s2 = numbuf + NUMBUF_SIZE;
+-	    s1 = do_number((unsigned long)v, (char *)s2, 16, flags);
++	    s1 = do_number((uintptr_t)v, (char *)s2, 16, flags);
+ 	    s1 = do_number_flags((char *)s1, (char *)s2, 16, flags | cf_alternate_form,
+ 				 precision, field_width);
+ 	    break;
diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.104/liblcdf/error.cc b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.104/liblcdf/error.cc
index cfef2f07de9..8fe054b21ab 100644
--- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.104/liblcdf/error.cc
+++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.104/liblcdf/error.cc
@@ -320,7 +320,7 @@ ErrorHandler::clean_landmark(const String &landmark, bool with_colon)
 #define ErrH		ErrorHandler
 
 static char *
-do_number(unsigned long num, char *after_last, int base, int flags)
+do_number(uintptr_t num, char *after_last, int base, int flags)
 {
     const char *digits =
 	((flags & ErrH::cf_uppercase) ? "0123456789ABCDEF" : "0123456789abcdef");
@@ -668,7 +668,7 @@ ErrorHandler::vxformat(int default_flags, const char *s, va_list val)
 	    }
 	    void *v = va_arg(val, void *);
 	    s2 = numbuf + NUMBUF_SIZE;
-	    s1 = do_number((unsigned long)v, (char *)s2, 16, flags);
+	    s1 = do_number((uintptr_t)v, (char *)s2, 16, flags);
 	    s1 = do_number_flags((char *)s1, (char *)s2, 16, flags | cf_alternate_form,
 				 precision, field_width);
 	    break;