svn commit: r485699 - in head/editors/openoffice-4: . files
Don Lewis
truckman at FreeBSD.org
Fri Nov 23 19:26:39 UTC 2018
Author: truckman
Date: Fri Nov 23 19:26:37 2018
New Revision: 485699
URL: https://svnweb.freebsd.org/changeset/ports/485699
Log:
Fix for crash in Freetype code. Check the return value of the
FT_Get_Glyph() function. See
https://bz.apache.org/ooo/show_bug.cgi?id=127929 [1]
Ensure that unowinreg.dll is included in DISTFILES when running the
makesum and distclean targets.
PR: 233404 [1]
Obtained from: upstream [1]
MFH: 2018Q4
Added:
head/editors/openoffice-4/files/patch-i127929 (contents, props changed)
Modified:
head/editors/openoffice-4/Makefile
Modified: head/editors/openoffice-4/Makefile
==============================================================================
--- head/editors/openoffice-4/Makefile Fri Nov 23 19:26:14 2018 (r485698)
+++ head/editors/openoffice-4/Makefile Fri Nov 23 19:26:37 2018 (r485699)
@@ -3,6 +3,7 @@
PORTNAME= apache-openoffice
PORTVERSION= ${AOOVERSION}
+PORTREVISION= 1
CATEGORIES= editors java
MASTER_SITES= APACHE/openoffice/${PORTVERSION}/source \
http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \
@@ -191,6 +192,12 @@ WIKI_PUBLISHER_VARS= BUNDLED_EXTENSIONS+=swext/wiki-pu
# Don't run gnome-post-icons until after post-install generates the plist
TARGET_ORDER_OVERRIDE= 710:gnome-post-icons
+
+# Force the SDK option on for makesum to ensure that unowinreg.dll is
+# included in distinfo
+.if make(makesum) || make(distclean)
+WITH= SDK
+.endif
.include <bsd.port.pre.mk>
Added: head/editors/openoffice-4/files/patch-i127929
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/openoffice-4/files/patch-i127929 Fri Nov 23 19:26:37 2018 (r485699)
@@ -0,0 +1,20 @@
+Index: vcl/source/glyphs/gcach_ftyp.cxx
+===================================================================
+--- vcl/source/glyphs/gcach_ftyp.cxx (revision 1846187)
++++ vcl/source/glyphs/gcach_ftyp.cxx (working copy)
+@@ -1361,6 +1361,15 @@
+
+ FT_Glyph pGlyphFT;
+ rc = FT_Get_Glyph( maFaceFT->glyph, &pGlyphFT );
++ if( rc != FT_Err_Ok )
++ {
++ // we get here e.g. when a PS font lacks the default glyph
++ rGD.SetCharWidth( 0 );
++ rGD.SetDelta( 0, 0 );
++ rGD.SetOffset( 0, 0 );
++ rGD.SetSize( Size( 0, 0 ) );
++ return;
++ }
+
+ ApplyGlyphTransform( nGlyphFlags, pGlyphFT, false );
+ if( mbArtBold && pFTEmbolden && (nFTVERSION < 2200) ) // #i71094# workaround staircase bug
More information about the svn-ports-all
mailing list