From bf8c867d8def241251049ba14282cf338533498b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Wed, 4 Dec 2013 15:08:01 +0000 Subject: [PATCH] Resolves: rhbz#912529 Kerkis SmallCaps shown instead of Kerkis Regular --- ...2529-Kerkis-SmallCaps-shown-instead-.patch | 47 +++++++++++++++++++ libreoffice.spec | 5 +- 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 0001-Resolves-rhbz-912529-Kerkis-SmallCaps-shown-instead-.patch diff --git a/0001-Resolves-rhbz-912529-Kerkis-SmallCaps-shown-instead-.patch b/0001-Resolves-rhbz-912529-Kerkis-SmallCaps-shown-instead-.patch new file mode 100644 index 0000000..aa68715 --- /dev/null +++ b/0001-Resolves-rhbz-912529-Kerkis-SmallCaps-shown-instead-.patch @@ -0,0 +1,47 @@ +From 1ded21bfb99951ca947bd11a7442398668202ca6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Wed, 4 Dec 2013 15:04:04 +0000 +Subject: [PATCH] Resolves: rhbz#912529 Kerkis SmallCaps shown instead of + Kerkis Regular + +we encounter both fonts, but all their properties that we compare +are the same, so we think they are two versions of the same font +and throw away the "Regular" version. + +Change-Id: I24369f10c7a0edba1faa02621bb78616e880966e +--- + vcl/source/gdi/outdev3.cxx | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx +index c27cd93..f3f5a77 100644 +--- a/vcl/source/gdi/outdev3.cxx ++++ b/vcl/source/gdi/outdev3.cxx +@@ -665,7 +665,7 @@ PhysicalFontFace::PhysicalFontFace( const ImplDevFontAttributes& rDFA, int nMagi + + sal_Int32 PhysicalFontFace::CompareIgnoreSize( const PhysicalFontFace& rOther ) const + { +- // compare their width, weight, italic and style name ++ // compare their width, weight, italic, style name and family name + if( GetWidthType() < rOther.GetWidthType() ) + return -1; + else if( GetWidthType() > rOther.GetWidthType() ) +@@ -681,7 +681,14 @@ sal_Int32 PhysicalFontFace::CompareIgnoreSize( const PhysicalFontFace& rOther ) + else if( GetSlant() > rOther.GetSlant() ) + return 1; + +- return GetFamilyName().compareTo( rOther.GetFamilyName() ); ++ sal_Int32 nRet = GetFamilyName().compareTo( rOther.GetFamilyName() ); ++ ++ if (nRet == 0) ++ { ++ nRet = GetStyleName().compareTo( rOther.GetStyleName() ); ++ } ++ ++ return nRet; + } + + sal_Int32 PhysicalFontFace::CompareWithSize( const PhysicalFontFace& rOther ) const +-- +1.8.3.1 + diff --git a/libreoffice.spec b/libreoffice.spec index f065bc8..0ed8e8b 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -261,6 +261,7 @@ Patch10: libreoffice-rhel6glib.patch %endif Patch11: 0001-Related-rhbz-1032774-bodge-around-reported-NULL-valu.patch Patch12: 0001-Resolves-rhbz-1035092-no-shortcut-key-for-Italian-To.patch +Patch13: 0001-Resolves-rhbz-912529-Kerkis-SmallCaps-shown-instead-.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/libreoffice @@ -996,6 +997,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %endif %patch11 -p1 -b .rhbz-1032774-bodge-around-reported-NULL-valu.patch %patch12 -p1 -b .rhbz-1035092-no-shortcut-key-for-Italian-To.patch +%patch13 -p1 -b .rhbz-912529-Kerkis-SmallCaps-shown-instead-.patch # TODO: check this # these are horribly incomplete--empty translations and copied english @@ -2083,9 +2085,10 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog -* Wed Nov 27 2013 Caolán McNamara - 1:4.2.0.0-2.beta1-UNBUILT +* Wed Dec 04 2013 Caolán McNamara - 1:4.2.0.0-2.beta1-UNBUILT - Related: rhbz#1032774 bodge around reported NULL - Resolves: rhbz#1035092 no shortcut key for Italian 'Tools' menu +- Resolves: rhbz#912529 Kerkis SmallCaps shown instead of Kerkis Regular - openssl no longer required to build * Thu Nov 21 2013 David Tardon - 1:4.2.0.0-1.beta1