From f0054f4f2dee4ba5cd67d5010b6c158044a61cef Mon Sep 17 00:00:00 2001 From: Don Lewis Date: Mon, 19 Nov 2018 03:38:02 +0000 Subject: [PATCH] MFH: r485282 Upgrade editors/openoffice-4 to version 4.1.6: * Fixed bugs which caused improper handling (crashes) when using Microsoft Drawing Binary File format * Fix a loop that visits all objects on a page so that all objects get visited * Updated logos Release notes: https://s.apache.org/AOO-416releasenotes Pet portlint (add missing USES= entries). Approved by: ports-secteam (miwi) --- editors/openoffice-4/Makefile | 16 +++++++--------- editors/openoffice-4/distinfo | 8 +++----- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile index ee945d0bd067..60e8387ba224 100644 --- a/editors/openoffice-4/Makefile +++ b/editors/openoffice-4/Makefile @@ -3,9 +3,8 @@ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION} -PORTREVISION= 10 CATEGORIES= editors java -MASTER_SITES= APACHE/openoffice/${PORTVERSION}/sources \ +MASTER_SITES= APACHE/openoffice/${PORTVERSION}/source \ http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \ LOCAL/truckman/openoffice:extsrc .if defined(LANG_PKGNAME) @@ -96,10 +95,9 @@ RUN_DEPENDS= \ ${LOCALBASE}/share/fonts/Carlito/Carlito-Bold.ttf:x11-fonts/crosextrafonts-carlito-ttf \ ${LOCALBASE}/share/fonts/ChromeOS/Arimo-Bold.ttf:x11-fonts/croscorefonts-fonts-ttf -USES= autoreconf bison compiler:c++11-lib cpe \ - desktop-file-utils \ - gettext-runtime gmake iconv jpeg perl5 pkgconfig python:2.7 \ - shared-mime-info ssl tar:bzip2 +USES= autoreconf bison compiler:c++11-lib cpe desktop-file-utils \ + gettext-runtime gl gmake gnome iconv jpeg perl5 pkgconfig \ + python:2.7 shared-mime-info ssl tar:bzip2 USE_GL= gl glu USE_GNOME= gtk20 libxslt libidl glib20 USE_JAVA= yes @@ -115,10 +113,10 @@ CONFLICTS_INSTALL= apache-openoffice-devel-* AOOVERSION1= 4 AOOVERSION2= 1 -AOOVERSION3= 5 +AOOVERSION3= 6 # From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD -AOOTAG= AOO415m1\(Build:9789\) -SVNREVISION= 1817496 +AOOTAG= AOO416m1\(Build:9790\) +SVNREVISION= 1844436 EXTSRC= ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz AOOVERSION= ${AOOVERSION1}.${AOOVERSION2}.${AOOVERSION3} diff --git a/editors/openoffice-4/distinfo b/editors/openoffice-4/distinfo index 5d92e6ca9a14..57898edf0756 100644 --- a/editors/openoffice-4/distinfo +++ b/editors/openoffice-4/distinfo @@ -1,7 +1,5 @@ -TIMESTAMP = 1513127206 -SHA256 (openoffice/apache-openoffice-4.1.5-r1817496-src.tar.bz2) = e0d77e762a1554f2a08d0f12c9a958b87632e8adede5c5bafba0bb94d8c96a65 -SIZE (openoffice/apache-openoffice-4.1.5-r1817496-src.tar.bz2) = 219094040 -SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c -SIZE (openoffice/unowinreg.dll) = 6144 +TIMESTAMP = 1542135943 +SHA256 (openoffice/apache-openoffice-4.1.6-r1844436-src.tar.bz2) = 5189880207977a0fd6d4ef5eada7d18d8dbf94cddcc71822889cfb6c82cfed18 +SIZE (openoffice/apache-openoffice-4.1.6-r1844436-src.tar.bz2) = 220017032 SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 966a8333c83a18ddd84401389006d6e0b52b8175924b808b54b88211669985fa SIZE (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 28957004