xref: /AOO41X/main/graphite/graphite-2.3.1.patch.mingw (revision 4ee0f98ce7db87dcc5f20f8b49c0952019eeea7f) 
1--- misc/silgraphite-2.3.1/engine/config/ltmain.sh  2009-01-28 11:21:59.000000000 +0900
2+++ misc/build/silgraphite-2.3.1/engine/config/ltmain.sh    2009-08-23 20:59:13.180125000 +0900
3@@ -3963,7 +3963,7 @@
4    case $dir in
5    [\\/]* | [A-Za-z]:[\\/]*) ;;
6    *)
7-     absdir=`cd "$dir" && pwd`
8+     absdir=`cygpath -m -a "$dir"`
9      test -z "$absdir" && \
10        func_fatal_error "cannot determine absolute directory name of \`$dir'"
11      dir="$absdir"
12--- misc/silgraphite-2.3.1/engine/src/Makefile.in   2009-01-28 11:25:00.000000000 +0900
13+++ misc/build/silgraphite-2.3.1/engine/src/Makefile.in 2009-08-23 20:59:13.742625000 +0900
14@@ -62,7 +62,8 @@
15    GrFSM.lo GrGlyphTable.lo GrPassActionCode.lo GrPass.lo \
16    GrSlotState.lo GrSlotStream.lo GrTableManager.lo \
17    MemoryUsage.lo Platform.lo SegmentAux.lo Segment.lo TestFSM.lo \
18-   TestPasses.lo TransductionLog.lo SegmentPainter.lo
19+   TestPasses.lo TransductionLog.lo SegmentPainter.lo WinFont.lo \
20+   WinSegmentPainter.lo
21 libgraphite_la_OBJECTS = $(am_libgraphite_la_OBJECTS)
22 libgraphite_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
23    $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
24@@ -257,11 +258,14 @@
25    $(segmentdir)/Platform.cpp $(segmentdir)/SegmentAux.cpp \
26    $(segmentdir)/Segment.cpp $(segmentdir)/TestFSM.cpp \
27    $(segmentdir)/TestPasses.cpp $(segmentdir)/TransductionLog.cpp \
28-   $(painterdir)/SegmentPainter.cpp
29+   $(painterdir)/SegmentPainter.cpp \
30+   $(winwrapperdir)/WinFont.cpp \
31+   $(winwrapperdir)/WinSegmentPainter.cpp
32 genericdir = $(top_srcdir)/src/generic
33 fontdir = $(top_srcdir)/src/font
34 segmentdir = $(top_srcdir)/src/segment
35 painterdir = $(top_srcdir)/src/painter
36+winwrapperdir = $(top_srcdir)/../wrappers/win32
37 all: all-am
38
39 .SUFFIXES:
40@@ -358,6 +362,8 @@
41 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TransductionLog.Plo@am__quote@
42 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TtfUtil.Plo@am__quote@
43 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Util.Plo@am__quote@
44+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/WinFont.Plo@am__quote@
45+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/WinSegmentPainter.Plo@am__quote@
46
47 .cpp.o:
48 @am__fastdepCXX_TRUE@  $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
49@@ -569,6 +575,20 @@
50 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
51 @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SegmentPainter.lo `test -f '$(painterdir)/SegmentPainter.cpp' || echo '$(srcdir)/'`$(painterdir)/SegmentPainter.cpp
52
53+WinFont.lo: $(winwrapperdir)/WinFont.cpp
54+@am__fastdepCXX_TRUE@  $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT WinFont.lo -MD -MP -MF $(DEPDIR)/WinFont.Tpo -c -o WinFont.lo `test -f '$(winwrapperdir)/WinFont.cpp' || echo '$(srcdir)/'`$(winwrapperdir)/WinFont.cpp
55+@am__fastdepCXX_TRUE@  mv -f $(DEPDIR)/WinFont.Tpo $(DEPDIR)/WinFont.Plo
56+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(winwrapperdir)/WinFont.cpp' object='WinFont.lo' libtool=yes @AMDEPBACKSLASH@
57+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
58+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o WinFont.lo `test -f '$(winwrapperdir)/WinFont.cpp' || echo '$(srcdir)/'`$(winwrapperdir)/WinFont.cpp
59+
60+WinSegmentPainter.lo: $(winwrapperdir)/WinSegmentPainter.cpp
61+@am__fastdepCXX_TRUE@  $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT WinSegmentPainter.lo -MD -MP -MF $(DEPDIR)/WinSegmentPainter.Tpo -c -o WinSegmentPainter.lo `test -f '$(winwrapperdir)/WinSegmentPainter.cpp' || echo '$(srcdir)/'`$(winwrapperdir)/WinSegmentPainter.cpp
62+@am__fastdepCXX_TRUE@  mv -f $(DEPDIR)/WinSegmentPainter.Tpo $(DEPDIR)/WinSegmentPainter.Plo
63+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(winwrapperdir)/WinSegmentPainter.cpp' object='WinSegmentPainter.lo' libtool=yes @AMDEPBACKSLASH@
64+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
65+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o WinSegmentPainter.lo `test -f '$(winwrapperdir)/WinSegmentPainter.cpp' || echo '$(srcdir)/'`$(winwrapperdir)/WinSegmentPainter.cpp
66+
67 mostlyclean-libtool:
68    -rm -f *.lo
69
70--- misc/silgraphite-2.3.1/engine/src/font/FileFont.cpp 2009-01-22 07:36:42.000000000 +0900
71+++ misc/build/silgraphite-2.3.1/engine/src/font/FileFont.cpp   2009-08-23 20:59:14.148875000 +0900
72@@ -208,7 +208,11 @@
73            }
74 //     }
75 #elif 1
76+#ifdef __MINGW32__
77+       m_stuFaceName.assign(reinterpret_cast<wchar_t*>(rgchwFace));
78+#else
79        m_stuFaceName.assign(rgchwFace);
80+#endif
81 #else  // VS 2005 needs this:
82        for (int cch16 = 0; cch16 < cchw; cch16++)
83            m_stuFaceName.push_back(rgchwFace[cch16]);
84--- misc/silgraphite-2.3.1/engine/test/RegressionTest/GrJustifier.cpp   2009-01-22 07:36:42.000000000 +0900
85+++ misc/build/silgraphite-2.3.1/engine/test/RegressionTest/GrJustifier.cpp 2009-08-23 20:59:15.445750000 +0900
86@@ -375,7 +375,7 @@
87        _itow(dxDesiredWidth, rgchw, 10);
88        strTmp += rgchw;
89        strTmp += L")\n";
90-       OutputDebugString(strTmp.c_str());
91+       OutputDebugStringW(strTmp.c_str());
92 #else
93        Assert(fprintf(stderr,
94               "justification failed by %d units (width needed = %d)\n",
95--- misc/silgraphite-2.3.1/engine/test/RegressionTest/RegressionTest.cpp    2009-01-22 07:36:42.000000000 +0900
96+++ misc/build/silgraphite-2.3.1/engine/test/RegressionTest/RegressionTest.cpp  2009-08-23 20:59:15.711375000 +0900
97@@ -56,7 +56,7 @@
98
99 int main(int argc, char* argv[])
100 {
101-#ifdef _WIN32
102+#if defined(_WIN32) && !defined(__MINGW32__)
103    _CrtSetDbgFlag(_CrtSetDbgFlag(_CRTDBG_REPORT_FLAG) | _CRTDBG_LEAK_CHECK_DF);
104 #endif // WIN32
105
106--- misc/silgraphite-2.3.1/engine/test/RegressionTest/main.h    2009-01-29 17:33:19.000000000 +0900
107+++ misc/build/silgraphite-2.3.1/engine/test/RegressionTest/main.h  2009-08-23 20:59:15.945750000 +0900
108@@ -36,7 +36,7 @@
109 ////#include <algorithm>
110 #include <string>
111 #include <cstring>
112-#ifdef _WIN32
113+#if defined(_WIN32) && !defined(__MINGW32__)
114 #include <crtdbg.h>
115 #endif // _WIN32
116 #include <assert.h>
117--- misc/silgraphite-2.3.1/wrappers/win32/WinFont.cpp   2009-01-29 17:33:19.000000000 +0900
118+++ misc/build/silgraphite-2.3.1/wrappers/win32/WinFont.cpp 2009-08-23 20:59:16.211375000 +0900
119@@ -846,7 +846,7 @@
120
121 } // namespace gr
122
123-template stdext::hash_map<
124+template class stdext::hash_map<
125    gr::WinFont::LogFontWrapper,
126    gr::WinFont::FontHandleCache::FontCacheValue,
127    gr::WinFont::LogFontHashFuncs>;
128--- misc/silgraphite-2.3.1/wrappers/win32/WinFont.h 2009-01-29 17:33:19.000000000 +0900
129+++ misc/build/silgraphite-2.3.1/wrappers/win32/WinFont.h   2009-08-23 20:59:16.367625000 +0900
130@@ -17,6 +17,9 @@
131 #endif
132 #ifndef WINFONT_INCLUDED
133 #define WINFONT_INCLUDED
134+#if __GNUC__ >=3
135+#pragma GCC system_header
136+#endif
137
138 //:End Ignore
139
140@@ -27,6 +30,8 @@
141 #include "GrClient.h"
142 #include "Font.h"
143
144+namespace stdext = std;
145+
146 #ifdef _STLPORT_VERSION
147 namespace stdext = _STLP_STD;
148 #endif
149--- misc/silgraphite-2.3.1/wrappers/win32/WinSegmentPainter.h   2008-05-09 20:10:30.000000000 +0900
150+++ misc/build/silgraphite-2.3.1/wrappers/win32/WinSegmentPainter.h 2009-08-23 21:14:38.961375000 +0900
151@@ -82,7 +82,7 @@
152    //  return ::SetBkColor(hdc, PALETTERGB(GetRValue(clr), GetGValue(clr), GetBValue(clr)));
153    //}
154
155-   void WinSegmentPainter::paintAux();
156+   void paintAux();
157
158 protected:
159    // member variables:
160