Fix various WIN32 and MinGW build problems and compiler warnings

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

10 files changed, 30 insertions, 55 deletions

diff --git a/Build/source/libs/graphite2/graphite2-1.2.0-PATCHES/ChangeLog b/Build/source/libs/graphite2/graphite2-1.2.0-PATCHES/ChangeLog
index 2bcabd35aba..83602914a2a 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0-PATCHES/ChangeLog
+++ b/Build/source/libs/graphite2/graphite2-1.2.0-PATCHES/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* patch-03-old-gcc (removed): No longer needed since HarfBuzz
+	requires gcc-4.x.
+
 2012-12-04  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Imported graphite-1.2.0 source tree from:
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0-PATCHES/patch-03-old-gcc b/Build/source/libs/graphite2/graphite2-1.2.0-PATCHES/patch-03-old-gcc
deleted file mode 100644
index a07fc0bc746..00000000000
--- a/Build/source/libs/graphite2/graphite2-1.2.0-PATCHES/patch-03-old-gcc
+++ /dev/null
@@ -1,44 +0,0 @@
-	Required for gcc-3.4 and probaly other old versions to avoid
-	  error: base `graphite2::Face' with only non-default constructor in
-          class without a constructor
-	and the same for Font, Segment.
-
-diff -ur graphite2-1.2.0.orig/src/inc/Face.h graphite2-1.2.0/src/inc/Face.h
---- graphite2-1.2.0.orig/src/inc/Face.h	2012-09-21 10:39:40.000000000 +0200
-+++ graphite2-1.2.0/src/inc/Face.h	2012-12-04 12:15:58.000000000 +0100
-@@ -89,6 +89,9 @@
- 
-     CLASS_NEW_DELETE;
- private:
-+    // do not instantiate
-+    Face();
-+
-     SillMap                 m_Sill;
-     gr_face_ops             m_ops;
-     const void            * m_appFaceHandle;    // non-NULL
-diff -ur graphite2-1.2.0.orig/src/inc/Font.h graphite2-1.2.0/src/inc/Font.h
---- graphite2-1.2.0.orig/src/inc/Font.h	2012-09-21 10:39:40.000000000 +0200
-+++ graphite2-1.2.0/src/inc/Font.h	2012-12-04 12:13:14.000000000 +0100
-@@ -54,6 +54,9 @@
-     float               m_scale;      // scales from design units to ppm
-     bool                m_hinted;
- 
-+    // do not instantiate
-+    Font();
-+
-     Font(const Font&);
-     Font& operator=(const Font&);
- };
-diff -ur graphite2-1.2.0.orig/src/inc/Segment.h graphite2-1.2.0/src/inc/Segment.h
---- graphite2-1.2.0.orig/src/inc/Segment.h	2012-09-21 10:39:40.000000000 +0200
-+++ graphite2-1.2.0/src/inc/Segment.h	2012-12-04 12:15:53.000000000 +0100
-@@ -148,6 +148,9 @@
-     float justify(Slot *pSlot, const Font *font, float width, enum justFlags flags, Slot *pFirst, Slot *pLast);
-   
- private:
-+    // do not instantiate
-+    Segment();
-+
-     Rect            m_bbox;             // ink box of the segment
-     Position        m_advance;          // whole segment advance
-     SlotRope        m_slots;            // std::vector of slot buffers
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Face.h b/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Face.h
index f375e4557ff..d84ea92fc07 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Face.h
+++ b/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Face.h
@@ -89,9 +89,6 @@ public:
 
     CLASS_NEW_DELETE;
 private:
-    // do not instantiate
-    Face();
-
     SillMap                 m_Sill;
     gr_face_ops             m_ops;
     const void            * m_appFaceHandle;    // non-NULL
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Font.h b/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Font.h
index a7c1e2a2749..650bc7cd8c4 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Font.h
+++ b/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Font.h
@@ -54,9 +54,6 @@ private:
     float               m_scale;      // scales from design units to ppm
     bool                m_hinted;
 
-    // do not instantiate
-    Font();
-
     Font(const Font&);
     Font& operator=(const Font&);
 };
diff --git a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Segment.h b/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Segment.h
index e934d2d40a1..a2ff6d08482 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Segment.h
+++ b/Build/source/libs/graphite2/graphite2-1.2.0/src/inc/Segment.h
@@ -148,9 +148,6 @@ public:       //only used by: GrSegment* makeAndInitialize(const GrFont *font, c
     float justify(Slot *pSlot, const Font *font, float width, enum justFlags flags, Slot *pFirst, Slot *pLast);
   
 private:
-    // do not instantiate
-    Segment();
-
     Rect            m_bbox;             // ink box of the segment
     Position        m_advance;          // whole segment advance
     SlotRope        m_slots;            // std::vector of slot buffers
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.8-PATCHES/ChangeLog b/Build/source/libs/harfbuzz/harfbuzz-0.9.8-PATCHES/ChangeLog
index 111481cc2f4..422c3774ea2 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.8-PATCHES/ChangeLog
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.8-PATCHES/ChangeLog
@@ -1,3 +1,7 @@
+2012-12-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* patch-04-MSV (new): From Akira for MS Visual Studio 2005.
+
 2012-12-05  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Imported harfbuzz-0.9.8 source tree from:
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.8-PATCHES/patch-04-MSV b/Build/source/libs/harfbuzz/harfbuzz-0.9.8-PATCHES/patch-04-MSV
new file mode 100644
index 00000000000..8951bbc738e
--- /dev/null
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.8-PATCHES/patch-04-MSV
@@ -0,0 +1,14 @@
+	Required for MS Visual Studio 2005.
+
+diff -ur harfbuzz-0.9.8.orig/src/hb-private.hh harfbuzz-0.9.8/src/hb-private.hh
+--- harfbuzz-0.9.8.orig/src/hb-private.hh	2012-12-05 11:03:12.000000000 +0100
++++ harfbuzz-0.9.8/src/hb-private.hh	2012-12-06 16:40:07.414531612 +0100
+@@ -63,7 +63,7 @@
+ 
+ 
+ /* Void! */
+-struct _void_t;
++struct _void_t {};
+ typedef const _void_t &void_t;
+ #define HB_VOID (* (const _void_t *) NULL)
+ 
diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.8/src/hb-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.8/src/hb-private.hh
index 6e31e0e366d..fc555d5a0a6 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-0.9.8/src/hb-private.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.8/src/hb-private.hh
@@ -63,7 +63,7 @@
 
 
 /* Void! */
-struct _void_t;
+struct _void_t {};
 typedef const _void_t &void_t;
 #define HB_VOID (* (const _void_t *) NULL)
 
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 35a5c3360da..04130725eb0 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* w2c/config.h [MinGW32]: Define LONGINTEGER_{TYPE ,PRI} as for
+	native Windows, i.e., as __int64 and "I64".
+
 2012-11-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am, configure.ac: Add pixman, cairo, and harfbuzz
diff --git a/Build/source/texk/web2c/w2c/config.h b/Build/source/texk/web2c/w2c/config.h
index 21394181bf8..0a44572b28d 100644
--- a/Build/source/texk/web2c/w2c/config.h
+++ b/Build/source/texk/web2c/w2c/config.h
@@ -78,7 +78,7 @@ typedef off_t longinteger;
 /* To print file offsets we cast them to `LONGINTEGER_TYPE' (or
    `unsigned LONGINTEGER_TYPE') and use the conversion specifier
    `"%" LONGINTEGER_PRI "d"' (or `"%" LONGINTEGER_PRI "u"').  */
-#if defined(WIN32) && !defined(__MINGW32__)
+#if defined(WIN32)
 #define LONGINTEGER_TYPE __int64
 #define LONGINTEGER_PRI "I64"
 #elif SIZEOF_LONG < SIZEOF_OFF_T