diff --git c/editors/libreoffice/Makefile i/editors/libreoffice/Makefile index b65974fe41aa..f6071872ea17 100644 --- c/editors/libreoffice/Makefile +++ i/editors/libreoffice/Makefile @@ -15,7 +15,8 @@ COMMENT= Full integrated office productivity suite CONFLICTS_BUILD= mdds0 -BUILD_DEPENDS= p5-Archive-Zip>=0:archivers/p5-Archive-Zip \ +BUILD_DEPENDS= ${LOCALBASE}/lib/libcppunit.so:devel/cppunit \ + p5-Archive-Zip>=0:archivers/p5-Archive-Zip \ zip:archivers/zip \ ${LOCALBASE}/include/sqlext.h:databases/unixODBC \ dmake:devel/dmake \ @@ -63,12 +64,14 @@ LIB_DEPENDS= libapr-1.so:devel/apr1 \ libexttextcat-2.0.so:textproc/libexttextcat \ libmwaw-0.3.so:textproc/libmwaw03 \ libodfgen-0.1.so:textproc/libodfgen01 \ + libepubgen-0.0.so:textproc/libepubgen00 \ 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 \ + libxmlsec1-nss.so:security/xmlsec1 \ libxslt.so:textproc/libxslt \ libmythes-1.2.so:textproc/mythes \ librdf.so:textproc/redland \ @@ -83,8 +86,7 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils \ ${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 \ - cppunit-1.13.2.tar.gz:src +# pdfium-3235.tar.bz2:src .if defined(PRERELEASE) MASTER_SITES+= http://dev-builds.libreoffice.org/pre-releases/src/ @@ -106,9 +108,9 @@ USES= autoreconf:build bison compiler:c++11-lib cpe gmake jpeg \ OPTIONS_DEFINE= CUPS GNOME GTK2 GTK3 JAVA KDE4 MMEDIA PGSQL SDK SYSTRAY \ TEST WEBDAV -OPTIONS_DEFAULT= CUPS GTK2 MMEDIA +OPTIONS_DEFAULT= CUPS GTK3 MMEDIA -GTK3_DESC= GTK+ 3 GUI toolkit support (experimental) +GTK3_DESC= GTK+ 3 GUI toolkit support JAVA_DESC= Add Java support (XML filters, macros) MMEDIA_DESC= Enable multimedia backend for impress PGSQL_DESC= Build with PostgreSQL-SDBC driver @@ -225,9 +227,9 @@ CONFIGURE_ARGS= --disable-dependency-tracking \ --disable-mergelibs \ --disable-online-update \ --enable-cairo-canvas \ - --enable-graphite \ --enable-python=system \ --enable-release-build \ + --disable-pdfium \ --exec-prefix=${PREFIX} \ --with-alloc=system \ --with-boost=${LOCALBASE} \ @@ -248,8 +250,7 @@ CONFIGURE_ARGS= --disable-dependency-tracking \ --with-system-zlib \ --with-vendor="FreeBSD ports" \ --without-fonts \ - --without-myspell-dicts \ - --without-system-cppunit + --without-myspell-dicts CONFIGURE_ENV= DMAKE=${LOCALBASE}/bin/dmake \ GNUTAR="${TAR}" \ diff --git c/editors/libreoffice/Makefile.common i/editors/libreoffice/Makefile.common index 240157b1d39c..271689625903 100644 --- c/editors/libreoffice/Makefile.common +++ i/editors/libreoffice/Makefile.common @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= libreoffice -PORTVERSION= 5.3.7 +PORTVERSION= 6.0.0 CATEGORIES+= editors MAINTAINER= office@FreeBSD.org @@ -10,4 +10,4 @@ LICENSE= LGPL3+ MPL20 LICENSE_COMB= dual LOVERSION= ${PORTVERSION}.${RCVER} -RCVER= 2 +RCVER= 0.beta2 diff --git c/editors/libreoffice/distinfo i/editors/libreoffice/distinfo index 3dd649a899e4..d6cac031908f 100644 --- c/editors/libreoffice/distinfo +++ i/editors/libreoffice/distinfo @@ -1,45 +1,9 @@ -TIMESTAMP = 1508961364 -SHA256 (libreoffice/libreoffice-5.3.7.2.tar.xz) = c3d7ceecdf4d97dfd2ed748c4479152a1c9b8c879587a63a4f403209aed6ee7c -SIZE (libreoffice/libreoffice-5.3.7.2.tar.xz) = 189508568 -SHA256 (libreoffice/libreoffice-help-5.3.7.2.tar.xz) = f65e68322c50c52382093153ef0753852dde97962e63c1426256a05ce007ae2c -SIZE (libreoffice/libreoffice-help-5.3.7.2.tar.xz) = 2124656 +TIMESTAMP = 1513088793 +SHA256 (libreoffice/libreoffice-6.0.0.0.beta2.tar.xz) = 9488fb08f211dcf7e2fe2ec46139e3ffe6d372d8dcacdf7cf976c5cb3fbb182a +SIZE (libreoffice/libreoffice-6.0.0.0.beta2.tar.xz) = 203422696 +SHA256 (libreoffice/libreoffice-help-6.0.0.0.beta2.tar.xz) = 02ad6505fffbaa8a4065a10424cd8dcfc1bec1f2ae12f22b918a7076fb0cd46e +SIZE (libreoffice/libreoffice-help-6.0.0.0.beta2.tar.xz) = 2640096 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 +SHA256 (libreoffice/pdfium-3235.tar.bz2) = 7dc0d33fc24b1612865f5e173d48800ba3f2db891c57e3f92b9d2ce56ffeb72f +SIZE (libreoffice/pdfium-3235.tar.bz2) = 5836207 diff --git c/editors/libreoffice/files/patch-bin_distro-install-desktop-integration i/editors/libreoffice/files/patch-bin_distro-install-desktop-integration index 5b592beb80e5..51a89b071a3a 100644 --- c/editors/libreoffice/files/patch-bin_distro-install-desktop-integration +++ i/editors/libreoffice/files/patch-bin_distro-install-desktop-integration @@ -48,15 +48,15 @@ # 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 +-"${SRCDIR?}"/bin/generate-bash-completion.py 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 ++"${SRCDIR?}"/bin/generate-bash-completion.py 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 +- "${SRCDIR?}"/bin/generate-bash-completion.py --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 ++ "${SRCDIR?}"/bin/generate-bash-completion.py --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 diff --git c/editors/libreoffice/files/patch-sal_osl_unx_system.cxx i/editors/libreoffice/files/patch-sal_osl_unx_system.cxx deleted file mode 100644 index 081fa2dd9acb..000000000000 --- c/editors/libreoffice/files/patch-sal_osl_unx_system.cxx +++ /dev/null @@ -1,12 +0,0 @@ ---- sal/osl/unx/system.cxx.orig 2016-10-28 14:50:26 UTC -+++ sal/osl/unx/system.cxx -@@ -247,6 +247,9 @@ int macxp_resolveAlias(char *path, int b - #endif /* NO_PTHREAD_RTL */ - - #if defined(FREEBSD) -+ -+#include -+ - char *fcvt(double value, int ndigit, int *decpt, int *sign) - { - static char ret[256]; diff --git c/editors/libreoffice/files/patch-sal_osl_unx_thread.cxx i/editors/libreoffice/files/patch-sal_osl_unx_thread.cxx new file mode 100644 index 000000000000..56439e0d9c79 --- /dev/null +++ i/editors/libreoffice/files/patch-sal_osl_unx_thread.cxx @@ -0,0 +1,22 @@ +--- sal/osl/unx/thread.cxx.orig 2017-12-12 17:31:34.756103000 +0300 ++++ sal/osl/unx/thread.cxx 2017-12-12 17:33:13.924729000 +0300 +@@ -45,6 +45,10 @@ + #include + #endif + ++#ifdef __FreeBSD_kernel__ ++#include ++#endif ++ + /**************************************************************************** + * @@@ TODO @@@ + * +@@ -545,7 +549,7 @@ + if ( 0 != err ) + SAL_WARN("sal.osl", "pthread_setname_np failed with errno " << err); + #elif defined __FreeBSD_kernel__ +- pthread_setname_np( pthread_self(), name ); ++ pthread_set_name_np( pthread_self(), name ); + #elif defined MACOSX || defined IOS + pthread_setname_np( name ); + #else diff --git c/editors/libreoffice/files/patch-shell_source_unix_exec_shellexec.cxx i/editors/libreoffice/files/patch-shell_source_unix_exec_shellexec.cxx index a52189df87db..3c8a62b6a069 100644 --- c/editors/libreoffice/files/patch-shell_source_unix_exec_shellexec.cxx +++ i/editors/libreoffice/files/patch-shell_source_unix_exec_shellexec.cxx @@ -1,11 +1,11 @@ ---- shell/source/unix/exec/shellexec.cxx.orig 2017-01-12 00:54:33 UTC -+++ shell/source/unix/exec/shellexec.cxx -@@ -157,7 +157,7 @@ void SAL_CALL ShellExec::execute( const - if (std::getenv("LIBO_FLATPAK") != nullptr) { - aBuffer.append("/app/bin/xdg-open"); - } else { -- aBuffer.append("/usr/bin/xdg-open"); -+ aBuffer.append("%%LOCALBASE%%/bin/xdg-open"); - } +--- shell/source/unix/exec/shellexec.cxx.orig 2017-12-08 02:26:19.000000000 +0300 ++++ shell/source/unix/exec/shellexec.cxx 2017-12-12 15:51:21.551684000 +0300 +@@ -145,7 +145,7 @@ + aBuffer.append("open --"); + #else + // Just use xdg-open on non-Mac +- aBuffer.append("/usr/bin/xdg-open"); ++ aBuffer.append("%%LOCALBASE%%/bin/xdg-open"); #endif aBuffer.append(" "); + escapeForShell(aBuffer, OUStringToOString(aURL, osl_getThreadTextEncoding())); diff --git c/editors/libreoffice/files/patch-vcl_CppunitTest__vcl__wmf__test.mk i/editors/libreoffice/files/patch-vcl_CppunitTest__vcl__wmf__test.mk deleted file mode 100644 index 7483c246197d..000000000000 --- c/editors/libreoffice/files/patch-vcl_CppunitTest__vcl__wmf__test.mk +++ /dev/null @@ -1,15 +0,0 @@ ---- vcl/CppunitTest_vcl_wmf_test.mk.orig 2017-05-03 16:46:29 UTC -+++ vcl/CppunitTest_vcl_wmf_test.mk -@@ -131,10 +131,9 @@ $(eval $(call gb_CppunitTest_use_externals,vcl_wmf_tes - )) - endif - else --ifeq ($(OS),LINUX) -+ifeq ($(OS), $(filter LINUX %BSD, $(OS))) - $(eval $(call gb_CppunitTest_add_libs,vcl_wmf_test,\ -- -lm \ -- -ldl \ -+ -lm $(DLOPEN_LIBS) \ - -lpthread \ - -lGL \ - -lX11 \ diff --git c/editors/libreoffice/files/patch-vcl_Executable__visualbackendtest.mk i/editors/libreoffice/files/patch-vcl_Executable__visualbackendtest.mk index ffacbf954b2d..201a39f53780 100644 --- c/editors/libreoffice/files/patch-vcl_Executable__visualbackendtest.mk +++ i/editors/libreoffice/files/patch-vcl_Executable__visualbackendtest.mk @@ -11,9 +11,7 @@ - -ldl \ + -lm $(DLOPEN_LIBS) \ -lpthread \ -- -lGL \ - -lX11 \ -+ -lGL \ + -lX11 \ )) diff --git c/editors/libreoffice/files/patch-vcl_Library__vcl.mk i/editors/libreoffice/files/patch-vcl_Library__vcl.mk deleted file mode 100644 index b41d223e9afb..000000000000 --- c/editors/libreoffice/files/patch-vcl_Library__vcl.mk +++ /dev/null @@ -1,20 +0,0 @@ ---- vcl/Library_vcl.mk.orig 2017-05-03 16:46:29 UTC -+++ vcl/Library_vcl.mk -@@ -643,13 +643,12 @@ else - vcl/source/opengl/OpenGLHelper \ - vcl/source/window/openglwin \ - )) --ifeq ($(OS),LINUX) -+ifeq ($(OS), $(filter LINUX %BSD, $(OS))) - $(eval $(call gb_Library_add_libs,vcl,\ -- -lm \ -- -ldl \ -+ -lm $(DLOPEN_LIBS) \ - -lpthread \ -- -lGL \ -- -lX11 \ -+ -lGL \ -+ -lX11 \ - )) - endif - endif diff --git c/editors/libreoffice/files/patch-vcl_unx_gtk_fpicker_SalGtkFilePicker.cxx i/editors/libreoffice/files/patch-vcl_unx_gtk_fpicker_SalGtkFilePicker.cxx deleted file mode 100644 index dc2ea8a099df..000000000000 --- c/editors/libreoffice/files/patch-vcl_unx_gtk_fpicker_SalGtkFilePicker.cxx +++ /dev/null @@ -1,18 +0,0 @@ ---- vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx.orig 2017-01-12 00:54:33 UTC -+++ vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx -@@ -436,10 +436,13 @@ dialog_remove_buttons( GtkDialog *pDialo - { - g_return_if_fail( GTK_IS_DIALOG( pDialog ) ); - --#if GTK_CHECK_VERSION(3,0,0) - #if GTK_CHECK_VERSION(3,12,0) -- dialog_remove_buttons(gtk_dialog_get_header_bar(pDialog)); -+ GtkWidget *pHeaderBar = gtk_dialog_get_header_bar( pDialog ); -+ if( pHeaderBar != nullptr ) -+ dialog_remove_buttons( pHeaderBar ); -+ else - #endif -+#if GTK_CHECK_VERSION(2,14,0) - dialog_remove_buttons(gtk_dialog_get_action_area(pDialog)); - #else - dialog_remove_buttons(pDialog->action_area);