diff options
| author | Don Lewis <truckman@FreeBSD.org> | 2016-06-23 15:29:57 +0000 |
|---|---|---|
| committer | Don Lewis <truckman@FreeBSD.org> | 2016-06-23 15:29:57 +0000 |
| commit | d1cb00b3d0640334c27c4cde6fe840f2209fb89a (patch) | |
| tree | 59fed73bbc1270b76d85040da17c08b7dacc2cf7 /editors/openoffice-devel/files | |
| parent | Update to version 1.9.1 (diff) | |
Upgrade to upstream svn revision 1749607.
This fixes the build problem with libc++ 3.8.0, so
patch-vcl_source_glyphs_graphite__layout.cxx is no longer needed.
Notes
Notes:
svn path=/head/; revision=417378
Diffstat (limited to 'editors/openoffice-devel/files')
| -rw-r--r-- | editors/openoffice-devel/files/patch-vcl_source_glyphs_graphite__layout.cxx | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/editors/openoffice-devel/files/patch-vcl_source_glyphs_graphite__layout.cxx b/editors/openoffice-devel/files/patch-vcl_source_glyphs_graphite__layout.cxx deleted file mode 100644 index 35a42abb317b..000000000000 --- a/editors/openoffice-devel/files/patch-vcl_source_glyphs_graphite__layout.cxx +++ /dev/null @@ -1,14 +0,0 @@ ---- vcl/source/glyphs/graphite_layout.cxx.orig 2014-02-25 08:33:06 UTC -+++ vcl/source/glyphs/graphite_layout.cxx -@@ -107,9 +107,10 @@ namespace - typedef ext_std::pair<gr::GlyphIterator, gr::GlyphIterator> glyph_range_t; - typedef ext_std::pair<gr::GlyphSetIterator, gr::GlyphSetIterator> glyph_set_range_t; - -- inline long round(const float n) { -+ inline long round_(const float n) { - return long(n + (n < 0 ? -0.5 : 0.5)); - } -+#define round round_ - - - template<typename T> |