diff options
| -rw-r--r-- | Build/source/libs/graphite/engine-2.3.1-PATCHES/ChangeLog | 6 | ||||
| -rw-r--r-- | Build/source/libs/graphite/engine-2.3.1-PATCHES/patch-06-static-const-members | 25 | ||||
| -rw-r--r-- | Build/source/libs/graphite/engine-2.3.1/test/RegressionTest/RegressionTest.cpp | 1 | ||||
| -rw-r--r-- | Build/source/libs/graphite/engine-2.3.1/test/RegressionTest/TestCase.cpp | 1 | ||||
| -rw-r--r-- | Build/source/libs/zziplib/zziplib-0.13.58-PATCHES/ChangeLog | 5 | ||||
| -rw-r--r-- | Build/source/libs/zziplib/zziplib-0.13.58-PATCHES/patch-03-inline | 26 | ||||
| -rw-r--r-- | Build/source/libs/zziplib/zziplib-0.13.58/zzip/zip.c | 4 | ||||
| -rwxr-xr-x | Master/bin/x86_64-linux/dvisvgm | bin | 1727632 -> 1727632 bytes |
8 files changed, 66 insertions, 2 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; diff --git a/Build/source/libs/zziplib/zziplib-0.13.58-PATCHES/ChangeLog b/Build/source/libs/zziplib/zziplib-0.13.58-PATCHES/ChangeLog index b0b60667060..8e6013b47ab 100644 --- a/Build/source/libs/zziplib/zziplib-0.13.58-PATCHES/ChangeLog +++ b/Build/source/libs/zziplib/zziplib-0.13.58-PATCHES/ChangeLog @@ -1,3 +1,8 @@ +2010-07-05 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-03-inline (new): Can't use non-static inline for Sun + Studio C, mail from Vladimir Volovich, Wed, 16 Jun 2010 20:18:17. + 2010-06-04 Peter Breitenlohner <peb@mppmu.mpg.de> * patch-02-aix-strcasecmp (new): Need to #include <strings.h> diff --git a/Build/source/libs/zziplib/zziplib-0.13.58-PATCHES/patch-03-inline b/Build/source/libs/zziplib/zziplib-0.13.58-PATCHES/patch-03-inline new file mode 100644 index 00000000000..8b61a56bdf1 --- /dev/null +++ b/Build/source/libs/zziplib/zziplib-0.13.58-PATCHES/patch-03-inline @@ -0,0 +1,26 @@ + The Sun Studio C compiler may require a global non-inline + definition. + + This function actually ought to be 'static inline'. + +diff -ur zziplib-0.13.58.orig/zzip/zip.c zziplib-0.13.58/zzip/zip.c +--- zziplib-0.13.58.orig/zzip/zip.c 2009-08-23 13:38:22.000000000 +0200 ++++ zziplib-0.13.58/zzip/zip.c 2010-07-05 15:10:44.401672730 +0200 +@@ -88,7 +88,7 @@ + struct zzip_dir_hdr **hdr_return, + zzip_plugin_io_t io); + +-_zzip_inline char *__zzip_aligned4(char *p); ++char *__zzip_aligned4(char *p); + + /* ------------------------ harden routines ------------------------------ */ + +@@ -375,7 +375,7 @@ + * to pointer types but we do need only the lower bits in this implementation, + * so we can just cast the value to a long value. + */ +-_zzip_inline char * ++char * + __zzip_aligned4(char *p) + { + #define aligned4 __zzip_aligned4 diff --git a/Build/source/libs/zziplib/zziplib-0.13.58/zzip/zip.c b/Build/source/libs/zziplib/zziplib-0.13.58/zzip/zip.c index 0a400cd47d8..cdbf1979773 100644 --- a/Build/source/libs/zziplib/zziplib-0.13.58/zzip/zip.c +++ b/Build/source/libs/zziplib/zziplib-0.13.58/zzip/zip.c @@ -88,7 +88,7 @@ int __zzip_parse_root_directory(int fd, struct zzip_dir_hdr **hdr_return, zzip_plugin_io_t io); -_zzip_inline char *__zzip_aligned4(char *p); +char *__zzip_aligned4(char *p); /* ------------------------ harden routines ------------------------------ */ @@ -375,7 +375,7 @@ __zzip_fetch_disk_trailer(int fd, zzip_off_t filesize, * to pointer types but we do need only the lower bits in this implementation, * so we can just cast the value to a long value. */ -_zzip_inline char * +char * __zzip_aligned4(char *p) { #define aligned4 __zzip_aligned4 diff --git a/Master/bin/x86_64-linux/dvisvgm b/Master/bin/x86_64-linux/dvisvgm Binary files differindex f06a3da8375..b9413c16acd 100755 --- a/Master/bin/x86_64-linux/dvisvgm +++ b/Master/bin/x86_64-linux/dvisvgm |