summaryrefslogtreecommitdiff
path: root/Build/source/libs/graphite
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2010-02-22 12:09:38 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2010-02-22 12:09:38 +0000
commitb287d7f6a13823ea17e0bd415981d3a5953ca703 (patch)
treea420b28a35f7761f064d50bb610dbb2b46c71486 /Build/source/libs/graphite
parent5fd6fd3479fcbbda52ebca7b5e80a5aaa1add69f (diff)
build system: various small fixes for mingw32 cross compilation
still incomplete git-svn-id: svn://tug.org/texlive/trunk@17141 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/graphite')
-rw-r--r--Build/source/libs/graphite/engine-2.3.1-PATCHES/ChangeLog5
-rw-r--r--Build/source/libs/graphite/engine-2.3.1-PATCHES/patch-03-SIZEOF_WCHAR_T17
-rw-r--r--Build/source/libs/graphite/engine-2.3.1-PATCHES/patch-04-math_h-WIN3213
-rw-r--r--Build/source/libs/graphite/engine-2.3.1/src/font/FileFont.cpp6
-rw-r--r--Build/source/libs/graphite/engine-2.3.1/src/segment/GrTableManager.cpp2
5 files changed, 39 insertions, 4 deletions
diff --git a/Build/source/libs/graphite/engine-2.3.1-PATCHES/ChangeLog b/Build/source/libs/graphite/engine-2.3.1-PATCHES/ChangeLog
index a7dc9945a3d..8998fd069cc 100644
--- a/Build/source/libs/graphite/engine-2.3.1-PATCHES/ChangeLog
+++ b/Build/source/libs/graphite/engine-2.3.1-PATCHES/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-21 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-03-SIZEOF_WCHAR_T (new): MinGW32 fix.
+ * patch-04-math_h-WIN32 (new): #include <math.h> also for WIN32.
+
2009-10-20 Peter Breitenlohner <peb@mppmu.mpg.de>
* patch-02-virtual (new): Declare destructors as virtual to
diff --git a/Build/source/libs/graphite/engine-2.3.1-PATCHES/patch-03-SIZEOF_WCHAR_T b/Build/source/libs/graphite/engine-2.3.1-PATCHES/patch-03-SIZEOF_WCHAR_T
new file mode 100644
index 00000000000..86ff5fdc3c2
--- /dev/null
+++ b/Build/source/libs/graphite/engine-2.3.1-PATCHES/patch-03-SIZEOF_WCHAR_T
@@ -0,0 +1,17 @@
+diff -ur engine-2.3.1.orig/src/font/FileFont.cpp engine-2.3.1/src/font/FileFont.cpp
+--- engine-2.3.1.orig/src/font/FileFont.cpp 2009-01-21 23:36:42.000000000 +0100
++++ engine-2.3.1/src/font/FileFont.cpp 2010-02-19 23:30:05.299876675 +0100
+@@ -208,10 +208,10 @@
+ }
+ // }
+ #else
+- m_stuFaceName.assign(rgchwFace);
++ // m_stuFaceName.assign(rgchwFace);
+ // VS 2005 needs this:
+- //for (int cch16 = 0; cch16 < cchw; cch16++)
+- // m_stuFaceName.push_back(rgchwFace[cch16]);
++ for (int cch16 = 0; cch16 < cchw; cch16++)
++ m_stuFaceName.push_back(rgchwFace[cch16]);
+ #endif
+ pTable = readTable(ktiHead, lSize);
+ if (!m_fIsValid || !pTable)
diff --git a/Build/source/libs/graphite/engine-2.3.1-PATCHES/patch-04-math_h-WIN32 b/Build/source/libs/graphite/engine-2.3.1-PATCHES/patch-04-math_h-WIN32
new file mode 100644
index 00000000000..3f84de21aa7
--- /dev/null
+++ b/Build/source/libs/graphite/engine-2.3.1-PATCHES/patch-04-math_h-WIN32
@@ -0,0 +1,13 @@
+diff -ur engine-2.3.1.orig/src/segment/GrTableManager.cpp engine-2.3.1/src/segment/GrTableManager.cpp
+--- engine-2.3.1.orig/src/segment/GrTableManager.cpp 2009-01-28 03:01:29.000000000 +0100
++++ engine-2.3.1/src/segment/GrTableManager.cpp 2010-02-21 17:51:33.772814394 +0100
+@@ -25,8 +25,8 @@
+ DEFINE_THIS_FILE
+ #ifndef _WIN32
+ #include <stdlib.h>
+-#include <math.h>
+ #endif
++#include <math.h>
+
+ //:>********************************************************************************************
+ //:> Forward declarations
diff --git a/Build/source/libs/graphite/engine-2.3.1/src/font/FileFont.cpp b/Build/source/libs/graphite/engine-2.3.1/src/font/FileFont.cpp
index 4600b788ed2..4e5f2a62578 100644
--- a/Build/source/libs/graphite/engine-2.3.1/src/font/FileFont.cpp
+++ b/Build/source/libs/graphite/engine-2.3.1/src/font/FileFont.cpp
@@ -208,10 +208,10 @@ FileFont::initializeFromFace()
}
// }
#else
- m_stuFaceName.assign(rgchwFace);
+ // m_stuFaceName.assign(rgchwFace);
// VS 2005 needs this:
- //for (int cch16 = 0; cch16 < cchw; cch16++)
- // m_stuFaceName.push_back(rgchwFace[cch16]);
+ for (int cch16 = 0; cch16 < cchw; cch16++)
+ m_stuFaceName.push_back(rgchwFace[cch16]);
#endif
pTable = readTable(ktiHead, lSize);
if (!m_fIsValid || !pTable)
diff --git a/Build/source/libs/graphite/engine-2.3.1/src/segment/GrTableManager.cpp b/Build/source/libs/graphite/engine-2.3.1/src/segment/GrTableManager.cpp
index ff675adb0ad..e01dcf13c7b 100644
--- a/Build/source/libs/graphite/engine-2.3.1/src/segment/GrTableManager.cpp
+++ b/Build/source/libs/graphite/engine-2.3.1/src/segment/GrTableManager.cpp
@@ -25,8 +25,8 @@ Description:
DEFINE_THIS_FILE
#ifndef _WIN32
#include <stdlib.h>
-#include <math.h>
#endif
+#include <math.h>
//:>********************************************************************************************
//:> Forward declarations