From owner-svn-ports-all@freebsd.org Fri Nov 23 19:26:39 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D7B89114F688; Fri, 23 Nov 2018 19:26:38 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 772D9714D1; Fri, 23 Nov 2018 19:26:38 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 57C9722ECB; Fri, 23 Nov 2018 19:26:38 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wANJQcWr018158; Fri, 23 Nov 2018 19:26:38 GMT (envelope-from truckman@FreeBSD.org) Received: (from truckman@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wANJQc2m018157; Fri, 23 Nov 2018 19:26:38 GMT (envelope-from truckman@FreeBSD.org) Message-Id: <201811231926.wANJQc2m018157@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: truckman set sender to truckman@FreeBSD.org using -f From: Don Lewis Date: Fri, 23 Nov 2018 19:26:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r485699 - in head/editors/openoffice-4: . files X-SVN-Group: ports-head X-SVN-Commit-Author: truckman X-SVN-Commit-Paths: in head/editors/openoffice-4: . files X-SVN-Commit-Revision: 485699 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 772D9714D1 X-Spamd-Result: default: False [1.37 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_LONG(0.40)[0.400,0]; NEURAL_SPAM_MEDIUM(0.71)[0.712,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_SPAM_SHORT(0.26)[0.257,0] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Nov 2018 19:26:39 -0000 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 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