diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-07-05 13:57:49 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-07-05 13:57:49 +0000 |
commit | bd3749566d917b091daaebf65e7ebcf079cf10fa (patch) | |
tree | a72239a66a140f223a4073c2239c3aee00d153ff /Build/source/libs/graphite | |
parent | c4a2d6947cdfbd692cc0a3ff4807b9d4404768c6 (diff) |
build fixes for aix and sun, from Vladimir
git-svn-id: svn://tug.org/texlive/trunk@19245 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/graphite')
4 files changed, 33 insertions, 0 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 cb8d82074a5..1635bc0723c 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,9 @@ +2010-07-05 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-06-static-const-members (new): Add a definition for + initialized static const class members, required for AIX. + From Vladimir Volovich, Fri, 04 Jun 2010 19:46:38. + 2010-03-29 Peter Breitenlohner <peb@mppmu.mpg.de> * patch-05-copy-constr (new): Declare copy constructor's source diff --git a/Build/source/libs/graphite/engine-2.3.1-PATCHES/patch-06-static-const-members b/Build/source/libs/graphite/engine-2.3.1-PATCHES/patch-06-static-const-members new file mode 100644 index 00000000000..9a181666379 --- /dev/null +++ b/Build/source/libs/graphite/engine-2.3.1-PATCHES/patch-06-static-const-members @@ -0,0 +1,25 @@ + Initialized static const class members may need to be defined + in the enclosing scope. + +diff -ur engine-2.3.1.orig/test/RegressionTest/RegressionTest.cpp engine-2.3.1/test/RegressionTest/RegressionTest.cpp +--- engine-2.3.1.orig/test/RegressionTest/RegressionTest.cpp 2009-01-21 23:36:42.000000000 +0100 ++++ engine-2.3.1/test/RegressionTest/RegressionTest.cpp 2010-07-05 15:28:32.820883982 +0200 +@@ -34,6 +34,7 @@ + + SegmentMemoryUsage g_smu; + FontMemoryUsage g_fmu; ++const int TestCase::kAbsent; + + std::string g_fontPath = "."; + #ifdef _WIN32 +diff -ur engine-2.3.1.orig/test/RegressionTest/TestCase.cpp engine-2.3.1/test/RegressionTest/TestCase.cpp +--- engine-2.3.1.orig/test/RegressionTest/TestCase.cpp 2009-01-21 23:36:42.000000000 +0100 ++++ engine-2.3.1/test/RegressionTest/TestCase.cpp 2010-07-05 15:27:40.045646923 +0200 +@@ -1875,6 +1875,7 @@ + m_attGlyphs[i] = stuff[i]; + } + ++const int ClickTest::fieldCnt; + void TestCase::SetClickTests(int clickTestCount, int * clickStuff) + { + const int fc = ClickTest::fieldCnt; diff --git a/Build/source/libs/graphite/engine-2.3.1/test/RegressionTest/RegressionTest.cpp b/Build/source/libs/graphite/engine-2.3.1/test/RegressionTest/RegressionTest.cpp index 1d361a4f3cd..b549daa38f3 100644 --- a/Build/source/libs/graphite/engine-2.3.1/test/RegressionTest/RegressionTest.cpp +++ b/Build/source/libs/graphite/engine-2.3.1/test/RegressionTest/RegressionTest.cpp @@ -34,6 +34,7 @@ int g_itcaseStart = 0; // adjust to skip to a certain test SegmentMemoryUsage g_smu; FontMemoryUsage g_fmu; +const int TestCase::kAbsent; std::string g_fontPath = "."; #ifdef _WIN32 diff --git a/Build/source/libs/graphite/engine-2.3.1/test/RegressionTest/TestCase.cpp b/Build/source/libs/graphite/engine-2.3.1/test/RegressionTest/TestCase.cpp index 7165b5eee99..d54c37a871b 100644 --- a/Build/source/libs/graphite/engine-2.3.1/test/RegressionTest/TestCase.cpp +++ b/Build/source/libs/graphite/engine-2.3.1/test/RegressionTest/TestCase.cpp @@ -1875,6 +1875,7 @@ void TestCase::SetAttachedClusters(int * stuff, int count) m_attGlyphs[i] = stuff[i]; } +const int ClickTest::fieldCnt; void TestCase::SetClickTests(int clickTestCount, int * clickStuff) { const int fc = ClickTest::fieldCnt; |