Index: head/editors/libreoffice/Makefile =================================================================== --- head/editors/libreoffice/Makefile (revision 442890) +++ head/editors/libreoffice/Makefile (revision 442891) @@ -1,330 +1,332 @@ # $FreeBSD$ .include "${.CURDIR}/Makefile.common" -PORTREVISION= 1 +PORTREVISION= 2 MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/${PORTVERSION}/ \ http://dev-www.libreoffice.org/src/:src \ http://dev-www.libreoffice.org/extern/:ext DISTFILES= ${PORTNAME}-${LOVERSION}${EXTRACT_SUFX} \ ${PORTNAME}-help-${LOVERSION}${EXTRACT_SUFX} DIST_SUBDIR= libreoffice EXTRACT_ONLY:= ${DISTFILES} COMMENT= Full integrated office productivity suite CONFLICTS_BUILD= mdds0 BUILD_DEPENDS= p5-Archive-Zip>=0:archivers/p5-Archive-Zip \ zip:archivers/zip \ ${LOCALBASE}/include/sqlext.h:databases/unixODBC \ - cppunit-config:devel/cppunit \ dmake:devel/dmake \ ${LOCALBASE}/bin/gperf:devel/gperf \ ${LOCALBASE}/include/mdds-1.2/mdds/global.hpp:devel/mdds \ gpatch:devel/patch \ ucpp:devel/ucpp \ ${LOCALBASE}/include/sane/sane.h:graphics/sane-backends \ vigra-config:graphics/vigra \ ${LOCALBASE}/include/glm/glm.hpp:math/glm \ bash:shells/bash \ gsed:textproc/gsed LIB_DEPENDS= libapr-1.so:devel/apr1 \ libboost_date_time.so:devel/boost-libs \ libicutu.so:devel/icu \ liblangtag.so:devel/liblangtag \ liborcus-0.12.so:devel/liborcus \ libcurl.so:ftp/curl \ libcairo.so:graphics/cairo \ libgraphite2.so:graphics/graphite2 \ liblcms2.so:graphics/lcms2 \ libcdr-0.1.so:graphics/libcdr01 \ libetonyek-0.1.so:graphics/libetonyek01 \ libfreehand-0.1.so:graphics/libfreehand \ libgltf-0.0.so:graphics/libgltf \ libwpg-0.3.so:graphics/libwpg03 \ libzmf-0.0.so:graphics/libzmf \ libGeneratedSaxParser.so:graphics/opencollada \ libpng.so:graphics/png \ libpoppler.so:graphics/poppler \ libCoinMP.so:math/coinmp \ liblpsolve55.so:math/lp_solve \ libcmis-0.5.so:net/libcmis \ libharfbuzz.so:print/harfbuzz \ libharfbuzz-icu.so:print/harfbuzz-icu \ libmspub-0.1.so:print/libmspub01 \ libpagemaker-0.0.so:print/libpagemaker \ libnss3.so:security/nss \ libclucene-core.so:textproc/clucene \ libexpat.so:textproc/expat2 \ libhunspell-1.6.so:textproc/hunspell \ libhyphen.so:textproc/hyphen \ libabw-0.1.so:textproc/libabw \ libe-book-0.1.so:textproc/libe-book \ libexttextcat-2.0.so:textproc/libexttextcat \ libmwaw-0.3.so:textproc/libmwaw03 \ libodfgen-0.1.so:textproc/libodfgen01 \ librevenge-0.0.so:textproc/librevenge \ libstaroffice-0.0.so:textproc/libstaroffice \ libvisio-0.1.so:textproc/libvisio01 \ libwpd-0.10.so:textproc/libwpd010 \ libwps-0.4.so:textproc/libwps \ libxml2.so:textproc/libxml2 \ libxslt.so:textproc/libxslt \ libmythes-1.2.so:textproc/mythes \ librdf.so:textproc/redland \ libserf-1.so:www/serf RUN_DEPENDS= xdg-open:devel/xdg-utils \ ${LOCALBASE}/share/fonts/Caladea/Caladea-Bold.ttf:x11-fonts/crosextrafonts-caladea-ttf \ ${LOCALBASE}/share/fonts/Carlito/Carlito-Bold.ttf:x11-fonts/crosextrafonts-carlito-ttf \ ${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu \ ${LOCALBASE}/share/fonts/emojione-color-font-ttf/EmojiOneColor-SVGinOT.ttf:x11-fonts/emojione-color-font-ttf \ ${LOCALBASE}/share/fonts/GentiumBasic/GenBasI.ttf:x11-fonts/gentium-basic \ ${LOCALBASE}/share/fonts/Liberation/LiberationMono-Bold.ttf:x11-fonts/liberation-fonts-ttf \ ${LOCALBASE}/share/fonts/LinLibertineG/LinLibertine_DR_G.ttf:x11-fonts/linuxlibertine-g DISTFILES+= 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2:src \ - 86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz:src + 86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz:src \ + cppunit-1.13.2.tar.gz:src .if defined(PRERELEASE) MASTER_SITES+= http://dev-builds.libreoffice.org/pre-releases/src/ .endif CONFLICTS_INSTALL= libreoffice4-4.* -INSTALL_TARGET= install-strip distro-pack-install +INSTALL_TARGET= TMPDIR=${WRKDIR} distro-pack-install WRKSRC= ${WRKDIR}/${PORTNAME}-${LOVERSION} GNU_CONFIGURE= yes USE_GL= gl glew glu USE_OPENLDAP= yes USE_PERL5= build USE_QT4= # empty but required USE_XORG= xaw xrandr USES= autoreconf:build bison compiler:c++11-lib cpe gmake jpeg \ perl5 pkgconfig python shared-mime-info tar:xz WANT_GNOME= yes OPTIONS_DEFINE= CUPS GNOME GTK2 GTK3 JAVA KDE4 MMEDIA PGSQL SDK SYSTRAY \ TEST VERBOSE WEBDAV OPTIONS_DEFAULT= CUPS GTK2 MMEDIA GTK3_DESC= GTK+ 3 GUI toolkit support (experimental) JAVA_DESC= Add Java support (XML filters, macros) MMEDIA_DESC= Enable multimedia backend for impress PGSQL_DESC= Build with PostgreSQL-SDBC driver SDK_DESC= Build with SDK SYSTRAY_DESC= Enable systemtray quickstarter TEST_DESC= Run all regression tests VERBOSE_DESC= Increase build verbosity WEBDAV_DESC= Enable webdav protocol CUPS_CONFIGURE_ENABLE= cups CUPS_LIB_DEPENDS= libcups.so:print/cups GNOME_CONFIGURE_ENABLE= dbus dconf GNOME_IMPLIES= GTK2 GNOME_LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib GNOME_USE= GNOME=dconf GTK_USE_GNOME= gtk-update-icon-cache GTK_USES= desktop-file-utils GTK_VARS= POST_PLIST=add-plist-gnome GTK2_CONFIGURE_ENABLE= gtk GTK2_USE= GNOME=gtk20,${GTK_USE_GNOME} GTK2_USES= ${GTK_USES} GTK2_VARS= ${GTK_VARS} GTK3_CONFIGURE_ENABLE= gtk3 GTK3_USE= GNOME=gtk30,${GTK_USE_GNOME} GTK3_USES= ${GTK_USES} GTK3_VARS= ${GTK_VARS} JAVA_BUILD_DEPENDS= ant:devel/apache-ant \ ${JAVAJARDIR}/commons-codec.jar:java/jakarta-commons-codec \ ${JAVAJARDIR}/commons-httpclient.jar:java/jakarta-commons-httpclient \ ${JAVAJARDIR}/commons-lang.jar:java/jakarta-commons-lang \ ${JAVAJARDIR}/commons-logging.jar:java/jakarta-commons-logging \ ${JAVAJARDIR}/junit.jar:java/junit \ ${JAVAJARDIR}/bsh.jar:lang/bsh JAVA_CATEGORIES= java JAVA_CONFIGURE_ON= --with-ant-home=${LOCALBASE}/share/java/apache-ant \ --with-beanshell-jar=${JAVAJARDIR}/bsh.jar \ --with-commons-codec-jar=${JAVAJARDIR}/commons-codec.jar \ --with-commons-httpclient-jar=${JAVAJARDIR}/commons-httpclient.jar \ --with-commons-lang-jar=${JAVAJARDIR}/commons-lang.jar \ --with-commons-logging-jar=${JAVAJARDIR}/commons-logging.jar \ --with-jdk-home="${JAVA_HOME}" \ --with-junit=${JAVAJARDIR}/junit.jar \ --with-hamcrest=${JAVAJARDIR}/hamcrest.jar \ --without-system-jfreereport JAVA_CONFIGURE_WITH= java # XXX jni.h from GNU classpath causes ABI conflicts. JAVA_CONFLICTS_BUILD= classpath-[0-9]* JAVA_DISTFILES= 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip:src \ 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip:src \ 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip:src \ 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip:src \ 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip:src \ 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip:src \ 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar:ext \ 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip:src \ 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip:src \ a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar:ext \ ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip:src \ ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip:src \ d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip:src \ db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip:src \ eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip:src \ f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip:src JAVA_USE= JAVA=yes JAVA_VARS= JAVA_BUILD=yes KDE4_CONFIGURE_ENABLE= kde4 KDE4_CONFIGURE_ENV= KDE4DIR="${KDE_PREFIX}" \ QT4DIR="${PREFIX}" \ QT4INC="${QT_INCDIR}" \ QT4LIB="${QT_LIBDIR}" KDE4_USES= kde:4 KDE4_USE= KDE=kdelibs QT4=moc_build,qmake_build MMEDIA_CONFIGURE_ENABLE= gstreamer-1-0 MMEDIA_USE= GSTREAMER1=yes PGSQL_CONFIGURE_ENABLE= postgresql-sdbc PGSQL_CONFIGURE_WITH= gssapi krb5 PGSQL_USES= pgsql SDK_BUILD_DEPENDS= doxygen:devel/doxygen SDK_CONFIGURE_ENABLE= odk SDK_CONFIGURE_OFF= --without-doxygen SDK_CONFIGURE_ON= --with-doxygen=${LOCALBASE}/bin/doxygen SDK_DISTFILES= 185d60944ea767075d27247c3162b3bc-unowinreg.dll:ext SYSTRAY_CONFIGURE_ENABLE= systray +TEST_ALL_TARGET_OFF= build-nocheck TEST_CONFIGURE_ENABLE= cve-tests VERBOSE_CONFIGURE_ON= --enable-verbose WEBDAV_CONFIGURE_ENABLE= neon WEBDAV_LIB_DEPENDS= libneon.so:www/neon ACLOCAL_ARGS= -I "${WRKSRC}/m4" CPPFLAGS+= -isystem ${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib COLLADA_MODS= COLLADABaseUtils COLLADAFramework \ COLLADASaxFrameworkLoader GeneratedSaxParser COLLADA_CFLAGS= ${COLLADA_MODS:S|^|-isystem ${LOCALBASE}/include/opencollada/|} COLLADA_LIBS= -L${LOCALBASE}/lib/opencollada \ ${COLLADA_MODS:S|^COLLADA|OpenCOLLADA|:S|^|-l|} CONFIGURE_ARGS= --disable-dependency-tracking \ --disable-epm \ --disable-fetch-external \ --disable-firebird-sdbc \ --disable-mergelibs \ --disable-online-update \ --enable-cairo-canvas \ --enable-graphite \ --enable-python=system \ --enable-release-build \ --exec-prefix=${PREFIX} \ --with-alloc=system \ --with-boost=${LOCALBASE} \ --with-build-version="FreeBSD ports ${PKGVERSION}" \ --with-external-dict-dir=${LOCALBASE}/share/hunspell \ --with-external-hyph-dir=${LOCALBASE}/share/hyphen \ --with-external-tar=${DISTDIR}/${DIST_SUBDIR} \ --with-external-thes-dir=${LOCALBASE}/share/mythes \ --with-gnu-patch=${LOCALBASE}/bin/gpatch \ --with-os-version=${OSVERSION} \ --with-parallelism=${MAKE_JOBS_NUMBER} \ --with-system-curl \ --with-system-dicts \ --with-system-libs \ --with-system-libxml \ --with-system-opencollada \ --with-system-ucpp \ --with-system-zlib \ --with-vendor="FreeBSD ports" \ --without-fonts \ - --without-myspell-dicts + --without-myspell-dicts \ + --without-system-cppunit CONFIGURE_ENV= DMAKE=${LOCALBASE}/bin/dmake \ GNUTAR="${TAR}" \ GPERF=${LOCALBASE}/bin/gperf \ ICU_CFLAGS="`icu-config --cflags`" \ ICU_LIBS="`icu-config --ldflags`" \ OPENCOLLADA_CFLAGS="${COLLADA_CFLAGS}" \ OPENCOLLADA_LIBS="${COLLADA_LIBS}" \ PYTHON_CFLAGS="`${PYTHON_VERSION}-config --cflags`" \ PYTHON_LIBS="`${PYTHON_VERSION}-config --libs`" MAKE_ENV+= CXXFLAGS_WARN="${CXXFLAGS_WARN}" MAKE_ENV+= GNUSED=${LOCALBASE}/bin/gsed MAKE_ENV+= DISPLAY= _MAKE_JOBS= # .include .if ${OPSYS} == FreeBSD .if ${COMPILER_FEATURES:Mlibstdc++} BROKEN= Build with system libstdc++ is unsupported .endif .if (${OSVERSION} >= 1200000 && ${OSVERSION} < 1200003) || \ (${OSVERSION} >= 1100500 && ${OSVERSION} < 1100501) || \ (${OSVERSION} >= 1100000 && ${OSVERSION} < 1100122) || \ ${OSVERSION} < 1003506 EXTRA_PATCHES= ${PATCHDIR}/extrapatch-vcl_inc_unx_gtk_gtkinst.hxx \ ${PATCHDIR}/extrapatch-vcl_unx_gtk_gtkinst.cxx .endif .endif # FreeBSD .if ${COMPILER_TYPE} == "clang" CXXFLAGS_WARN= -Woverloaded-virtual -Wno-unused-parameter .if ${COMPILER_VERSION} >= 36 CXXFLAGS_WARN+= -Wno-unused-local-typedefs .endif .else CXXFLAGS_WARN= -Wshadow -Woverloaded-virtual .endif post-patch: ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/shell/source/unix/exec/shellexec.cxx pre-configure: @${TOUCH} ${WRKSRC}/autogen.lastrun post-configure: @${TOUCH} ${WRKSRC}/src.downloaded post-install: @cd ${STAGEDIR}${PREFIX} && \ ${FIND} -s lib/libreoffice -type d -empty \ -exec ${ECHO_CMD} "@dir {}" \; >> ${TMPPLIST} @cd ${STAGEDIR}${PREFIX} && \ ${FIND} -s bin lib man -not -type d >> ${TMPPLIST} -.for subdir in application-registry applications bash-completion icons mime mime-info mimelnk +.for subdir in appdata application-registry applications bash-completion icons mime mime-info mimelnk @cd ${STAGEDIR}${PREFIX} && \ ${FIND} -s share/${subdir} -not -type d >> ${TMPPLIST} .endfor post-install-SDK-on: .for subdir in include share share/doc share/idl @cd ${STAGEDIR}${PREFIX} && \ ${FIND} -s ${subdir}/libreoffice -not -type d >> ${TMPPLIST} .endfor add-plist-gnome: .for subdir in gnome hicolor locolor @${ECHO_CMD} "@rmtry share/icons/${subdir}/icon-theme.cache" >> ${TMPPLIST} @${ECHO_CMD} "@postexec ${LOCALBASE}/bin/gtk-update-icon-cache -q -f %D/share/icons/${subdir} 2>/dev/null || ${TRUE}" >> ${TMPPLIST} @${ECHO_CMD} "@postunexec ${LOCALBASE}/bin/gtk-update-icon-cache -q -f %D/share/icons/${subdir} 2>/dev/null || ${TRUE}" >> ${TMPPLIST} .endfor .include Index: head/editors/libreoffice/distinfo =================================================================== --- head/editors/libreoffice/distinfo (revision 442890) +++ head/editors/libreoffice/distinfo (revision 442891) @@ -1,43 +1,45 @@ -TIMESTAMP = 1495234833 +TIMESTAMP = 1496871429 SHA256 (libreoffice/libreoffice-5.3.3.2.tar.xz) = 9632956926d9d5c9049ce5b81c2673f298ae73b873d53cce8cfaea8ee243619a SIZE (libreoffice/libreoffice-5.3.3.2.tar.xz) = 190216268 SHA256 (libreoffice/libreoffice-help-5.3.3.2.tar.xz) = f9b4fef5f449cdbbcb5796908d0536576585c511173bfccf2ca049b5dcbb0dc7 SIZE (libreoffice/libreoffice-help-5.3.3.2.tar.xz) = 2127200 SHA256 (libreoffice/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2) = b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb SIZE (libreoffice/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2) = 555291 SHA256 (libreoffice/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz) = 41d463d16c9894cd3317098d027c038039c6d896b9cbb9bad9c4e29959e10e9f SIZE (libreoffice/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz) = 1794694 +SHA256 (libreoffice/cppunit-1.13.2.tar.gz) = 3f47d246e3346f2ba4d7c9e882db3ad9ebd3fcbd2e8b732f946e0e3eeb9f429f +SIZE (libreoffice/cppunit-1.13.2.tar.gz) = 953596 SHA256 (libreoffice/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370 SIZE (libreoffice/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = 3519470 SHA256 (libreoffice/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip) = 5826d1551bf599b85742545f6e01a0079b93c1b2c8434bf409eddb3a29e4726b SIZE (libreoffice/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip) = 1180582 SHA256 (libreoffice/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip) = 64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1 SIZE (libreoffice/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip) = 9796 SHA256 (libreoffice/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip) = 085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045 SIZE (libreoffice/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip) = 153157 SHA256 (libreoffice/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip) = e0531091787c0f16c83965fdcbc49162c059d7f0c64669e7f119699321549743 SIZE (libreoffice/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip) = 5750610 SHA256 (libreoffice/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip) = 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753 SIZE (libreoffice/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip) = 1521926 SHA256 (libreoffice/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar) = f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770 SIZE (libreoffice/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar) = 2448421 SHA256 (libreoffice/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip) = abe2c57ac12ba45d83563b02e240fa95d973376de2f720aab8fe11f2e621c095 SIZE (libreoffice/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip) = 762419 SHA256 (libreoffice/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip) = 3d853b19b1d94a6efa69e7af90f7f2b09ecf302913bee3da796c15ecfebcfac8 SIZE (libreoffice/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip) = 2938721 SHA256 (libreoffice/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar) = a0bd3e0186e043223bfb231a888e2bfb06c78ee2e07c2f0eca434236d173cf34 SIZE (libreoffice/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar) = 18033694 SHA256 (libreoffice/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip) = 7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66 SIZE (libreoffice/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip) = 2929311 SHA256 (libreoffice/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip) = 233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd SIZE (libreoffice/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip) = 743031 SHA256 (libreoffice/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip) = 1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133 SIZE (libreoffice/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip) = 207563 SHA256 (libreoffice/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip) = e1fb87f3f7b980d33414473279615c4644027e013012d156efa538bc2b031772 SIZE (libreoffice/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip) = 1396007 SHA256 (libreoffice/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip) = 75c80359c9ce343c20aab8a36a45cb3b9ee7c61cf92c13ae45399d854423a9ba SIZE (libreoffice/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip) = 427800 SHA256 (libreoffice/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip) = 05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343 SIZE (libreoffice/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip) = 211919 SHA256 (libreoffice/185d60944ea767075d27247c3162b3bc-unowinreg.dll) = eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6 SIZE (libreoffice/185d60944ea767075d27247c3162b3bc-unowinreg.dll) = 12288 Index: head/editors/libreoffice/files/patch-sc_Module__sc.mk =================================================================== --- head/editors/libreoffice/files/patch-sc_Module__sc.mk (revision 442890) +++ head/editors/libreoffice/files/patch-sc_Module__sc.mk (nonexistent) @@ -1,23 +0,0 @@ ---- sc/Module_sc.mk.orig 2017-05-03 16:46:29 UTC -+++ sc/Module_sc.mk -@@ -60,8 +60,9 @@ endif - $(eval $(call gb_Module_add_slowcheck_targets,sc, \ - CppunitTest_sc_condformats \ - CppunitTest_sc_new_cond_format_api \ -- CppunitTest_sc_subsequent_filters_test \ -- CppunitTest_sc_subsequent_export_test \ -+ $(if $(filter FREEBSD,$(OS)),, \ -+ CppunitTest_sc_subsequent_filters_test \ -+ CppunitTest_sc_subsequent_export_test) \ - CppunitTest_sc_html_export_test \ - CppunitTest_sc_opencl_test \ - CppunitTest_sc_copypaste \ -@@ -71,7 +72,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sc, \ - # point weirdness (x87, registers, compiler optimization, ... whatever), - # disable them until someone finds a real cure. - --ifneq ($(PLATFORMID),linux_x86) -+ifeq ($(filter freebsd_x86 linux_x86,$(PLATFORMID)),) - $(eval $(call gb_Module_add_slowcheck_targets,sc, \ - CppunitTest_sc_functions_test \ - )) Property changes on: head/editors/libreoffice/files/patch-sc_Module__sc.mk ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/editors/libreoffice/files/patch-sysui_desktop_share_create__tree.sh =================================================================== --- head/editors/libreoffice/files/patch-sysui_desktop_share_create__tree.sh (revision 442890) +++ head/editors/libreoffice/files/patch-sysui_desktop_share_create__tree.sh (nonexistent) @@ -1,17 +0,0 @@ ---- sysui/desktop/share/create_tree.sh.orig 2016-10-28 14:50:26 UTC -+++ sysui/desktop/share/create_tree.sh -@@ -82,10 +82,10 @@ for i in `cat launcherlist`; do - ln -sf "${office_root}/share/xdg/${i}" "${DESTDIR}/${PREFIXDIR}/share/applications/${PREFIX}-${i}" - done - --mkdir -p "${DESTDIR}/${PREFIXDIR}/share/appdata" --for i in base calc draw impress writer; do -- cp "${APPDATA_SOURCE_DIR}/libreoffice-${i}.appdata.xml" "${DESTDIR}/${PREFIXDIR}/share/appdata/${PREFIX}-${i}.appdata.xml" --done -+#mkdir -p "${DESTDIR}/${PREFIXDIR}/share/appdata" -+#for i in base calc draw impress writer; do -+# cp "${APPDATA_SOURCE_DIR}/libreoffice-${i}.appdata.xml" "${DESTDIR}/${PREFIXDIR}/share/appdata/${PREFIX}-${i}.appdata.xml" -+#done - - # Generate gobject-introspection files - if [ -n "$INTROSPECTION_SCANNER" ]; then Property changes on: head/editors/libreoffice/files/patch-sysui_desktop_share_create__tree.sh ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/editors/libreoffice/files/patch-filter_Module__filter.mk =================================================================== --- head/editors/libreoffice/files/patch-filter_Module__filter.mk (revision 442890) +++ head/editors/libreoffice/files/patch-filter_Module__filter.mk (nonexistent) @@ -1,12 +0,0 @@ ---- filter/Module_filter.mk.orig 2017-04-25 20:44:01 UTC -+++ filter/Module_filter.mk -@@ -58,7 +58,8 @@ $(eval $(call gb_Module_add_targets,filter,\ - endif - - $(eval $(call gb_Module_add_check_targets,filter,\ -- CppunitTest_filter_xslt \ -+ $(if $(filter FREEBSD,$(OS)),, \ -+ CppunitTest_filter_xslt) \ - CppunitTest_filter_priority \ - CppunitTest_filter_msfilter \ - )) Property changes on: head/editors/libreoffice/files/patch-filter_Module__filter.mk ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/editors/libreoffice/files/patch-sw_Module__sw.mk =================================================================== --- head/editors/libreoffice/files/patch-sw_Module__sw.mk (revision 442890) +++ head/editors/libreoffice/files/patch-sw_Module__sw.mk (nonexistent) @@ -1,36 +0,0 @@ ---- sw/Module_sw.mk.orig 2017-05-03 16:46:29 UTC -+++ sw/Module_sw.mk -@@ -55,23 +55,28 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\ - CppunitTest_sw_ooxmlexport \ - CppunitTest_sw_ooxmlexport2 \ - CppunitTest_sw_ooxmlexport3 \ -- CppunitTest_sw_ooxmlexport4 \ -+ $(if $(filter FREEBSD,$(OS)),, \ -+ CppunitTest_sw_ooxmlexport4) \ - CppunitTest_sw_ooxmlexport5 \ - CppunitTest_sw_ooxmlexport6 \ -- CppunitTest_sw_ooxmlexport7 \ -+ $(if $(filter FREEBSD,$(OS)),, \ -+ CppunitTest_sw_ooxmlexport7) \ - CppunitTest_sw_ooxmlexport8 \ - CppunitTest_sw_ooxmlexport9 \ - CppunitTest_sw_ooxmlfieldexport \ - CppunitTest_sw_ooxmlw14export \ - CppunitTest_sw_ooxmlimport \ -- CppunitTest_sw_ww8export \ -+ $(if $(filter FREEBSD,$(OS)),, \ -+ CppunitTest_sw_ww8export) \ - CppunitTest_sw_ww8export2 \ -- CppunitTest_sw_ww8import \ -+ $(if $(filter FREEBSD,$(OS)),, \ -+ CppunitTest_sw_ww8import) \ - CppunitTest_sw_rtfexport \ - CppunitTest_sw_rtfimport \ - CppunitTest_sw_odfexport \ - CppunitTest_sw_odfimport \ -- CppunitTest_sw_uiwriter \ -+ $(if $(filter FREEBSD,$(OS)),, \ -+ CppunitTest_sw_uiwriter) \ - CppunitTest_sw_mailmerge \ - CppunitTest_sw_globalfilter \ - )) Property changes on: head/editors/libreoffice/files/patch-sw_Module__sw.mk ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/editors/libreoffice/files/patch-dbaccess_Module__dbaccess.mk =================================================================== --- head/editors/libreoffice/files/patch-dbaccess_Module__dbaccess.mk (revision 442890) +++ head/editors/libreoffice/files/patch-dbaccess_Module__dbaccess.mk (nonexistent) @@ -1,23 +0,0 @@ ---- dbaccess/Module_dbaccess.mk.orig 2017-04-25 20:44:01 UTC -+++ dbaccess/Module_dbaccess.mk -@@ -35,16 +35,19 @@ $(eval $(call gb_Module_add_l10n_targets,dbaccess,\ - )) - - ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE) -+ifneq ($(OS),FREEBSD) - $(eval $(call gb_Module_add_check_targets,dbaccess,\ - CppunitTest_dbaccess_firebird_test \ - )) - endif -+endif - - $(eval $(call gb_Module_add_check_targets,dbaccess,\ - CppunitTest_dbaccess_dialog_save \ - CppunitTest_dbaccess_empty_stdlib_save \ - CppunitTest_dbaccess_nolib_save \ -- CppunitTest_dbaccess_macros_test \ -+ $(if $(filter FREEBSD,$(OS)),, \ -+ CppunitTest_dbaccess_macros_test) \ - $(if $(ENABLE_JAVA), \ - CppunitTest_dbaccess_RowSetClones) \ - )) Property changes on: head/editors/libreoffice/files/patch-dbaccess_Module__dbaccess.mk ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/editors/libreoffice/files/patch-Makefile.in =================================================================== --- head/editors/libreoffice/files/patch-Makefile.in (revision 442890) +++ head/editors/libreoffice/files/patch-Makefile.in (revision 442891) @@ -1,11 +1,20 @@ --- Makefile.in.orig 2017-05-03 16:46:29 UTC +++ Makefile.in @@ -250,7 +250,7 @@ endif # # Bootstrap # -bootstrap: check-if-root compilerplugins +bootstrap: compilerplugins # # Build +@@ -362,7 +362,7 @@ else + @exit 1 + endif + +-distro-pack-install: install ++distro-pack-install: install-strip + $(SRCDIR)/bin/distro-install-clean-up + $(SRCDIR)/bin/distro-install-desktop-integration + $(SRCDIR)/bin/distro-install-sdk Index: head/editors/libreoffice/files/patch-bin_distro-install-desktop-integration =================================================================== --- head/editors/libreoffice/files/patch-bin_distro-install-desktop-integration (revision 442890) +++ head/editors/libreoffice/files/patch-bin_distro-install-desktop-integration (revision 442891) @@ -1,54 +1,63 @@ ---- bin/distro-install-desktop-integration.orig 2016-10-28 14:50:26 UTC +--- bin/distro-install-desktop-integration.orig 2017-05-03 16:46:29 UTC +++ bin/distro-install-desktop-integration -@@ -99,7 +99,7 @@ cp -a workdir/CustomTarget/sysui/share/l +@@ -99,7 +99,7 @@ cp -a workdir/CustomTarget/sysui/share/libreoffice/* " cp -a "${SRCDIR?}"/sysui/desktop/share/create_tree.sh "$sysui_temp" cd $sysui_temp # we want non-versioned stuff in the distro packages -sed -i \ +sed -i "" \ -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \ -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \ -e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \ @@ -109,13 +109,13 @@ sed -i \ export OFFICE_PREFIX=$LIBDIR export PREFIX=$INSTALLDIRNAME export ICON_PREFIX=$INSTALLDIRNAME - export ICON_SOURCE_DIR="${SRCDIR?}"/sysui/desktop/icons + export ICON_SOURCE_DIR="${SRCDIR}"/sysui/desktop/icons export PRODUCTVERSION= export KDEMAINDIR=$PREFIXDIR export PREFIXDIR=${PREFIXDIR} export GNOMEDIR=$PREFIXDIR export GNOME_MIME_THEME=hicolor - export APPDATA_SOURCE_DIR="${SRCDIR?}"/sysui/desktop/appstream-appdata + export APPDATA_SOURCE_DIR="${SRCDIR}"/sysui/desktop/appstream-appdata bash ./create_tree.sh ) cd - @@ -130,7 +130,7 @@ fi # we want non-versioned desktop files cd $DESTDIR/$INSTALLDIR/share/xdg # we want non-versioned stuff in the distro packages -sed -i \ +sed -i "" \ -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \ -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \ -e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \ -@@ -177,12 +177,12 @@ ln -sf $INSTALLDIR/program/soffice $DEST +@@ -145,7 +145,7 @@ if test -f $DESTDIR/gid_Module_Root_Brand ; then + $PREFIXDIR/share/mime/packages \ + $PREFIXDIR/share/mime-info \ + $PREFIXDIR/share/icons ; do +- find "$DESTDIR$dir" \( -type f -o -type l \) -printf "$dir/%P\n" >>$DESTDIR/gid_Module_Root_Brand ++ find "$DESTDIR$dir" \( -type f -o -type l \) | sed -e "s|^$DESTDIR||" >>$DESTDIR/gid_Module_Root_Brand + done + fi + +@@ -177,12 +177,12 @@ ln -sf $INSTALLDIR/program/soffice $DESTDIR$PREFIXDIR/ test -f $DESTDIR/gid_Module_Root_Brand && echo "$PREFIXDIR/bin/soffice" >>$DESTDIR/gid_Module_Root_Brand # create bash completion -mkdir -p $DESTDIR/usr/share/bash-completion/completions -"${SRCDIR?}"/bin/generate-bash-completion bin/bash-completion.in $DESTDIR/usr/share/bash-completion/completions/$INSTALLDIRNAME.sh -test -f $DESTDIR/gid_Module_Root_Brand && echo "/usr/share/bash-completion/completions/$INSTALLDIRNAME.sh" >>$DESTDIR/gid_Module_Root_Brand +mkdir -p $DESTDIR/${PREFIXDIR}/share/bash-completion/completions +"${SRCDIR?}"/bin/generate-bash-completion bin/bash-completion.in $DESTDIR${PREFIXDIR}/share/bash-completion/completions/$INSTALLDIRNAME.sh +test -f $DESTDIR/gid_Module_Root_Brand && echo "${PREFIXDIR}/share/bash-completion/completions/$INSTALLDIRNAME.sh" >>$DESTDIR/gid_Module_Root_Brand if test "$WITH_COMPAT_OOWRAPPERS" = "TRUE" ; then - "${SRCDIR?}"/bin/generate-bash-completion --compat-oowrappers bin/bash-completion.in $DESTDIR/usr/share/bash-completion/completions/ooffice.sh - test -f $DESTDIR/gid_Module_Root_Brand && echo "/usr/share/bash-completion/completions/ooffice.sh" >>$DESTDIR/gid_Module_Root_Brand + "${SRCDIR?}"/bin/generate-bash-completion --compat-oowrappers bin/bash-completion.in $DESTDIR${PREFIXDIR}/share/bash-completion/completions/ooffice.sh + test -f $DESTDIR/gid_Module_Root_Brand && echo "${PREFIXDIR}/share/bash-completion/completions/ooffice.sh" >>$DESTDIR/gid_Module_Root_Brand fi echo "Install $OOINSTDIR/basis$VERSION/program/java-set-classpath"; Index: head/editors/libreoffice/files/patch-vcl_unx_generic_app_geninst.cxx =================================================================== --- head/editors/libreoffice/files/patch-vcl_unx_generic_app_geninst.cxx (nonexistent) +++ head/editors/libreoffice/files/patch-vcl_unx_generic_app_geninst.cxx (revision 442891) @@ -0,0 +1,60 @@ +--- vcl/unx/generic/app/geninst.cxx.orig 2017-05-03 16:46:29 UTC ++++ vcl/unx/generic/app/geninst.cxx +@@ -22,11 +22,8 @@ + #include + #include + #include ++#include + +-#if defined(LINUX) +-# include +-#endif +- + #include + #include + #include +@@ -139,31 +136,22 @@ SalGenericInstance::~SalGenericInstance() + + OUString SalGenericInstance::getOSVersion() + { +- OUString aKernelVer = "unknown"; ++ struct utsname stName; + +-// not so generic, but at least shared between all unix backend +-#if defined(LINUX) +- FILE* pVersion = fopen( "/proc/version", "r" ); +- if ( pVersion ) ++ if ( uname( &stName ) != 0 ) ++ return "unknown"; ++ ++ sal_Int32 nDots = 0; ++ sal_Int32 nIndex = 0; ++ OUString aVers = OUString::createFromAscii( stName.release ); ++ while ( nIndex++ < aVers.getLength() ) + { +- char aVerBuffer[512]; +- if ( fgets ( aVerBuffer, 511, pVersion ) ) +- { +- aKernelVer = OUString::createFromAscii( aVerBuffer ); +- sal_Int32 nIndex = 0; +- // "Linux version 3.16.7-29-desktop ..." +- OUString aVers = aKernelVer.getToken( 2, ' ', nIndex ); +- // "3.16.7-29-desktop ..." +- sal_Int32 nTooDetailed = aVers.indexOf( '.', 2); +- if (nTooDetailed < 1 || nTooDetailed > 8) +- aKernelVer = "Linux (misparsed version)"; +- else // "3.16.7-29-desktop ..." +- aKernelVer = "Linux " + aVers.copy(0, nTooDetailed); +- } +- fclose( pVersion ); ++ const char c = stName.release[ nIndex ]; ++ if ( c == ' ' || c == '-' || ( c == '.' && nDots++ > 0 ) ) ++ break; + } +-#endif +- return aKernelVer; ++ return OUString::createFromAscii( stName.sysname ) + " " + ++ aVers.copy( 0, nIndex ); + } + + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ Property changes on: head/editors/libreoffice/files/patch-vcl_unx_generic_app_geninst.cxx ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property