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 | |
| 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')
| -rw-r--r-- | editors/openoffice-devel/Makefile | 2 | ||||
| -rw-r--r-- | editors/openoffice-devel/distinfo | 5 | ||||
| -rw-r--r-- | editors/openoffice-devel/files/patch-vcl_source_glyphs_graphite__layout.cxx | 14 |
3 files changed, 4 insertions, 17 deletions
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile index c3a684e799b2..4253625800bb 100644 --- a/editors/openoffice-devel/Makefile +++ b/editors/openoffice-devel/Makefile @@ -102,7 +102,7 @@ AOOVERSION2= 2 AOOVERSION3= 0 # From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD AOOTAG= AOO420m1\(Build:9800\) -SVNREVISION= 1735889 +SVNREVISION= 1749607 #AOORC=rc3 EXTSRC= ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz diff --git a/editors/openoffice-devel/distinfo b/editors/openoffice-devel/distinfo index 6337f71a6b23..0accdb27ddf0 100644 --- a/editors/openoffice-devel/distinfo +++ b/editors/openoffice-devel/distinfo @@ -1,5 +1,6 @@ -SHA256 (openoffice/apache-openoffice-r1735889-src.tar.xz) = f249b36ffcf1c653a4abc06c12b6c07fe7a017bcf5357562099e778257d8c533 -SIZE (openoffice/apache-openoffice-r1735889-src.tar.xz) = 215031948 +TIMESTAMP = 1466695719 +SHA256 (openoffice/apache-openoffice-r1749607-src.tar.xz) = a17f9a23b914013ca463ad1cab86dba9edc32b1e09a67ea125a1212257772bcd +SIZE (openoffice/apache-openoffice-r1749607-src.tar.xz) = 215075176 SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice/unowinreg.dll) = 6144 SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 966a8333c83a18ddd84401389006d6e0b52b8175924b808b54b88211669985fa 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> |