Accepting request 369216 from home:namtrac:branches:M17N

- Add fontconfig-locale_c.utf8.patch to recognize C.UTF-8 locale,
  patch from Debian.

OBS-URL: https://build.opensuse.org/request/show/369216
OBS-URL: https://build.opensuse.org/package/show/M17N/fontconfig?expand=0&rev=133
This commit is contained in:
Takashi Iwai 2016-03-09 16:54:30 +00:00 committed by Git OBS Bridge
parent 2db7963b82
commit f76cb72a73
3 changed files with 22 additions and 1 deletions

View File

@ -0,0 +1,13 @@
Index: fontconfig-2.11.1/src/fclang.c
===================================================================
--- fontconfig-2.11.1.orig/src/fclang.c
+++ fontconfig-2.11.1/src/fclang.c
@@ -189,6 +189,8 @@ FcLangNormalize (const FcChar8 *lang)
return NULL;
if (FcStrCmpIgnoreCase (lang, (const FcChar8 *)"C") == 0 ||
+ FcStrCmpIgnoreCase (lang, (const FcChar8 *)"C.UTF-8") == 0 ||
+ FcStrCmpIgnoreCase (lang, (const FcChar8 *)"C.utf8") == 0 ||
FcStrCmpIgnoreCase (lang, (const FcChar8 *)"POSIX") == 0)
{
result = FcStrCopy ((const FcChar8 *)"en");

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Mar 9 16:20:54 UTC 2016 - idonmez@suse.com
- Add fontconfig-locale_c.utf8.patch to recognize C.UTF-8 locale,
patch from Debian.
-------------------------------------------------------------------
Tue May 19 06:56:57 UTC 2015 - fstrba@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package fontconfig
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -30,6 +30,7 @@ Source5: local.conf
# suse specific because freetype2-bitmap-foundry.patch
# https://www.libreoffice.org/bugzilla/show_bug.cgi?id=47704
Patch0: make-check.patch
Patch1: fontconfig-locale_c.utf8.patch
BuildRequires: automake >= 1.11
BuildRequires: freetype2-devel
BuildRequires: libexpat-devel
@ -106,6 +107,7 @@ accepts font patterns and returns the nearest matching font.
tar -xvf %{SOURCE1}
%endif
%patch0 -p1
%patch1 -p1
# use suse-specific doc path:
find -name \*.1 -o -name \*.sgml | xargs sed -i -e 's/usr\/share\/doc\/fontconfig/usr\/share\/doc\/packages\/fontconfig/g'