cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade to Apache OpenOffice 4.1.5.

Browse Source 
The following bugs are fixed:
    BZ 127568 Diagrams become corrupt (not retrievable) when Calc document
	      is saved

    BZ 127580 Fix for Issue 127568 created a new bug in Base

    BZ 127581 Writer crashes after copying all content
This commit is contained in:
Don Lewis 2017-12-31 00:00:06 +00:00
parent e0f1948e0f
commit 0830d4503b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=457654
3 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
editors/openoffice-4/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= apache-openoffice
PORTVERSION= ${AOOVERSION}
PORTREVISION= 1
PORTREVISION= 0
CATEGORIES= editors java
MASTER_SITES= APACHE/openoffice/${PORTVERSION}/sources \
http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \
@ -100,10 +100,10 @@ CONFLICTS_INSTALL= apache-openoffice-devel-*
AOOVERSION1= 4
AOOVERSION2= 1
AOOVERSION3= 4
AOOVERSION3= 5
# From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD
AOOTAG= AOO414m5\(Build:9788\)
SVNREVISION= 1811857
AOOTAG= AOO415m1\(Build:9789\)
SVNREVISION= 1817496
EXTSRC= ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz
AOOVERSION= ${AOOVERSION1}.${AOOVERSION2}.${AOOVERSION3}

6
editors/openoffice-4/distinfo
View File

@ -1,6 +1,6 @@
TIMESTAMP = 1507773303
SHA256 (openoffice/apache-openoffice-4.1.4-r1811857-src.tar.bz2) = 7fdda4e30fec6663fcef07531674056777271ae99cfe708efab55c702e3b8d64
SIZE (openoffice/apache-openoffice-4.1.4-r1811857-src.tar.bz2) = 219097203
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
SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 966a8333c83a18ddd84401389006d6e0b52b8175924b808b54b88211669985fa

18
editors/openoffice-4/files/patch-framework_Library__fwk.mk
View File

@ -1,14 +1,12 @@
--- framework/Library_fwk.mk.orig 2017-10-11 11:40:20 UTC
--- framework/Library_fwk.mk.orig 2017-11-27 17:03:35 UTC
+++ framework/Library_fwk.mk
@@ -186,4 +186,11 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\
framework/source/xml/imagesdocumenthandler \
@@ -187,7 +187,8 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\
))
+# i126622 - Base 4.1.2 does not open Tables and Queries in Mac OSX
+# Also affects FreeBSD 10.3 with clang 3.4.1.
+# Appears to be a clang optimization bug in versions less than 3.8.0
# i126622 - Base 4.1.2 does not open Tables and Queries in Mac OSX
-ifeq ($(OS),MACOSX)
+# Also appears to affect FreeBSD 10.3 with clang 3.4.1.
+ifeq ($(COM)$(CPUNAME),CLANGX86_64)
+$(call gb_CxxObject_get_target,framework/source/loadenv/loadenv): CXXFLAGS := $(gb_LinkTarget_CXXFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_COMPILERNOOPTFLAGS)
+endif
+
# vim: set noet sw=4 ts=4:
$(call gb_CxxObject_get_target,framework/source/loadenv/loadenv):\
CXXFLAGS := $(gb_LinkTarget_CXXFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_COMPILERNOOPTFLAGS)
endif