7.5.4.2

.gitignore

@@ -11,3 +11,9 @@
 /libreoffice-help-7.5.3.2.tar.xz.asc
 /libreoffice-translations-7.5.3.2.tar.xz
 /libreoffice-translations-7.5.3.2.tar.xz.asc
+/libreoffice-7.5.4.2.tar.xz
+/libreoffice-7.5.4.2.tar.xz.asc
+/libreoffice-help-7.5.4.2.tar.xz
+/libreoffice-help-7.5.4.2.tar.xz.asc
+/libreoffice-translations-7.5.4.2.tar.xz
+/libreoffice-translations-7.5.4.2.tar.xz.asc

0001-tdf-155161-Always-embed-fonts-with-CFF2-table-as-PDF.patch

@@ -1,42 +0,0 @@
-From 79250a55589007930278e3fa59ccdf24c6ff8ea6 Mon Sep 17 00:00:00 2001
-From: Khaled Hosny <khaled@aliftype.com>
-Date: Mon, 8 May 2023 16:14:52 +0300
-Subject: [PATCH] tdf#155161: Always embed fonts with CFF2 table as PDF Type 3
- fonts
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-PDF doesn’t support CFF2 table and we currently don’t convert them to
-Type 1 (like we do with CFF table), so treat it like fonts with
-variations and embed as Type 3 fonts.
-
-Change-Id: I963b55d5d0ed1470eda157c7e10cae63195a0c91
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151515
-Tested-by: Jenkins
-Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
----
- vcl/source/gdi/pdfwriter_impl.cxx | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
-index 6b9fb711626a..ce26ea6b1342 100644
---- a/vcl/source/gdi/pdfwriter_impl.cxx
-+++ b/vcl/source/gdi/pdfwriter_impl.cxx
-@@ -6283,6 +6283,13 @@ void PDFWriterImpl::registerGlyph(const sal_GlyphId nFontGlyphId,
-                                   sal_uInt8& nMappedGlyph, sal_Int32& nMappedFontObject)
- {
-     auto bVariations = !pFace->GetVariations(*pFont).empty();
-+    // tdf#155161
-+    // PDF doesn’t support CFF2 table and we currently don’t convert them to
-+    // Type 1 (like we do with CFF table), so treat it like fonts with
-+    // variations and embed as Type 3 fonts.
-+    if (!pFace->GetRawFontData(HB_TAG('C', 'F', 'F', '2')).empty())
-+        bVariations = true;
-+
-     if (pFace->IsColorFont() || bVariations)
-     {
-         // Font has colors, check if this glyph has color layers or bitmap.
--- 
-2.40.1
-

libreoffice.spec

@@ -1,5 +1,5 @@
 # download path contains version without the last (fourth) digit
-%global libo_version 7.5.3
+%global libo_version 7.5.4
 # Should contain .alphaX / .betaX, if this is pre-release (actually
 # pre-RC) version. The pre-release string is part of tarball file names,
 # so we need a way to define it easily at one place.
@@ -55,7 +55,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.2
-Release:        4%{?libo_prerelease}%{?dist}
+Release:        1%{?libo_prerelease}%{?dist}
 # default new files are: MPLv2
 # older files are typically: MPLv2 incorporating work under ASLv2
 # nlpsolver is: LGPLv3
@@ -268,7 +268,6 @@ Patch4: 0001-default-to-sifr-for-gnome-light-mode.patch
 # TODO investigate these
 Patch5: 0001-aarch64-failing-here.patch
 Patch6: 0001-include-filename-if-the-test-fails.patch
-Patch7: 0001-tdf-155161-Always-embed-fonts-with-CFF2-table-as-PDF.patch
 # not upstreamed
 Patch500: 0001-disable-libe-book-support.patch
 
@@ -2249,6 +2248,10 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
 %{_includedir}/LibreOfficeKit
 
 %changelog
+* Fri Jun 16 2023 Gwyn Ciesla <gwync@protonmail.com> - 1:7.5.4.2-1
+- 7.5.4.2
+- Drop 0001-tdf-155161-Always-embed-fonts-with-CFF2-table-as-PDF.patch, upstreamed.
+
 * Thu Jun 15 2023 Gwyn Ciesla <gwync@protonmail.com> - 1:7.5.3.2-4
 - Disable tests temporarily to resolve FTBFS.
 

sources

@@ -5,9 +5,9 @@ SHA512 (f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens__
 SHA512 (libreoffice-multiliblauncher.sh) = db532afdf5000bc66f9e02c7d0ab586468466f63f8f0bdb204832581e8277c5c59f688fa096548d642411cb8c46e8de4a744676b4e624c075262cfd6945138cd
 SHA512 (dragonbox-1.1.3.tar.gz) = 41ac356ebced3312c0f9ea0f07ff372337ab78af69071f63f63dc12bd2b0088d5d89aae3792276599dd0393bfdfd2b979946c43d36042e43105080bcdcbe089d
 SHA512 (dtoa-20180411.tgz) = 722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85
-SHA512 (libreoffice-7.5.3.2.tar.xz) = ea3b05fe7ac42a23766759712fbab9ab0bcf0cbf3177cd7f0f680140d52661ae626caf89c7c4cce0e557c309ac1980875abfb520ad09d885c32bd1c6e9eec61e
+SHA512 (libreoffice-7.5.4.2.tar.xz) = 582aa92a5cac3970a1fef96d6fbc4bd398c9f5705b5d9a05c83f374932a8050e7c3a20abe45d13db87eadc93334d9f3e6fb11075a86d7ad49c2f7768baedb6b3
-SHA512 (libreoffice-7.5.3.2.tar.xz.asc) = 92ff4bba306d923871d83da0c68310fa02d6235f85e6cd480f3f944d6b555f43b3b6528298dcb387511cd8886f4f22cc6cbf2a4532ce0deeacd73c591771a634
+SHA512 (libreoffice-7.5.4.2.tar.xz.asc) = 040f749e4f3c77ae690c4c4806967d02e6de69b9106202f52b92111360297540fe0f0f6cb13ee0f33dc4860c1ba635310d16152980f956a546c7da09cc405a2b
-SHA512 (libreoffice-help-7.5.3.2.tar.xz) = 8a8f7915de4eafbfafc81c66de70410b1ca827ec8dc40db55ad2275dc1544da471b2de5aacb42ad31b03a676f5133df78a70332810588895d950083f3b8724f4
+SHA512 (libreoffice-help-7.5.4.2.tar.xz) = cea4222d05c2d5ce661758f080e26bf4bab3d158936b85482ec885241a5cb2abb38be108b1c5ed909b2d1ea762c550211330400377b89c483f4e9e3c8af16f3a
-SHA512 (libreoffice-help-7.5.3.2.tar.xz.asc) = 3a9de105841be296e5b3e03ff826bb357b1f448e7031147ae51b9d5d974e9b3fc808cbba8dd5475abb33ef7159c722d5ab9a589de5f5da3f4c69ca09554bc692
+SHA512 (libreoffice-help-7.5.4.2.tar.xz.asc) = b3a58049c177ea7577e32a2a450e3c614915e25e0b938cb28defbfe435b341edced8e82e868ad5245039fbb7b957206d79f0e2a36da65ee7986f310f88800810
-SHA512 (libreoffice-translations-7.5.3.2.tar.xz) = 7ad669b20e866ca16a952757664a20fab2461f6607cc5f08ff174b309d09941695580c19c123a87f3c616c98f18a964c06c4e0435b5f6c595e492233edc62b7f
+SHA512 (libreoffice-translations-7.5.4.2.tar.xz) = 336259c9c42d5209ae0467891d2ff16c5cc556bf73a2972eb2fff26f1ebc829cc5b819e81a79f108114938eca61ebb44935ae1d0397683557c321a249df31b49
-SHA512 (libreoffice-translations-7.5.3.2.tar.xz.asc) = cf2a80d3a3ad6b0dde9be3cc97f350c0af10c092d94c87e7bdcb92c9d2ee7f7461be009112d3707d58e184392f14922692b074609fefd048ae549992f7b98e3e
+SHA512 (libreoffice-translations-7.5.4.2.tar.xz.asc) = 2b44adf83ea768500c745e1068fbf35caf8f8a1edeb7c6ab531e28be151e041de6bd3a29c529ce42375f688b30fb7608ae27aa842de381823d189425d80d181f