[libreoffice/f20] Resolves: rhbz#912529 Kerkis SmallCaps shown instead of Kerkis Regular

[Caolán McNamara]

commit acdf9b779892fcfb8bdb5915e5c6c12514ebd7e5
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Dec 4 15:11:46 2013 +0000

    Resolves: rhbz#912529 Kerkis SmallCaps shown instead of Kerkis Regular

 ...bz-912529-Kerkis-SmallCaps-shown-instead-.patch |   47 ++++++++++++++++++++
 libreoffice.spec                                   |    7 +++-
 2 files changed, 53 insertions(+), 1 deletions(-)
---
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?= <caolanm at redhat.com>
+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 df5e08c..a6a23c9 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -43,7 +43,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.2
-Release:        9%{?libo_prerelease}%{?dist}
+Release:        10%{?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 Artistic and MPLv2.0
 Group:          Applications/Productivity
 URL:            http://www.libreoffice.org/default/
@@ -279,6 +279,7 @@ Patch38: 0001-Rewrite-Qt4-based-nested-yield-mutex-locking.patch
 Patch39: 0001-Related-rhbz-1032774-bodge-around-reported-NULL-valu.patch
 Patch40: 0001-rhbz-1030009-Remove-global-XModel-ref.patch
 Patch41: 0001-Resolves-rhbz-1035092-no-shortcut-key-for-Italian-To.patch
+Patch42: 0001-Resolves-rhbz-912529-Kerkis-SmallCaps-shown-instead-.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
@@ -1055,6 +1056,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch39 -p1 -b .rhbz-1032774-bodge-around-reported-NULL-valu.pat
 %patch40 -p1 -b .rhbz-1030009-Remove-global-XModel-ref.patch
 %patch41 -p1 -b .rhbz-1035092-no-shortcut-key-for-Italian-To.patch
+%patch42 -p1 -b .rhbz-912529-Kerkis-SmallCaps-shown-instead-.patch
 
 # TODO: check this
 # these are horribly incomplete--empty translations and copied english
@@ -2144,6 +2146,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Wed Dec 04 2013 Caolán McNamara <caolanm at redhat.com> - 1:4.1.3.2-10
+- Resolves: rhbz#912529 Kerkis SmallCaps shown instead of Kerkis Regular
+
 * Tue Dec 03 2013 David Tardon <dtardon at redhat.com> - 1:4.1.3.2-9
 - rhbz#1000893 do not pull in unneeded packages