From owner-svn-ports-all@freebsd.org Wed Feb 20 06:42:31 2019 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 EC00B14E7F23; Wed, 20 Feb 2019 06:42:30 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8D90B8F591; Wed, 20 Feb 2019 06:42:30 +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 7FE35199A; Wed, 20 Feb 2019 06:42:30 +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 x1K6gUM1005030; Wed, 20 Feb 2019 06:42:30 GMT (envelope-from truckman@FreeBSD.org) Received: (from truckman@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1K6gUas005027; Wed, 20 Feb 2019 06:42:30 GMT (envelope-from truckman@FreeBSD.org) Message-Id: <201902200642.x1K6gUas005027@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: truckman set sender to truckman@FreeBSD.org using -f From: Don Lewis Date: Wed, 20 Feb 2019 06:42:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r493409 - in head/editors/openoffice-devel: . files X-SVN-Group: ports-head X-SVN-Commit-Author: truckman X-SVN-Commit-Paths: in head/editors/openoffice-devel: . files X-SVN-Commit-Revision: 493409 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 8D90B8F591 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.964,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.999,0] 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: Wed, 20 Feb 2019 06:42:31 -0000 Author: truckman Date: Wed Feb 20 06:42:29 2019 New Revision: 493409 URL: https://svnweb.freebsd.org/changeset/ports/493409 Log: Switch openoffice-devel to the upstream AOO42X branch from trunk and upgrade to svn revision 1853744. This is on the path to the upcoming release of version 4.2.0. Disable the PDFIMPORT option and mark it broken. This extension does not get built unless a compatible version of poppler is available. Modified: head/editors/openoffice-devel/Makefile head/editors/openoffice-devel/distinfo head/editors/openoffice-devel/files/patch-extensions.lst Modified: head/editors/openoffice-devel/Makefile ============================================================================== --- head/editors/openoffice-devel/Makefile Wed Feb 20 06:22:10 2019 (r493408) +++ head/editors/openoffice-devel/Makefile Wed Feb 20 06:42:29 2019 (r493409) @@ -3,7 +3,7 @@ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION} -PORTREVISION= 5 +#PORTREVISION= 1 PORTEPOCH= 4 CATEGORIES= editors java MASTER_SITES= https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-r${SVNREVISION}/source/ \ @@ -118,8 +118,8 @@ AOOVERSION1= 4 AOOVERSION2= 2 AOOVERSION3= 0 # From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD -AOOTAG= AOO420m1\(Build:9800\) -SVNREVISION= 1847189 +AOOTAG= AOO420m1\(Build:9820\) +SVNREVISION= 1853744 #AOORC=rc3 EXTSRC= ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz @@ -152,7 +152,7 @@ CPE_VENDOR= apache OPTIONS_DEFINE= CRASHDUMP CUPS DBGUTIL DEBUG GNOME GNOMEVFS MMEDIA \ MYSQL PDFIMPORT REPORT_BUILDER SDK WIKI_PUBLISHER -OPTIONS_DEFAULT= CUPS GNOME MMEDIA PDFIMPORT WIKI_PUBLISHER +OPTIONS_DEFAULT= CUPS GNOME MMEDIA WIKI_PUBLISHER CRASHDUMP_DESC= Enable crashdumps, sets WITH_DEBUG DBGUTIL_DESC= Enable assertions, object counting. (non-production) DEBUG_DESC= Compile with -O0, sets WITH_DEBUG @@ -196,9 +196,7 @@ MYSQL_USES= mysql SDK_CONFIGURE_ENABLE= odk SDK_DISTFILES= unowinreg.dll:unoreg -# The current version of openoffice is not compatible with the changed API and -# requirements of popller-0.7x. Switch to using bundled version for now. -CONFIGURE_ARGS+= --without-system-poppler +PDFIMPORT_BROKEN= PDFIMPORT is not compatible with poppler-0.7x API PDFIMPORT_CONFIGURE_ENABLE= pdfimport REPORT_BUILDER_BROKEN= REPORT_BUILDER option requires additional .jar files Modified: head/editors/openoffice-devel/distinfo ============================================================================== --- head/editors/openoffice-devel/distinfo Wed Feb 20 06:22:10 2019 (r493408) +++ head/editors/openoffice-devel/distinfo Wed Feb 20 06:42:29 2019 (r493409) @@ -1,6 +1,6 @@ -TIMESTAMP = 1542995937 -SHA256 (openoffice/apache-openoffice-r1847189-src.tar.xz) = 6be9bb6bcff11d3c3ca18a3eede23270732bfb3cf00e112dbcd06c3a751c4c3b -SIZE (openoffice/apache-openoffice-r1847189-src.tar.xz) = 217492744 +TIMESTAMP = 1550561983 +SHA256 (openoffice/apache-openoffice-r1853744-src.tar.xz) = 5d993b173ea101c109ebcccce515d2697681e924a13cc6c9cfb1ba392ccc751a +SIZE (openoffice/apache-openoffice-r1853744-src.tar.xz) = 230918140 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 Modified: head/editors/openoffice-devel/files/patch-extensions.lst ============================================================================== --- head/editors/openoffice-devel/files/patch-extensions.lst Wed Feb 20 06:22:10 2019 (r493408) +++ head/editors/openoffice-devel/files/patch-extensions.lst Wed Feb 20 06:42:29 2019 (r493409) @@ -1,8 +1,8 @@ ---- extensions.lst.orig 2015-10-24 06:26:40 UTC +--- extensions.lst.orig 2019-02-19 00:04:48 UTC +++ extensions.lst -@@ -37,6 +37,18 @@ - # [ language=all && ENABLE_XXX ] - # file://XXX.oxt +@@ -38,6 +38,18 @@ + #[ language=all && ENABLE_XXX ] + # file://XXX.oxt +# PDF Import extension +[ language=all && ENABLE_PDFIMPORT=YES ] @@ -16,6 +16,6 @@ +[ language=all && ENABLE_MEDIAWIKI=YES ] + file://swext/wiki-publisher.oxt + - # English dictionary - [ language=en.* || language=de || language=it ] - f5f6aab4cc5d92a34ab13ad15332770c http://sourceforge.net/projects/aoo-extensions/files/17102/21/dict-en.oxt/download "dict-en.oxt" + # Asturian dictionary + [ language=ast ] + 5d27b496b3e194f01f0afae82c226b64 https://sourceforge.net/projects/aoo-extensions/files/3932/3/ort_ast_20190216_1129.oxt/download "dict-ast.oxt"