diff options
| author | Dima Panov <fluffy@FreeBSD.org> | 2023-09-27 14:21:16 +0000 |
|---|---|---|
| committer | Dima Panov <fluffy@FreeBSD.org> | 2023-09-27 14:36:32 +0000 |
| commit | 4936a809c24a2b1cb6680d34c42c58e29770917d (patch) | |
| tree | 115a0a137ca62de66b92b4036d12cbfb032f0657 /editors/libreoffice | |
| parent | 34c03eb54ac1c78d3a3daf902b360ef2f2f5fcab (diff) | |
| download | ports-4936a809c24a2b1cb6680d34c42c58e29770917d.tar.gz ports-4936a809c24a2b1cb6680d34c42c58e29770917d.zip | |
editors/libreoffice: update to 7.6.2 release (+)
Please welcome LibreOffice Suite 7.6.2 Community release!
* Document themes
* Navigation panel in Impress
* Highlighting for used styles
...plus compatibility, performance and accessibility improvements.
Release Notes: https://blog.documentfoundation.org/blog/2023/08/21/libreoffice-7-6-community/
https://blog.documentfoundation.org/blog/2023/09/14/libreoffice-7-6-1/
https://blog.documentfoundation.org/blog/2023/09/26/lo-762-and-lo-757/
Sponsored by: Serenety Cybersecurity LLC
Diffstat (limited to 'editors/libreoffice')
7 files changed, 29 insertions, 34 deletions
diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile index d6351112736c..0233368c3362 100644 --- a/editors/libreoffice/Makefile +++ b/editors/libreoffice/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 3 +PORTREVISION= 0 .include "${.CURDIR}/Makefile.common" @@ -15,13 +15,14 @@ WWW?= https://www.libreoffice.org/ BUILD_DEPENDS= p5-Archive-Zip>=0:archivers/p5-Archive-Zip \ zip:archivers/zip \ + pigz:archivers/pigz \ ${LOCALBASE}/include/sqlext.h:databases/unixODBC \ cppunit-config:devel/cppunit \ dmake:devel/dmake \ gperf>=3.1:devel/gperf \ ${LOCALBASE}/include/libcuckoo/cuckoohash_map.hh:devel/libcuckoo \ libunwind>=20211201_1:devel/libunwind \ - mdds>=2.0:devel/mdds \ + mdds>=2.1:devel/mdds \ ucpp:devel/ucpp \ ${LOCALBASE}/include/sane/sane.h:graphics/sane-backends \ vigra-config:graphics/vigra \ @@ -37,7 +38,7 @@ LIB_DEPENDS= libapr-1.so:devel/apr1 \ libicutu.so:devel/icu \ liblangtag.so:devel/liblangtag \ libltdl.so:devel/libltdl \ - liborcus-0.17.so:devel/liborcus \ + liborcus-0.18.so:devel/liborcus \ libplds4.so:devel/nspr \ libcurl.so:ftp/curl \ libgraphite2.so:graphics/graphite2 \ @@ -101,7 +102,8 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils \ DISTFILES+= f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf:ext DISTFILES+= dtoa-20180411.tgz:src DISTFILES+= dragonbox-1.1.3.tar.gz:src -DISTFILES+= skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz:src +DISTFILES+= frozen-1.1.1.tar.gz:src +DISTFILES+= skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz:src NOT_FOR_ARCHS= armv6 armv7 NOT_FOR_ARCHS_REASON= Unsupported host_cpu @@ -285,6 +287,7 @@ CONFIGURE_ARGS= --disable-dependency-tracking \ --with-system-curl \ --with-system-dicts \ --with-system-dragonbox=no \ + --with-system-frozen=no \ --with-system-gpgmepp \ --with-system-libfixmath=no \ --with-system-libs \ diff --git a/editors/libreoffice/Makefile.common b/editors/libreoffice/Makefile.common index 50da20d4d8df..0bfad66bdb25 100644 --- a/editors/libreoffice/Makefile.common +++ b/editors/libreoffice/Makefile.common @@ -7,8 +7,8 @@ LICENSE= LGPL3+ MPL20 LICENSE_COMB= dual DISTVERSION= ${LOVERSION}.${RCVER} -LOVERSION= 7.5.5 -RCVER= 2 +LOVERSION= 7.6.2 +RCVER= 1 #PRERELEASE= yes #DEVRELEASE= yes diff --git a/editors/libreoffice/distinfo b/editors/libreoffice/distinfo index 7649216040a4..c2315869c9f3 100644 --- a/editors/libreoffice/distinfo +++ b/editors/libreoffice/distinfo @@ -1,16 +1,18 @@ -TIMESTAMP = 1690216848 -SHA256 (libreoffice/libreoffice-7.5.5.2.tar.xz) = 6628dfd2a21041a7c5bb6d72733e0fd52efa7959c95084fcd4d96cc4a61b0561 -SIZE (libreoffice/libreoffice-7.5.5.2.tar.xz) = 270545744 -SHA256 (libreoffice/libreoffice-help-7.5.5.2.tar.xz) = 1de834979bf25c3c6f368362dd20c95d0bee514a42eee903a32188d40488aa62 -SIZE (libreoffice/libreoffice-help-7.5.5.2.tar.xz) = 166236984 +TIMESTAMP = 1695772283 +SHA256 (libreoffice/libreoffice-7.6.2.1.tar.xz) = e5d2733bd02ce24c30207795b77b9f5e2b5aba3a14773375fb5cc228ed2b9ca2 +SIZE (libreoffice/libreoffice-7.6.2.1.tar.xz) = 280623380 +SHA256 (libreoffice/libreoffice-help-7.6.2.1.tar.xz) = 6bdc27027a603031785d6c650785073add8d55872ab81a15067459ee1b6cd148 +SIZE (libreoffice/libreoffice-help-7.6.2.1.tar.xz) = 166958512 SHA256 (libreoffice/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf) = f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140 SIZE (libreoffice/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf) = 207992 SHA256 (libreoffice/dtoa-20180411.tgz) = 0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4 SIZE (libreoffice/dtoa-20180411.tgz) = 48893 SHA256 (libreoffice/dragonbox-1.1.3.tar.gz) = 09d63b05e9c594ec423778ab59b7a5aa1d76fdd71d25c7048b0258c4ec9c3384 SIZE (libreoffice/dragonbox-1.1.3.tar.gz) = 4337233 -SHA256 (libreoffice/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz) = c094a6247e44104beaaa0d00c825beb6baf1a8e532dc22214747495317a65bd9 -SIZE (libreoffice/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz) = 11079112 +SHA256 (libreoffice/frozen-1.1.1.tar.gz) = f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45 +SIZE (libreoffice/frozen-1.1.1.tar.gz) = 186589 +SHA256 (libreoffice/skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz) = 0d08a99ed46cde43b5ad2672b5d8770c8eb85d0d26cb8f1f85fd9befe1e9ceb9 +SIZE (libreoffice/skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz) = 10693272 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 diff --git a/editors/libreoffice/files/patch-external_skia_UnpackedTarball__skia.mk b/editors/libreoffice/files/patch-external_skia_UnpackedTarball__skia.mk index 7b58bd9f0173..aa9203f7dfd6 100644 --- a/editors/libreoffice/files/patch-external_skia_UnpackedTarball__skia.mk +++ b/editors/libreoffice/files/patch-external_skia_UnpackedTarball__skia.mk @@ -1,9 +1,9 @@ --- external/skia/UnpackedTarball_skia.mk.orig 2022-05-12 13:26:05 UTC +++ external/skia/UnpackedTarball_skia.mk -@@ -41,6 +41,7 @@ skia_patches := \ - constexpr-template.patch.0 \ - missing-include.patch.0 \ +@@ -39,6 +39,7 @@ skia_patches := \ tdf147342.patch.0 \ + redefinition-of-op.patch.0 \ + 0001-Added-missing-include-cstdio.patch \ + gfx-skia-skia-src-core-SkCpu.cpp.patch.0 \ $(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1)) diff --git a/editors/libreoffice/files/patch-idl_source_objects_types.cxx b/editors/libreoffice/files/patch-idl_source_objects_types.cxx index ecbb2a6ec451..3f7d64fe737c 100644 --- a/editors/libreoffice/files/patch-idl_source_objects_types.cxx +++ b/editors/libreoffice/files/patch-idl_source_objects_types.cxx @@ -1,11 +1,11 @@ ---- idl/source/objects/types.cxx.orig 2022-12-22 00:14:09 UTC +--- idl/source/objects/types.cxx.orig 2023-05-11 20:19:01 UTC +++ idl/source/objects/types.cxx @@ -249,7 +249,7 @@ void SvMetaType::WriteSfxItem( // write the implementation part - rOutStm.WriteCharPtr( "#ifdef SFX_TYPEMAP" ) << endl; -- rOutStm.WriteCharPtr( "#if !defined(_WIN32) && (defined(DISABLE_DYNLOADING) && (defined(ANDROID) || defined(IOS) || defined(EMSCRIPTEN) || defined(LINUX)))" ) << endl; -+ rOutStm.WriteCharPtr( "#if !defined(_WIN32) && (defined(DISABLE_DYNLOADING) && (defined(ANDROID) || defined(IOS) || defined(EMSCRIPTEN) || defined(LINUX) || defined(FREEBSD)))" ) << endl; - rOutStm.WriteCharPtr( "__attribute__((__weak__))" ) << endl; - rOutStm.WriteCharPtr( "#endif" ) << endl; + rOutStm.WriteOString( "#ifdef SFX_TYPEMAP" ) << endl; +- rOutStm.WriteOString( "#if !defined(_WIN32) && (defined(DISABLE_DYNLOADING) && (defined(ANDROID) || defined(IOS) || defined(EMSCRIPTEN) || defined(LINUX)))" ) << endl; ++ rOutStm.WriteOString( "#if !defined(_WIN32) && (defined(DISABLE_DYNLOADING) && (defined(ANDROID) || defined(IOS) || defined(EMSCRIPTEN) || defined(LINUX) || defined(FREEBSD)))" ) << endl; + rOutStm.WriteOString( "__attribute__((__weak__))" ) << endl; + rOutStm.WriteOString( "#endif" ) << endl; rOutStm.WriteOString( aTypeName ).WriteOString( aVarName ) diff --git a/editors/libreoffice/files/patch-libreofficekit_qa_gtktiledviewer_gtv-calc-header-bar.cxx b/editors/libreoffice/files/patch-libreofficekit_qa_gtktiledviewer_gtv-calc-header-bar.cxx deleted file mode 100644 index 54ff73b0e27b..000000000000 --- a/editors/libreoffice/files/patch-libreofficekit_qa_gtktiledviewer_gtv-calc-header-bar.cxx +++ /dev/null @@ -1,10 +0,0 @@ ---- libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx.orig 2022-12-22 00:14:09 UTC -+++ libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx -@@ -11,6 +11,7 @@ - - #include <cmath> - #include <iostream> -+#include <vector> - - #include "gtv-calc-header-bar.hxx" - diff --git a/editors/libreoffice/files/patch-vcl_qt5_QtInstance.cxx b/editors/libreoffice/files/patch-vcl_qt5_QtInstance.cxx index c0fb5cd2591e..9440b937df52 100644 --- a/editors/libreoffice/files/patch-vcl_qt5_QtInstance.cxx +++ b/editors/libreoffice/files/patch-vcl_qt5_QtInstance.cxx @@ -1,4 +1,4 @@ ---- vcl/qt5/QtInstance.cxx.orig 2022-12-22 00:14:09 UTC +--- vcl/qt5/QtInstance.cxx.orig 2023-07-28 18:13:49 UTC +++ vcl/qt5/QtInstance.cxx @@ -492,7 +492,7 @@ QtInstance::createPicker(css::uno::Reference<css::uno: { @@ -13,7 +13,7 @@ extern "C" { VCLPLUG_QT_PUBLIC SalInstance* create_SalInstance() { -- static const bool bUseCairo = (nullptr != getenv("SAL_VCL_QT5_USE_CAIRO")); +- static const bool bUseCairo = (nullptr == getenv("SAL_VCL_QT_USE_QFONT")); + static const bool bUseCairo = true; // (nullptr != getenv("SAL_VCL_QT5_USE_CAIRO")); std::unique_ptr<char* []> pFakeArgv; |