rpms/libreoffice
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rhbz#1875377 prefer Cantarell-Regular to Cantarell-VF

Browse Source
This commit is contained in:
Caolán McNamara 2020-09-04 19:57:40 +01:00
parent 95946f1f59
commit fc6d7bf832
2 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
0001-rhbz-1875377-if-sort-order-is-equivalent-keep-order-.patch Normal file
View File

@ -0,0 +1,43 @@
From 1104a217092f7a609166113c2e911589f62b647c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Fri, 4 Sep 2020 19:38:52 +0100
Subject: [PATCH] rhbz#1875377 if sort order is equivalent keep order
fontconfig presents
there are two fonts in fedora 32/33 for regular Cantarell
/usr/share/fonts/cantarell/Cantarell-Regular.otf
and
/usr/share/fonts/cantarell/Cantarell-VF.otf
where VF is the Variable Font version. The Cantarell-Regular
ones has a CFF table and export to pdf creates a font subset
that works perfectly fine. The VF one does not have a CFF
table and the fallback case doesn't work for pdf export.
Both have the same version, use a stable sort to retain
their relative order that fontconfig presents so we use
the Cantarell-Regular version we would see if we didn't
sort by version at all.
Change-Id: I750006b980810fc59e0a152d42ae17f29f46e3b3
---
vcl/unx/generic/fontmanager/fontconfig.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx
index dea4cd548949..a87c2c21094c 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -213,7 +213,7 @@ FcFontSet* FontCfgWrapper::getFontSet()
addFontSet( FcSetSystem );
addFontSet( FcSetApplication );
- ::std::sort(m_pFontSet->fonts,m_pFontSet->fonts+m_pFontSet->nfont,SortFont());
+ std::stable_sort(m_pFontSet->fonts,m_pFontSet->fonts+m_pFontSet->nfont,SortFont());
}
return m_pFontSet;
--
2.26.2

6
libreoffice.spec
View File

@ -50,7 +50,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.2
Release: 2%{?libo_prerelease}%{?dist}
Release: 3%{?libo_prerelease}%{?dist}
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0
URL: http://www.libreoffice.org/
@ -245,6 +245,7 @@ Patch3: 0001-fix-detecting-qrcodegen.patch
Patch4: 0001-Pass-fno-lto-unconditionally.patch
Patch5: 0001-rhbz-1870501-crash-on-reexport-of-odg.patch
Patch6: 0001-CppunitTest_sw_htmlexport-The-actual-PNG-data-does-n.patch
Patch7: 0001-rhbz-1875377-if-sort-order-is-equivalent-keep-order-.patch
%if 0%{?rhel}
# not upstreamed
@ -2225,6 +2226,9 @@ done
%{_includedir}/LibreOfficeKit
%changelog
* Fri Sep 04 2020 Caolán McNamara <caolanm@redhat.com> - 1:7.0.1.2-2
- rhbz#1875377 prefer Cantarell-Regular to Cantarell-VF
* Thu Sep 03 2020 Merlin Mathesius <mmathesi@redhat.com> - 1:7.0.1.2-2
- Rebase RHEL patch to disable libe-book support to libreoffice-7.0
- Add BR perl(base)