download.lst | 2 +- external/graphite/ubsan.patch | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-)
New commits: commit 2973476aac4a7bde6c17b93808a258fd205b8f37 Author: Martin Hosken <[email protected]> Date: Fri Apr 1 11:17:30 2016 +0700 Fix up upgrade to graphite 1.3.8 Change-Id: Idd7945176e1f667c29ff11144dc78870110bf562 Reviewed-on: https://gerrit.libreoffice.org/23716 Tested-by: Jenkins <[email protected]> Reviewed-by: Martin Hosken <[email protected]> diff --git a/download.lst b/download.lst index 7ba8351..8d6eed1 100644 --- a/download.lst +++ b/download.lst @@ -56,7 +56,7 @@ export FREETYPE_TARBALL := dbf2caca1d3afd410a29217a9809d397-freetype-2.4.8.tar.b export GLEW_TARBALL := 3941e9cab2f4f9d8faee3e8d57ae7664-glew-1.12.0.zip export GLM_TARBALL := bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip export GLYPHY_TARBALL := 5d303fb955beb9bf112267316ca9d021-glyphy-0.2.0.tar.bz2 -export GRAPHITE_TARBALL := 17df8301bcc459e83f8a8f3aca6183b2-graphite-minimal-1.3.6.tgz +export GRAPHITE_TARBALL := 4311dd9ace498b57c85f611e0670df64-graphite2-minimal-1.3.8.tgz export HARFBUZZ_MD5SUM := 0e27e531f4c4acff601ebff0957755c2 export HARFBUZZ_TARBALL := harfbuzz-0.9.40.tar.bz2 export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip diff --git a/external/graphite/ubsan.patch b/external/graphite/ubsan.patch index b1617b1..2f3bf5e 100644 --- a/external/graphite/ubsan.patch +++ b/external/graphite/ubsan.patch @@ -1,14 +1,3 @@ ---- src/Pass.cpp -+++ src/Pass.cpp -@@ -294,7 +294,7 @@ - s->rules = begin; - s->rules_end = (end - begin <= FiniteStateMachine::MAX_RULES)? end : - begin + FiniteStateMachine::MAX_RULES; -- qsort(begin, end - begin, sizeof(RuleEntry), &cmpRuleEntry); -+ if (end != begin) qsort(begin, end - begin, sizeof(RuleEntry), &cmpRuleEntry); - } - - return true; --- src/gr_face.cpp +++ src/gr_face.cpp @@ -87,7 +87,7 @@ _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
