From 6b84708914f9c026776b28a300ac6d278272881f Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Thu, 13 Dec 2018 09:13:39 +0100 Subject: graphite: update to 1.3.12 Martin Hosken thinks all patches are redundant now, so drop them. Change-Id: I062168416a1289b7f4dd42d8ae58b7df56a37712 Reviewed-on: https://gerrit.libreoffice.org/65074 Tested-by: Jenkins Reviewed-by: Miklos Vajna --- external/graphite/StaticLibrary_graphite.mk | 4 -- external/graphite/UnpackedTarball_graphite.mk | 8 ---- external/graphite/graphite2.issue1115.patch.1 | 22 ---------- external/graphite/graphite2.win64.patch.1 | 60 -------------------------- external/graphite/ubsan.patch | 62 --------------------------- 5 files changed, 156 deletions(-) delete mode 100644 external/graphite/graphite2.issue1115.patch.1 delete mode 100644 external/graphite/graphite2.win64.patch.1 delete mode 100644 external/graphite/ubsan.patch (limited to 'external') diff --git a/external/graphite/StaticLibrary_graphite.mk b/external/graphite/StaticLibrary_graphite.mk index 8c16482ba11b..9eeff041dc28 100644 --- a/external/graphite/StaticLibrary_graphite.mk +++ b/external/graphite/StaticLibrary_graphite.mk @@ -44,7 +44,6 @@ $(eval $(call gb_StaticLibrary_add_generated_exception_objects,graphite,\ UnpackedTarball/graphite/src/gr_segment \ UnpackedTarball/graphite/src/gr_slot \ UnpackedTarball/graphite/src/json \ - UnpackedTarball/graphite/src/CachedFace \ UnpackedTarball/graphite/src/CmapCache \ UnpackedTarball/graphite/src/Code \ UnpackedTarball/graphite/src/Collider \ @@ -60,9 +59,6 @@ $(eval $(call gb_StaticLibrary_add_generated_exception_objects,graphite,\ UnpackedTarball/graphite/src/NameTable \ UnpackedTarball/graphite/src/Pass \ UnpackedTarball/graphite/src/Position \ - UnpackedTarball/graphite/src/SegCache \ - UnpackedTarball/graphite/src/SegCacheEntry \ - UnpackedTarball/graphite/src/SegCacheStore \ UnpackedTarball/graphite/src/Segment \ UnpackedTarball/graphite/src/Silf \ UnpackedTarball/graphite/src/Slot \ diff --git a/external/graphite/UnpackedTarball_graphite.mk b/external/graphite/UnpackedTarball_graphite.mk index a162d172b795..0abd4b657d91 100644 --- a/external/graphite/UnpackedTarball_graphite.mk +++ b/external/graphite/UnpackedTarball_graphite.mk @@ -11,12 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,graphite)) $(eval $(call gb_UnpackedTarball_set_tarball,graphite,$(GRAPHITE_TARBALL))) -$(eval $(call gb_UnpackedTarball_set_patchlevel,graphite,0)) - -$(eval $(call gb_UnpackedTarball_add_patches,graphite,\ - external/graphite/graphite2.issue1115.patch.1 \ - external/graphite/graphite2.win64.patch.1 \ - external/graphite/ubsan.patch \ -)) - # vim: set noet sw=4 ts=4: diff --git a/external/graphite/graphite2.issue1115.patch.1 b/external/graphite/graphite2.issue1115.patch.1 deleted file mode 100644 index 454114bb32c9..000000000000 --- a/external/graphite/graphite2.issue1115.patch.1 +++ /dev/null @@ -1,22 +0,0 @@ ---- graphite/src/Code.cpp -+++ graphite/src/Code.cpp -@@ -175,8 +175,8 @@ Machine::Code::Code(bool is_constraint, - bytecode_end, - pre_context, - rule_length, -- silf.numClasses(), -- face.glyphs().numAttrs(), -+ static_cast(silf.numClasses()), -+ static_cast(face.glyphs().numAttrs()), - face.numFeatures(), - {1,1,1,1,1,1,1,1, - 1,1,1,1,1,1,1,255, -@@ -184,7 +184,7 @@ Machine::Code::Code(bool is_constraint, - 1,1,1,1,1,1,0,0, - 0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0, -- 0,0,0,0,0,0,0, silf.numUser()} -+ 0,0,0,0,0,0,0, static_cast(silf.numUser())} - }; - - decoder dec(lims, *this, pt); diff --git a/external/graphite/graphite2.win64.patch.1 b/external/graphite/graphite2.win64.patch.1 deleted file mode 100644 index d7cf11e63189..000000000000 --- a/external/graphite/graphite2.win64.patch.1 +++ /dev/null @@ -1,60 +0,0 @@ -diff -urN graphite2-1.3.4.orig/src/inc/json.h graphite2-1.3.4/src/inc/json.h ---- graphite2-1.3.4.orig/src/inc/json.h 2015-12-22 14:25:46.403566441 +0100 -+++ graphite2-1.3.4/src/inc/json.h 2015-12-22 14:26:13.439722846 +0100 -@@ -85,6 +85,9 @@ - json & operator << (string) throw(); - json & operator << (number) throw(); - json & operator << (integer) throw(); -+#ifdef _WIN64 -+ json & operator << (size_t) throw(); -+#endif - json & operator << (long unsigned int d) throw(); - json & operator << (boolean) throw(); - json & operator << (_null_t) throw(); -diff -urN graphite2-1.3.4.orig/src/inc/Main.h graphite2-1.3.4/src/inc/Main.h ---- graphite2-1.3.4.orig/src/inc/Main.h 2015-12-22 14:25:46.399566417 +0100 -+++ graphite2-1.3.4/src/inc/Main.h 2015-12-22 14:26:13.439722846 +0100 -@@ -25,6 +25,9 @@ - of the License or (at your option) any later version. - */ - #pragma once -+#ifdef _WIN32 -+#pragma warning(disable: 4510 4610) -+#endif - - #include - #include "graphite2/Types.h" -diff -urN graphite2-1.3.4.orig/src/json.cpp graphite2-1.3.4/src/json.cpp ---- graphite2-1.3.4.orig/src/json.cpp 2015-12-22 14:25:46.399566417 +0100 -+++ graphite2-1.3.4/src/json.cpp 2015-12-22 14:26:13.439722846 +0100 -@@ -133,6 +133,9 @@ - } - json & json::operator << (json::integer d) throw() { context(seq); fprintf(_stream, "%ld", d); return *this; } - json & json::operator << (long unsigned d) throw() { context(seq); fprintf(_stream, "%ld", d); return *this; } -+#ifdef _WIN64 -+json & json::operator << (size_t d) throw() { context(seq); fprintf(_stream, "%ld", d); return *this; } -+#endif - json & json::operator << (json::boolean b) throw() { context(seq); fputs(b ? "true" : "false", _stream); return *this; } - json & json::operator << (json::_null_t) throw() { context(seq); fputs("null",_stream); return *this; } - -diff -urN graphite2-1.3.4.orig/src/Pass.cpp graphite2-1.3.4/src/Pass.cpp ---- graphite2-1.3.4.orig/src/Pass.cpp 2015-12-22 14:25:46.399566417 +0100 -+++ graphite2-1.3.4/src/Pass.cpp 2015-12-22 14:26:13.439722846 +0100 -@@ -568,7 +568,7 @@ - if (r->rule->preContext > fsm.slots.context()) - continue; - *fsm.dbgout << json::flat << json::object -- << "id" << r->rule - m_rules -+ << "id" << static_cast(r->rule - m_rules) - << "failed" << true - << "input" << json::flat << json::object - << "start" << objectid(dslot(&fsm.slots.segment, input_slot(fsm.slots, -r->rule->preContext))) -@@ -582,7 +582,7 @@ - void Pass::dumpRuleEventOutput(const FiniteStateMachine & fsm, const Rule & r, Slot * const last_slot) const - { - *fsm.dbgout << json::item << json::flat << json::object -- << "id" << &r - m_rules -+ << "id" << static_cast(&r - m_rules) - << "failed" << false - << "input" << json::flat << json::object - << "start" << objectid(dslot(&fsm.slots.segment, input_slot(fsm.slots, 0))) diff --git a/external/graphite/ubsan.patch b/external/graphite/ubsan.patch deleted file mode 100644 index 86039de4e1c8..000000000000 --- a/external/graphite/ubsan.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- src/TtfUtil.cpp -+++ src/TtfUtil.cpp -@@ -1247,7 +1247,7 @@ - void * GlyfLookup(const void * pGlyf, size_t nGlyfOffset, size_t nTableLen) - { - const uint8 * pByte = reinterpret_cast(pGlyf); -- if (nGlyfOffset + pByte < pByte || nGlyfOffset + sizeof(Sfnt::Glyph) >= nTableLen) -+ if (nGlyfOffset > nTableLen || sizeof(Sfnt::Glyph) >= nTableLen - nGlyfOffset) - return NULL; - return const_cast(pByte + nGlyfOffset); - } ---- src/gr_face.cpp -+++ src/gr_face.cpp -@@ -87,7 +87,7 @@ - - Face *res = new Face(appFaceHandle, *ops); - if (res && load_face(*res, faceOptions)) -- return static_cast(res); -+ return reinterpret_cast(res); - - delete res; - return 0; -@@ -195,7 +195,7 @@ - - void gr_face_destroy(gr_face *face) - { -- delete face; -+ delete static_cast(face); - } - - ---- src/gr_font.cpp -+++ src/gr_font.cpp -@@ -50,7 +50,7 @@ - if (face == 0) return 0; - - Font * const res = new Font(ppm, *face, appFontHandle, font_ops); -- return static_cast(res); -+ return reinterpret_cast(res); - } - - gr_font* gr_make_font_with_advance_fn(float ppm/*pixels per em*/, const void* appFontHandle/*non-NULL*/, gr_advance_fn getAdvance, const gr_face * face/*needed for scaling*/) -@@ -61,7 +61,7 @@ - - void gr_font_destroy(gr_font *font) - { -- delete font; -+ delete static_cast(font); - } - - ---- src/inc/Code.h -+++ src/inc/Code.h -@@ -162,7 +162,7 @@ - { - if (_code && !_own) - { -- _code += dist / sizeof(instr); -+ _code += dist / int(sizeof(instr)); - _data += dist; - } - } -- cgit