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

Related: rhbz#968892 discard impossible languages for Oriya script

Browse Source
This commit is contained in:
Caolán McNamara 2013-06-05 16:15:42 +01:00
parent 2ba3ff3a3e
commit 450caeb8f3
2 changed files with 62 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
0002-Related-rhbz-968892-discard-impossible-languages-for.patch Normal file
View File

@ -0,0 +1,56 @@
From 0e89a49f67f58e0942ed4aea393ac37e22d9e12d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Wed, 5 Jun 2013 15:59:50 +0100
Subject: [PATCH] Related: rhbz#968892 discard impossible languages for oriya
script fallback
Change-Id: I2fa1a127fbd2f905a89f0c30898ad56099fa8df1
---
vcl/generic/fontmanager/fontconfig.cxx | 28 ++++++++++++++++++----------
1 file changed, 18 insertions(+), 10 deletions(-)
diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx
index ff471fa..a305095 100644
--- a/vcl/generic/fontmanager/fontconfig.cxx
+++ b/vcl/generic/fontmanager/fontconfig.cxx
@@ -860,19 +860,27 @@ namespace
OUString sLang = rLangTag.getLanguage();
switch (eScript)
{
+ //http://en.wiktionary.org/wiki/Category:Oriya_script_languages
+ case USCRIPT_ORIYA:
+ bIsImpossible =
+ sLang != "or" &&
+ sLang != "kxv";
+ break;
+ //http://en.wiktionary.org/wiki/Category:Telugu_script_languages
case USCRIPT_TELUGU:
- bIsImpossible = sLang != "te";
+ bIsImpossible =
+ sLang != "te" &&
+ sLang != "gon" &&
+ sLang != "kfc";
break;
+ //http://en.wiktionary.org/wiki/Category:Bengali_script_languages
case USCRIPT_BENGALI:
- bIsImpossible = sLang != "bn" &&
- sLang != "as" && sLang != "mkb" &&
- sLang != "kfv" && sLang != "ccp" &&
- sLang != "tnv" && sLang != "ctg" &&
- sLang != "haj" && sLang != "ksy" &&
- sLang != "rkt" && sLang != "rjs" &&
- sLang != "rhg" && sLang != "syl" &&
- sLang != "kyv" && sLang != "zrg" &&
- sLang != "nhh";
+ bIsImpossible =
+ sLang != "bn" &&
+ sLang != "as" &&
+ sLang != "bpy" &&
+ sLang != "ctg" &&
+ sLang != "sa";
break;
default:
break;
--
1.8.1.4

7
libreoffice.spec
View File

@ -43,7 +43,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.0
Release: 5%{?libo_prerelease}%{?dist}
Release: 6%{?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.documentfoundation.org/develop
@ -254,6 +254,7 @@ Patch21: 0001-autosize-the-frame-direction-listbox.patch
Patch22: 0001-setting-max-line-count-should-allow-extra-values-to-.patch
Patch23: 0001-Resolves-rhbz-968892-force-render-full-grapheme-with.patch
Patch24: 0001-Related-rhbz-968892-discard-impossible-languages-for.patch
Patch25: 0002-Related-rhbz-968892-discard-impossible-languages-for.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/libreoffice
@ -997,6 +998,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
%patch22 -p1 -b .setting-max-line-count-should-allow-extra-values-to-.patch
%patch23 -p1 -b .rhbz-968892-force-render-full-grapheme-with.patch
%patch24 -p1 -b .rhbz-968892-discard-impossible-languages-for.patch
%patch25 -p1 -b .rhbz-968892-discard-impossible-languages-for.patch
# TODO: check this
# these are horribly incomplete--empty translations and copied english
@ -2060,6 +2062,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%endif
%changelog
* Wed Jun 05 2013 Caolán McNamara <caolanm@redhat.com> - 1:4.1.0.0-6.beta1
- Related: rhbz#968892 discard impossible languages for Oriya script
* Tue Jun 04 2013 Caolán McNamara <caolanm@redhat.com> - 1:4.1.0.0-5.beta1
- Resolves: rhbz#968892 block entire grapheme together for glyph fallback
- Related: rhbz#968892 discard impossible languages for glyph fallback