svn commit: r472230 - in head/editors/openoffice-devel: . files
Don Lewis
truckman at FreeBSD.org
Tue Jun 12 04:00:09 UTC 2018
Author: truckman
Date: Tue Jun 12 04:00:07 2018
New Revision: 472230
URL: https://svnweb.freebsd.org/changeset/ports/472230
Log:
Upgrade to Apache OpenOffice trunk SVN revsion r1833124. This includes
the bug fix in extra-patch-align16 needed for amd64. [1]
Instead of symlinking the directory containing the OpenOffice .desktop
files under $PREFIX/share/applications, symlink the individual .desktop
files. This is what upstream does on Linux and what LibreOffice does
as well. The Plasma 5 desktop ignores symlinks to directories when it
is scanning for .desktop files.
PR: 228030 [1]
Reported by: kan
Deleted:
head/editors/openoffice-devel/files/extra-patch-align16
Modified:
head/editors/openoffice-devel/Makefile
head/editors/openoffice-devel/distinfo
Modified: head/editors/openoffice-devel/Makefile
==============================================================================
--- head/editors/openoffice-devel/Makefile Tue Jun 12 03:55:02 2018 (r472229)
+++ head/editors/openoffice-devel/Makefile Tue Jun 12 04:00:07 2018 (r472230)
@@ -105,7 +105,7 @@ AOOVERSION2= 2
AOOVERSION3= 0
# From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD
AOOTAG= AOO420m1\(Build:9800\)
-SVNREVISION= 1829757
+SVNREVISION= 1833124
#AOORC=rc3
EXTSRC= ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz
@@ -237,9 +237,6 @@ CONFIGURE_ARGS+= --without-commons-logging
.if ${COMPILER_TYPE} == clang
CPPFLAGS+= -I${LOCALBASE}/include
-. if ${COMPILER_VERSION} >= 40 && ${ARCH} == amd64
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-align16
-. endif
.endif
.if ${ARCH} == amd64
@@ -462,7 +459,6 @@ do-install:
${LN} -f ${EXECBASE} ${EXECBASE}-$${i} ; \
done
@${ECHO_CMD} "adding desktop support"
- @${LN} -sf ${XDGREL} ${STAGEDIR}${DESKTOPDIR}/${EXECBASE}
@cd ${WRKSRC} ; \
. ${FREEBSD_ENV_SET} ; \
cd sysui/$${INPATH}/misc/openoffice ; \
@@ -476,6 +472,10 @@ do-install:
${SH} ${CREATE_TREE} ; \
${INSTALL_DATA} apacheopenoffice.xml \
${STAGEDIR}/${PREFIX}/share/mime/packages
+ @cd ${STAGEDIR}${DESKTOPDIR}; for i in base calc draw impress \
+ javafilter math printeradmin qstart startcenter writer ; do \
+ ${LN} -sf ${XDGREL}/$${i}.desktop ${EXECBASE}-$${i}.desktop ; \
+ done
do-install-SDK-on:
${TAR} -s '|./[^/]*/||' -xz -C ${STAGEDIR}${PRINSTALLATION_BASEDIR} \
Modified: head/editors/openoffice-devel/distinfo
==============================================================================
--- head/editors/openoffice-devel/distinfo Tue Jun 12 03:55:02 2018 (r472229)
+++ head/editors/openoffice-devel/distinfo Tue Jun 12 04:00:07 2018 (r472230)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1524355278
-SHA256 (openoffice/apache-openoffice-r1829757-src.tar.xz) = b3aed2de74f2c1ba455c9819f5066180b498e2af8b66b0cbe57860472a2f881e
-SIZE (openoffice/apache-openoffice-r1829757-src.tar.xz) = 216040176
+TIMESTAMP = 1528673578
+SHA256 (openoffice/apache-openoffice-r1833124-src.tar.xz) = a1c68e2691da912f2e2df43e9babc2721c9cdea2cdc28982e22ee30d7158090d
+SIZE (openoffice/apache-openoffice-r1833124-src.tar.xz) = 216168344
SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 966a8333c83a18ddd84401389006d6e0b52b8175924b808b54b88211669985fa
SIZE (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 28957004
More information about the svn-ports-all
mailing list