svn commit: r400472 - in head/editors/openoffice-4: . files
Don Lewis
truckman at FreeBSD.org
Thu Oct 29 16:29:52 UTC 2015
Author: truckman
Date: Thu Oct 29 16:29:50 2015
New Revision: 400472
URL: https://svnweb.freebsd.org/changeset/ports/400472
Log:
Upgrade to Apache OpenOffice 4.1.2
* Release Notes:
<https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.2+Release+Notes
>
* Bug Fixes: <http://s.apache.org/9uI>
* Improvements / Enhancements
o Several distinct enhancements were applied to the WebDAV
management and file locking: OpenOffice is now able to properly
interact with Microsoft Sharepoint, enabling a more productive
usage in corporate-level environments. These enhancements were
funded, and contributed upstream, by the Emilia-Romagna regional
administration (Italy), where OpenOffice was adopted a few years
ago.
o The PDF export dialog was redesigned for better usability on small
laptop screens.
o Underlying libraries for the solver and digital signing
functionality have been updated, for better performance and
increased security.
o OpenOffice 4.1.2 fixes security vulnerabilities. See:
<http://www.openoffice.org/security/bulletin.html>.
Note: CVE-2015-1774 was previously fixed in the FreeBSD port.
* Removed/Retired Features
o Support for the ancient .hwp file format was retired. This was
a rarely used format created with versions of the program named
"Hangul Word Processor" prior to 1997; therefore impact on users
is expected to be minimal. The few users who have files in the
.hwp format should convert them to ODF using Apache OpenOffice
4.1.1 before upgrading.
Nuke the patches or the parts of patches that have been committed
upstream.
Add an option to build and install the SDK and disable it by default.
The port has been building it all along, but not installing it. We
save only a small amount of time by not building it, but installing it
would require about 70 MB of extra space space. The FreeBSD port has
been patched to allow building the SDK with OpenJDK8.
Add an option to build and install the Wiki Publisher extension. If
it is enabled, it is now handled as an integrated extension, so the
user does not have manually use the extension manager to track it down
and install it.
Tweak an existing script to install the icons instead of using a bunch
of complicated code in the Makefile. Add USES=shared-mime-info.
Nuke some unused targets in Makefiles.others. The SDK is now explicitly
handled as an option, and the Uno Runtime Environment hasn't had the
capability for separate installation in quite some time.
Nuke an extraneous "-" from the tar command when unpacking the
installation archive during staging.
Added:
head/editors/openoffice-4/files/patch-configure.in (contents, props changed)
head/editors/openoffice-4/files/patch-solenv_bin_modules_installer_scriptitems.pm (contents, props changed)
Deleted:
head/editors/openoffice-4/files/patch-CVE-2015-1774
head/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_cpp2uno.cxx
head/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_except.cxx
head/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_share.hxx
head/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__intel_uno2cpp.cxx
head/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_cpp2uno.cxx
head/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_except.cxx
head/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_share.hxx
head/editors/openoffice-4/files/patch-bridges_source_cpp__uno_gcc3__freebsd__x86-64_uno2cpp.cxx
head/editors/openoffice-4/files/patch-build_framework
head/editors/openoffice-4/files/patch-jpeg
head/editors/openoffice-4/files/patch-nss
head/editors/openoffice-4/files/patch-sal
head/editors/openoffice-4/files/patch-shell_source_unix_sysshell_recently__used__file__handler.cxx
head/editors/openoffice-4/files/patch-testtools_source_bridgetest_bridgetest.cxx
head/editors/openoffice-4/files/patch-webdav
Modified:
head/editors/openoffice-4/Makefile
head/editors/openoffice-4/distinfo
head/editors/openoffice-4/files/Makefile.others
head/editors/openoffice-4/files/pkg-message.in
Modified: head/editors/openoffice-4/Makefile
==============================================================================
--- head/editors/openoffice-4/Makefile Thu Oct 29 16:23:23 2015 (r400471)
+++ head/editors/openoffice-4/Makefile Thu Oct 29 16:29:50 2015 (r400472)
@@ -3,7 +3,6 @@
PORTNAME= apache-openoffice
PORTVERSION= ${AOOVERSION}
-PORTREVISION= 18
CATEGORIES= editors java
MASTER_SITES= APACHE/openoffice/${PORTVERSION}/source \
http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \
@@ -97,10 +96,10 @@ RUN_DEPENDS= \
AOOVERSION1= 4
AOOVERSION2= 1
-AOOVERSION3= 1
+AOOVERSION3= 2
# From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD
-AOOTAG= AOO411m6\(Build:9775\)
-SVNREVISION= 1617669
+AOOTAG= AOO412m3\(Build:9782\)
+SVNREVISION= 1709696
EXTSRC= ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz
AOOVERSION= ${AOOVERSION1}.${AOOVERSION2}.${AOOVERSION3}
@@ -129,17 +128,19 @@ USE_XORG= ice x11 xau xaw xcomposite xcu
xrandr xrender xt
USES= autoreconf:autoconf bison compiler cpe desktop-file-utils \
gettext-runtime gmake iconv jpeg perl5 pkgconfig python \
- tar:bzip2
+ shared-mime-info tar:bzip2
INSTALLS_ICONS= yes
WITHOUT_CPU_CFLAGS= true
CPE_PRODUCT= ${PORTNAME:S|apache-||}
CPE_VENDOR= apache
-OPTIONS_DEFINE= CUPS GNOME GNOMEVFS MMEDIA CCACHE
-OPTIONS_DEFAULT= CUPS GNOME GNOMEVFS MMEDIA
+OPTIONS_DEFINE= CUPS GNOME GNOMEVFS MMEDIA SDK WIKI_PUBLISHER CCACHE
+OPTIONS_DEFAULT= CUPS GNOME GNOMEVFS MMEDIA WIKI_PUBLISHER
GNOME_DESC= GConf + screensaver presentation control via DBUS
GNOMEVFS_DESC= GNOME Virtual File System
MMEDIA_DESC= Multimedia backend for impress
+SDK_DESC= Build and install software development kit
+WIKI_PUBLISHER_DESC= Build and install Wiki Publisher extension
CCACHE_DESC= Mimimize compile time of C/C++ programs
CUPS_CONFIGURE_ENABLE= cups
@@ -157,6 +158,11 @@ GNOMEVFS_USE= GNOME=gnomevfs2
MMEDIA_CONFIGURE_ENABLE= gstreamer
MMEDIA_USE= GSTREAMER=yes
+SDK_CONFIGURE_ENABLE= odk
+
+WIKI_PUBLISHER_CONFIGURE_ENABLE= wiki-publisher
+WIKI_PUBLISHER_VARS= BUNDLED_EXTENSIONS+=swext/wiki-publisher.oxt
+
.include <bsd.port.pre.mk>
.include <${FILESDIR}/Makefile.localized>
@@ -254,16 +260,14 @@ CONFIGURE_ARGS+= \
--with-vendor="FreeBSD ports system" \
--enable-verbose \
--with-system-vigra \
- --enable-wiki-publisher \
--with-system-xrender \
--with-system-zlib
-#AOOEXTENSIONS+= minimizer/presentation-minimizer.oxt
-#AOOEXTENSIONS+= presenter/presenter-screen.oxt
-#AOOEXTENSIONS+= pdfimport/pdfimport.oxt
-AOOEXTENSIONS+= swext/wiki-publisher.oxt
+.if defined (BUNDLED_EXTENSIONS)
+CONFIGURE_ARGS+= --with-bundled-prereg-extensions="${BUNDLED_EXTENSIONS}"
+.endif
-ICONS= ${WRKSRC}/sysui/desktop/icons
+CREATE_TREE= ${WRKSRC}/sysui/desktop/share/create_tree.sh
.include <${FILESDIR}/Makefile.knobs>
@@ -326,6 +330,7 @@ post-patch:
${WRKSRC}/sysui/desktop/productversion.mk
${REINPLACE_CMD} -e "s|%%JAVA_HOME%%|${JAVA_HOME}|" \
${WRKSRC}/desktop/scripts/soffice.sh
+ ${REINPLACE_CMD} -e '/^mkdir -p/,$$d' ${CREATE_TREE}
.if ${COMPILER_TYPE} == gcc
# g++49 -Os sometimes leaves inline class methods undefined,
# affects fmgridif.cxx and ColumnControl.cxx
@@ -390,19 +395,15 @@ do-build:
LANG=C LC_ALL=C build.pl --all -P$${numproc} -- -P$${dmproc}
do-install:
- @${MKDIR} ${STAGEDIR}${PRINSTALLATION_BASEDIR}/extensions \
- ${STAGEDIR}${OOPATH}/uno_packages/cache/uno_packages \
- ${STAGEDIR}${DESKTOPDIR}
+ @${MKDIR} ${STAGEDIR}${PRINSTALLATION_BASEDIR} \
+ ${STAGEDIR}${DESKTOPDIR} \
+ ${STAGEDIR}${PREFIX}/share/mime/packages
@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/ ; \
for i in *.tar.?z ; do \
${ECHO_CMD} "extracting $$i" ; \
- ${TAR} -s '|./[^/]*/||' -xz -f $$i - \
+ ${TAR} -s '|./[^/]*/||' -xz -f $$i \
-C ${STAGEDIR}${PRINSTALLATION_BASEDIR} ; \
done
- @${ECHO_CMD} "installing extensions" ; \
- cd ${WRKSRC}/solver/${AOOXXX}/unxfbsd?.pro/bin/ ; \
- ${INSTALL_DATA} ${AOOEXTENSIONS} \
- ${STAGEDIR}${PRINSTALLATION_BASEDIR}/extensions/
${FIND} ${STAGEDIR}${PRINSTALLATION_BASEDIR} -type d -exec ${CHMOD} 755 {} \;
${REINPLACE_CMD} \
-e '/^UserInstallation/s/=.*/=$$SYSUSERCONFIG\/${AOOUDIR}/' \
@@ -419,30 +420,33 @@ do-install:
simpress smath spadmin swriter ; do \
${LN} -f ${EXECBASE} ${EXECBASE}-$${i} ; \
done
- ${LN} -sf ${XDGDIR} ${STAGEDIR}${DESKTOPDIR}/${EXECBASE}
- @${ECHO_CMD} "installing application icons"
- @cd ${ICONS} ; for dir in hicolor/*/apps ; do \
- ${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/$${dir} ; \
- for app in base calc draw impress math printeradmin startcenter writer; do \
- icon_src=$${dir}/$${app}.png; \
- icon_dst=share/icons/$${dir}/${EXECBASE}-$${app}.png; \
- if [ -r $${icon_src} ]; then \
- ${INSTALL_DATA} $${icon_src} \
- ${STAGEDIR}${PREFIX}/$${icon_dst} ; \
- fi \
- done ; \
- done
- @${ECHO_CMD} "installing mimetype icons"
- @cd ${ICONS} ; for dir in hicolor/*/mimetypes ; do \
- dstdir=${STAGEDIR}${PREFIX}/share/icons/$${dir} ; \
- ${MKDIR} $${dstdir} ; \
- ${INSTALL_DATA} $${dir}/*.png $${dstdir}/ ; \
- done
+ @${ECHO_CMD} "adding desktop support"
+ @${LN} -sf ${XDGDIR} ${STAGEDIR}${DESKTOPDIR}/${EXECBASE}
+ @cd ${WRKSRC}/sysui/unxfbsd?.pro/misc/openoffice ; \
+ DESTDIR=${STAGEDIR} \
+ GNOMEDIR=${PREFIX} \
+ ICON_PREFIX=openoffice${AOOVERSION1} \
+ ICON_SOURCE_DIR=${WRKSRC}/sysui/desktop/icons \
+ ICON_THEMES="hicolor/??x??" \
+ KDEMAINDIR=${PREFIX} \
+ PREFIX=openoffice${AOOVERSION1} \
+ ${SH} ${CREATE_TREE} ; \
+ ${INSTALL_DATA} apacheopenoffice.xml \
+ ${STAGEDIR}/${PREFIX}/share/mime/packages
+
+do-install-SDK-on:
+ ${TAR} -s '|./[^/]*/||' -xz -C ${STAGEDIR}${PRINSTALLATION_BASEDIR} \
+ -f ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice_SDK/archive/install/${LOCALIZED_LANG}/*.tar.gz
+ @f=${STAGEDIR}${OOPATH}/sdk/bin/unoapploader ; \
+ ${CHMOD} 644 $${f} ; ${STRIP_CMD} $${f} ; ${CHMOD} 444 $${f}
+
+post-install:
@${ECHO_CMD} "generating plist";
@cd ${STAGEDIR}${PREFIX} ; (\
- ${ECHO_CMD} "share/applications/${EXECBASE}" ; \
${FIND} -s bin -name "${EXECBASE}*" ; \
- ${FIND} -s ${INSTALLATION_BASEDIR} share/icons \! -type d ; \
+ ${FIND} -s ${INSTALLATION_BASEDIR} share/applications \
+ share/application-registry share/icons \
+ share/mime-info share/mime share/mimelnk \! -type d ; \
${FIND} ${INSTALLATION_BASEDIR} -type d -empty | ${SORT} -r | \
${SED} -e 's/^/@dir /' ; \
) >> ${TMPPLIST}
Modified: head/editors/openoffice-4/distinfo
==============================================================================
--- head/editors/openoffice-4/distinfo Thu Oct 29 16:23:23 2015 (r400471)
+++ head/editors/openoffice-4/distinfo Thu Oct 29 16:29:50 2015 (r400472)
@@ -1,5 +1,5 @@
-SHA256 (openoffice/apache-openoffice-4.1.1-r1617669-src.tar.bz2) = bb89a6d2324ddfe4c475e5484fde0dea316078f6b8ff4d8a4ebc801d17f3ff9f
-SIZE (openoffice/apache-openoffice-4.1.1-r1617669-src.tar.bz2) = 219054455
+SHA256 (openoffice/apache-openoffice-4.1.2-r1709696-src.tar.bz2) = 2e06774424eb564559f9e6d63ff79aa00522b210067717c5a8cfb54b3b7f1812
+SIZE (openoffice/apache-openoffice-4.1.2-r1709696-src.tar.bz2) = 219041975
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-4/files/Makefile.others
==============================================================================
--- head/editors/openoffice-4/files/Makefile.others Thu Oct 29 16:23:23 2015 (r400471)
+++ head/editors/openoffice-4/files/Makefile.others Thu Oct 29 16:29:50 2015 (r400472)
@@ -3,43 +3,9 @@
# $FreeBSD$
#other stuffs which are not directly related to making ports
-#package-rename: rename package for uploading
-#package-canonical: making official packages (WIP)
-#ure: URE (Uno Runtime Environment) packages (WIP)
#solver: solver
#languagepack: language pack
-package-rename:
- @${ECHO_MSG} "===> Rename package for Apache OpenOffice mirror upload";
- @${LN} ${PKGFILE} \
- ${WRKDIR}/../${PACKAGE_PREFIX}_${PACKAGE_MIDDLE}_install_${LOCALIZED_LANG}${PKG_SUFX}
-
-package-canonical:
- @${ECHO_MSG} "===> Canonical packaging for Apache OpenOffice";
- @${CP} ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/${PACKAGE_PREFIX}* ${WRKDIR}/../.
-
-sdk:
- @${ECHO_MSG} "===> Make SDK of Apache OpenOffice"
- @${RM} -fr ${WRKDIR}/sdk_tmp
- @${MKDIR} ${WRKDIR}/sdk_tmp
- @cd ${WRKDIR}/sdk_tmp ; \
- ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice_SDK/archive/install/${LOCALIZED_LANG}/Apache_OpenOffice-*SDK*.tar.gz
- @cd ${WRKDIR}/sdk_tmp/Apache_*/openoffice* ; \
- ${MKDIR} ../${INSTALLATION_BASEDIR}_sdk ; \
- ${MV} * ../${INSTALLATION_BASEDIR}_sdk ; cd .. ; \
- ${TAR} cfj ${WRKDIR}/../${PACKAGE_PREFIX}-SDK_${PACKAGE_MIDDLE}_install_en-US.tbz ${INSTALLATION_BASEDIR}_sdk
-
-ure:
- @${ECHO_MSG} "===> Make Uno Runtime Environment of Apache OpenOffice"
- @${RM} -fr ${WRKDIR}/ure_tmp
- @${MKDIR} ${WRKDIR}/ure_tmp
- @cd ${WRKDIR}/ure_tmp ; \
- ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/URE/archive/install/${LOCALIZED_LANG}/Apache_OpenOffice_*URE*.tar.gz
- @cd ${WRKDIR}/ure_tmp/Apache_OpenOffice*URE* ; \
- ${MKDIR} ../${INSTALLATION_BASEDIR} ; \
- ${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \
- ${TAR} cfj ${WRKDIR}/../${PACKAGE_PREFIX}-URE_${PACKAGE_MIDDLE}_install_en-US.tbz ${INSTALLATION_BASEDIR}
-
solver:
@${ECHO_MSG} "===> Make Solver of Apache OpenOffice"
@cd ${WRKSRC} ; ${TAR} cfj ${WRKDIR}/../${PACKAGE_PREFIX}-solver_${PACKAGE_MIDDLE}.tar.bz2 solver
Added: head/editors/openoffice-4/files/patch-configure.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/openoffice-4/files/patch-configure.in Thu Oct 29 16:29:50 2015 (r400472)
@@ -0,0 +1,32 @@
+--- configure.in.orig 2015-10-09 07:11:14 UTC
++++ configure.in
+@@ -369,11 +369,11 @@ AC_ARG_WITH(bundled-extension-blobs,
+ and comply with their distribution requirements by updating the
+ files LICENSE_aggregated and NOTICE_aggregated accordingly
+ ],,)
+-#AC_ARG_WITH(bundled-prereg-extensions,
+-#[ --with-bundled-prereg-extensions Whitespace seperated list of files in the tarball directory that
+-# are to be bundled as pre-registered extensions. Make sure to only bundle
+-# extensions which can be installed without requiring a license dialog
+-#],,)
++AC_ARG_WITH(bundled-prereg-extensions,
++[ --with-bundled-prereg-extensions Whitespace seperated list of files in the tarball directory that
++ are to be bundled as pre-registered extensions. Make sure to only bundle
++ extensions which can be installed without requiring a license dialog
++],,)
+ AC_ARG_ENABLE(bundled-dictionaries,
+ [ --enable-bundled-dictionaries Download dictionaries (spelling, hyphenation, thesaurus)
+ according to main/extensions.lst and bundle them. Make sure to
+@@ -1540,9 +1540,9 @@ else
+ fi
+ AC_SUBST(BUNDLED_EXTENSION_BLOBS)
+
+-#dnl ===================================================================
+-#dnl Check extensions that are to be bundled as pre-registerd
+-#dnl ===================================================================
++dnl ===================================================================
++dnl Check extensions that are to be bundled as pre-registerd
++dnl ===================================================================
+ if test -n "$with_bundled_prereg_extensions"; then
+ BUNDLED_PREREG_EXTENSIONS="$with_bundled_prereg_extensions"
+ else
Added: head/editors/openoffice-4/files/patch-solenv_bin_modules_installer_scriptitems.pm
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/openoffice-4/files/patch-solenv_bin_modules_installer_scriptitems.pm Thu Oct 29 16:29:50 2015 (r400472)
@@ -0,0 +1,20 @@
+--- solenv/bin/modules/installer/scriptitems.pm.orig 2014-02-27 09:52:15 UTC
++++ solenv/bin/modules/installer/scriptitems.pm
+@@ -608,7 +608,7 @@
+ }
+
+ # Find the prereg directory entry so that we can create a new sub-directory.
+- my $parentdir_gid = "gid_Brand_Dir_Share_Prereg_Bundled";
++ my $parentdir_gid = "gid_Brand_Dir_Share_Extensions";
+ my $parentdir = undef;
+ foreach my $dir (@{$dirsref})
+ {
+@@ -645,7 +645,7 @@
+ 'UnixRights' => '444',
+ 'sourcepath' => File::Spec->catfile($ENV{'OUTDIR'}, "bin", $filename),
+ 'specificlanguage' => "",
+- 'modules' => "gid_Module_Dictionaries",
++ 'modules' => "gid_Module_Root_Brand",
+ 'gid' => "gid_File_Extension_".$basename
+ };
+ push( @filelist, $onefile);
Modified: head/editors/openoffice-4/files/pkg-message.in
==============================================================================
--- head/editors/openoffice-4/files/pkg-message.in Thu Oct 29 16:23:23 2015 (r400471)
+++ head/editors/openoffice-4/files/pkg-message.in Thu Oct 29 16:29:50 2015 (r400472)
@@ -34,8 +34,8 @@ OpenOffice does need $LANG to be set to
4. Wiki Publisher Extension
---------------------------
-The Wiki Publisher extension can be installed from
-%%PRINSTALLATION_BASEDIR%%/extensions/
+The Wiki Publisher extension is now an integrated extension and manual
+installation with the extension manager is no longer needed.
5. If you run into problems
---------------------------
More information about the svn-ports-head
mailing list