diff options
| author | Dima Panov <fluffy@FreeBSD.org> | 2021-10-14 13:39:40 +0000 |
|---|---|---|
| committer | Dima Panov <fluffy@FreeBSD.org> | 2021-10-14 13:39:40 +0000 |
| commit | 0d4e1324d6369d5e4825bb49d26e36cd443cceba (patch) | |
| tree | e0fdcf72de5db58d77571e9388148f8a0fa968ed /editors/libreoffice | |
| parent | 9fe9bf90d825cc3d32200aa48d1191f510c5ce8e (diff) | |
| download | ports-0d4e1324d6369d5e4825bb49d26e36cd443cceba.tar.gz ports-0d4e1324d6369d5e4825bb49d26e36cd443cceba.zip | |
editors/libreoffice: update to 7.2.2 release (+)
LibreOffice 7.2.2 is now available, with 68 bugfixes and compatibility improvements.
Learn more: https://blog.documentfoundation.org/blog/2021/10/14/libreoffice-7-2-2-community/
Diffstat (limited to 'editors/libreoffice')
| -rw-r--r-- | editors/libreoffice/Makefile | 3 | ||||
| -rw-r--r-- | editors/libreoffice/Makefile.common | 4 | ||||
| -rw-r--r-- | editors/libreoffice/distinfo | 10 | ||||
| -rw-r--r-- | editors/libreoffice/files/patch-external_skia_UnpackedTarball__skia.mk | 9 | ||||
| -rw-r--r-- | editors/libreoffice/files/skia-freetype2.11.patch | 38 |
5 files changed, 13 insertions, 51 deletions
diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile index 4da428deaeef..e04fa3dea807 100644 --- a/editors/libreoffice/Makefile +++ b/editors/libreoffice/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 1 +PORTREVISION= 0 .include "${.CURDIR}/Makefile.common" @@ -321,7 +321,6 @@ post-patch: pre-configure: @${TOUCH} ${WRKSRC}/autogen.lastrun - ${CP} ${FILESDIR}/skia-freetype2.11.patch ${WRKSRC}/external/skia post-configure: @${TOUCH} ${WRKSRC}/src.downloaded diff --git a/editors/libreoffice/Makefile.common b/editors/libreoffice/Makefile.common index 5618694b860d..394ad090f045 100644 --- a/editors/libreoffice/Makefile.common +++ b/editors/libreoffice/Makefile.common @@ -7,5 +7,7 @@ LICENSE= LGPL3+ MPL20 LICENSE_COMB= dual DISTVERSION= ${LOVERSION}.${RCVER} -LOVERSION= 7.2.1 +LOVERSION= 7.2.2 RCVER= 2 + +#PRERELEASE= yes diff --git a/editors/libreoffice/distinfo b/editors/libreoffice/distinfo index 17e39f0bf38b..eb4f0785d53e 100644 --- a/editors/libreoffice/distinfo +++ b/editors/libreoffice/distinfo @@ -1,8 +1,8 @@ -TIMESTAMP = 1631364572 -SHA256 (libreoffice/libreoffice-7.2.1.2.tar.xz) = 7a16b46fb397e72fce2d06b786025f321da12ccc39c9976510674ff9119b0a4d -SIZE (libreoffice/libreoffice-7.2.1.2.tar.xz) = 252232072 -SHA256 (libreoffice/libreoffice-help-7.2.1.2.tar.xz) = 804d75b09569bb4c3e2ab24ca070467f0fa7073e48208760c6d2d52411864c95 -SIZE (libreoffice/libreoffice-help-7.2.1.2.tar.xz) = 111988048 +TIMESTAMP = 1633769129 +SHA256 (libreoffice/libreoffice-7.2.2.2.tar.xz) = 813bc3caa48c3c4af35b6a48bcf9cd19305ff0b81ce9b5304052c10ce5b02b71 +SIZE (libreoffice/libreoffice-7.2.2.2.tar.xz) = 252478892 +SHA256 (libreoffice/libreoffice-help-7.2.2.2.tar.xz) = 03a177e73941b26a17fd5e0f5b92ebc759262f556847f8f97956cc497334c5c2 +SIZE (libreoffice/libreoffice-help-7.2.2.2.tar.xz) = 111988404 SHA256 (libreoffice/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf) = f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140 SIZE (libreoffice/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf) = 207992 SHA256 (libreoffice/dtoa-20180411.tgz) = 0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4 diff --git a/editors/libreoffice/files/patch-external_skia_UnpackedTarball__skia.mk b/editors/libreoffice/files/patch-external_skia_UnpackedTarball__skia.mk index f8239e909752..bfac523ee3be 100644 --- a/editors/libreoffice/files/patch-external_skia_UnpackedTarball__skia.mk +++ b/editors/libreoffice/files/patch-external_skia_UnpackedTarball__skia.mk @@ -1,11 +1,10 @@ ---- external/skia/UnpackedTarball_skia.mk.orig 2021-09-08 17:53:20 UTC +--- external/skia/UnpackedTarball_skia.mk.orig 2021-02-05 14:00:19 UTC +++ external/skia/UnpackedTarball_skia.mk -@@ -39,6 +39,8 @@ skia_patches := \ - fast-png-write.patch.1 \ - skia_sk_cpu_sse_level_0_by_default.patch.1 \ +@@ -41,6 +41,7 @@ skia_patches := \ fix-warnings.patch.1 \ + disable-freetype-colrv1.1 \ + windows-libraries-system32.patch.1 \ + gfx-skia-skia-src-core-SkCpu.cpp.patch.0 \ -+ skia-freetype2.11.patch \ $(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1)) diff --git a/editors/libreoffice/files/skia-freetype2.11.patch b/editors/libreoffice/files/skia-freetype2.11.patch deleted file mode 100644 index aabdb1f8c6e1..000000000000 --- a/editors/libreoffice/files/skia-freetype2.11.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- skia/src/ports/SkFontHost_FreeType_common.cpp.orig 2021-03-01 15:53:09.178606791 +0100 -+++ skia/src/ports/SkFontHost_FreeType_common.cpp 2021-08-12 17:48:32.358901987 +0200 -@@ -665,8 +665,13 @@ - canvas->drawPaint(paint); - break; - } -+#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11 -+ case FT_COLR_PAINTFORMAT_TRANSFORM: { -+ SkMatrix transform = ToSkMatrix(colrv1_paint.u.transform.affine); -+#else - case FT_COLR_PAINTFORMAT_TRANSFORMED: { - SkMatrix transform = ToSkMatrix(colrv1_paint.u.transformed.affine); -+#endif - - canvas->concat(transform); - break; -@@ -760,12 +765,20 @@ - traverse_result = colrv1_start_glyph(canvas, palette, face, paint.u.colr_glyph.glyphID, - FT_COLOR_NO_ROOT_TRANSFORM); - break; -+#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11 -+ case FT_COLR_PAINTFORMAT_TRANSFORM: -+#else - case FT_COLR_PAINTFORMAT_TRANSFORMED: -+#endif - canvas->saveLayer(nullptr, nullptr); - // Traverse / draw operation will apply transform. - colrv1_draw_paint(canvas, palette, face, paint); - traverse_result = -+#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11 -+ colrv1_traverse_paint(canvas, palette, face, paint.u.transform.paint); -+#else - colrv1_traverse_paint(canvas, palette, face, paint.u.transformed.paint); -+#endif - canvas->restore(); - break; - case FT_COLR_PAINTFORMAT_ROTATE: - |