Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 24 Nov 2018 23:36:07 +0000 (UTC)
From:      Don Lewis <truckman@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r485835 - head/editors/openoffice-devel
Message-ID:  <201811242336.wAONa7VT016752@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: truckman
Date: Sat Nov 24 23:36:07 2018
New Revision: 485835
URL: https://svnweb.freebsd.org/changeset/ports/485835

Log:
  Upgrade editors/openoffice-devel to upstream SVN revision r1847189.
  This contains the fix for the crash in Freetype code, 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.  This has been missing from distinfo
  since r468039 which was committed in April.
  
  PR:		233404 [1]
  MFH:		2018Q4

Modified:
  head/editors/openoffice-devel/Makefile
  head/editors/openoffice-devel/distinfo

Modified: head/editors/openoffice-devel/Makefile
==============================================================================
--- head/editors/openoffice-devel/Makefile	Sat Nov 24 22:32:57 2018	(r485834)
+++ head/editors/openoffice-devel/Makefile	Sat Nov 24 23:36:07 2018	(r485835)
@@ -120,7 +120,7 @@ AOOVERSION2=	2
 AOOVERSION3=	0
 # From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD
 AOOTAG=		AOO420m1\(Build:9800\)
-SVNREVISION=	1838397
+SVNREVISION=	1847189
 #AOORC=rc3
 EXTSRC=		ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz
 
@@ -219,6 +219,12 @@ WIKI_PUBLISHER_RUN_DEPENDS=	${WIKI_PUBLISHER_JAR_DEPEN
 
 # 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>
 

Modified: head/editors/openoffice-devel/distinfo
==============================================================================
--- head/editors/openoffice-devel/distinfo	Sat Nov 24 22:32:57 2018	(r485834)
+++ head/editors/openoffice-devel/distinfo	Sat Nov 24 23:36:07 2018	(r485835)
@@ -1,5 +1,7 @@
-TIMESTAMP = 1534712296
-SHA256 (openoffice/apache-openoffice-r1838397-src.tar.xz) = d61308a8cd88a757bc7755b703c31696a2853cb266355457af2eaf6755ced1c5
-SIZE (openoffice/apache-openoffice-r1838397-src.tar.xz) = 215383932
+TIMESTAMP = 1542995937
+SHA256 (openoffice/apache-openoffice-r1847189-src.tar.xz) = 6be9bb6bcff11d3c3ca18a3eede23270732bfb3cf00e112dbcd06c3a751c4c3b
+SIZE (openoffice/apache-openoffice-r1847189-src.tar.xz) = 217492744
 SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 966a8333c83a18ddd84401389006d6e0b52b8175924b808b54b88211669985fa
 SIZE (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 28957004
+SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
+SIZE (openoffice/unowinreg.dll) = 6144



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811242336.wAONa7VT016752>