summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
Diffstat (limited to 'editors')
-rw-r--r--editors/openoffice-devel/Makefile12
-rw-r--r--editors/openoffice-devel/distinfo6
-rw-r--r--editors/openoffice-devel/files/patch-extensions.lst14
3 files changed, 15 insertions, 17 deletions
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index 0c50edf018d3..41bdf8551c07 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -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
diff --git a/editors/openoffice-devel/distinfo b/editors/openoffice-devel/distinfo
index 391443af9d74..752606e0c301 100644
--- a/editors/openoffice-devel/distinfo
+++ b/editors/openoffice-devel/distinfo
@@ -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
diff --git a/editors/openoffice-devel/files/patch-extensions.lst b/editors/openoffice-devel/files/patch-extensions.lst
index 66222d8fdf3f..4fba8afb08ab 100644
--- a/editors/openoffice-devel/files/patch-extensions.lst
+++ b/editors/openoffice-devel/files/patch-extensions.lst
@@ -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"