Date: Sun, 22 Apr 2018 17:09:14 +0000 (UTC) From: Don Lewis <truckman@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r468039 - in head/editors/openoffice-devel: . files Message-ID: <201804221709.w3MH9E7n081710@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: truckman Date: Sun Apr 22 17:09:14 2018 New Revision: 468039 URL: https://svnweb.freebsd.org/changeset/ports/468039 Log: Upgrade openoffice-devel to upstream SVN r1829757. The fix for compatibility with boost 1.67 has been upstreamed, so remove BROKEN. Upstream has switched from gstreamer 0.10 to gstreamer 1.x, so change our dependency to match. Don't specify an explicit LIB_DEPENDS in addition to USE_GSTREAMER1. Most of the patches to work around various compiler issues have been upstreamed, so remove them here. Modernize patch-framework_Library__fwk.mk. Deleted: head/editors/openoffice-devel/files/patch-solenv_gbuild_platform_freebsd.mk head/editors/openoffice-devel/files/patch-solenv_inc_unxfbsd.mk Modified: head/editors/openoffice-devel/Makefile head/editors/openoffice-devel/distinfo head/editors/openoffice-devel/files/patch-framework_Library__fwk.mk Modified: head/editors/openoffice-devel/Makefile ============================================================================== --- head/editors/openoffice-devel/Makefile Sun Apr 22 16:39:18 2018 (r468038) +++ head/editors/openoffice-devel/Makefile Sun Apr 22 17:09:14 2018 (r468039) @@ -3,7 +3,7 @@ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION} -PORTREVISION= 3 +#PORTREVISION= 1 PORTEPOCH= 4 CATEGORIES= editors java MASTER_SITES= https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-r${SVNREVISION}/source/ \ @@ -50,7 +50,6 @@ LICENSE_PERMS_TWAIN= dist-mirror dist-sell pkg-mirror LICENSE_PERMS_W3C= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept ONLY_FOR_ARCHS= amd64 i386 powerpc64 -BROKEN= fails to build with boost 1.67, see bug 227553 BUILD_DEPENDS= \ p5-Archive-Zip>=0:archivers/p5-Archive-Zip \ @@ -106,7 +105,7 @@ AOOVERSION2= 2 AOOVERSION3= 0 # From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD AOOTAG= AOO420m1\(Build:9800\) -SVNREVISION= 1822069 +SVNREVISION= 1829757 #AOORC=rc3 EXTSRC= ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz @@ -187,8 +186,7 @@ GNOMEVFS_CONFIGURE_ON= --disable-gio GNOMEVFS_USE= GNOME=gnomevfs2 MMEDIA_CONFIGURE_ENABLE= gstreamer -MMEDIA_LIB_DEPENDS= libgstreamer-0.10.so:multimedia/gstreamer -MMEDIA_USE= GSTREAMER=yes +MMEDIA_USE= GSTREAMER1=yes MYSQL_CONFIGURE_ENABLE= mysql-connector MYSQL_CONFIGURE_WITH= system-mysql @@ -394,28 +392,6 @@ post-patch: ${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 - # See: <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65009>; - if [ ${CXX} = g++49 ]; then \ - ${REINPLACE_CMD} -e "s/ := -Os/ := -Os -fno-devirtualize -fno-devirtualize-speculatively/" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk; \ - ${REINPLACE_CMD} -e "s/=-Os /=-Os -fno-devirtualize -fno-devirtualize-speculatively /" ${WRKSRC}/solenv/inc/unxfbsdi.mk; \ - fi -.elif ${ARCH} == i386 && ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 36 - # autodoc and uno (bridgetest) core dump when built with with -Os - # on i386, affects file.cxx and bridgetest.cxx (at least). - # Using -O2 optimiztion works, and -Os is essentially -O2 with out - # loop unrolling. - # Changing optimization in just unxfbsdi.mk is sufficient to get - # a successful build, but change it in both places to avoid the - # possibility of obscure runtime problems, which is likely - # since this seems to be a generic bug in code generation for - # exception handling. - # See: <https://llvm.org/bugs/show_bug.cgi?id=24792>; - ${REINPLACE_CMD} -e "s/=-Os /=-O2 -fno-unroll-loops /" ${WRKSRC}/solenv/inc/unxfbsdi.mk - ${REINPLACE_CMD} -e "s/ := -Os/ := -O2 -fno-unroll-loops/" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk -.endif do-build: ${PRINTF} "[repositories]\nmain=active\nextras=active\n" > ${WRKSUBDIR}/source_config Modified: head/editors/openoffice-devel/distinfo ============================================================================== --- head/editors/openoffice-devel/distinfo Sun Apr 22 16:39:18 2018 (r468038) +++ head/editors/openoffice-devel/distinfo Sun Apr 22 17:09:14 2018 (r468039) @@ -1,7 +1,5 @@ -TIMESTAMP = 1517014366 -SHA256 (openoffice/apache-openoffice-r1822069-src.tar.xz) = af0d92d8b1a860ea2f32c75db5848d022c4d38d089d937364300bb80ce6366cc -SIZE (openoffice/apache-openoffice-r1822069-src.tar.xz) = 216331420 -SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c -SIZE (openoffice/unowinreg.dll) = 6144 +TIMESTAMP = 1524355278 +SHA256 (openoffice/apache-openoffice-r1829757-src.tar.xz) = b3aed2de74f2c1ba455c9819f5066180b498e2af8b66b0cbe57860472a2f881e +SIZE (openoffice/apache-openoffice-r1829757-src.tar.xz) = 216040176 SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 966a8333c83a18ddd84401389006d6e0b52b8175924b808b54b88211669985fa SIZE (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 28957004 Modified: head/editors/openoffice-devel/files/patch-framework_Library__fwk.mk ============================================================================== --- head/editors/openoffice-devel/files/patch-framework_Library__fwk.mk Sun Apr 22 16:39:18 2018 (r468038) +++ head/editors/openoffice-devel/files/patch-framework_Library__fwk.mk Sun Apr 22 17:09:14 2018 (r468039) @@ -1,14 +1,15 @@ ---- framework/Library_fwk.mk.orig 2016-08-29 00:45:25 UTC +--- framework/Library_fwk.mk.orig 2018-04-13 00:55:26 UTC +++ framework/Library_fwk.mk -@@ -190,4 +190,11 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\ - framework/source/xml/imagesdocumenthandler \ +@@ -196,5 +196,12 @@ $(eval $(call gb_LinkTarget_set_cxx_optimization, \ + framework/source/loadenv/loadenv, $(gb_COMPILEROPT1FLAGS) \ )) - -+# i126622 - Base 4.1.2 does not open Tables and Queries in Mac OSX + endif +# Also affects FreeBSD 10.3 with clang 3.4.1. +# Appears to be a clang optimization bug in versions less than 3.8.0 +ifeq ($(COM)$(CPUNAME),CLANGX86_64) -+$(call gb_CxxObject_get_target,framework/source/loadenv/loadenv): T_CXXFLAGS := $(gb_LinkTarget_CXXFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_COMPILERNOOPTFLAGS) ++$(eval $(call gb_LinkTarget_set_cxx_optimization, \ ++ framework/source/loadenv/loadenv, $(gb_COMPILEROPT1FLAGS) \ ++)) +endif -+ + # vim: set noet sw=4 ts=4:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804221709.w3MH9E7n081710>