summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosselin Mouette <joss@debian.org>2013-11-23 19:53:29 +0100
committerJosselin Mouette <joss@debian.org>2013-11-23 19:53:29 +0100
commite4c649dbe160ab10045c1f6435b5197dcf10c863 (patch)
tree191ddfd55c222859ff85f77664424ab9a3a91e26
parent5794deac7c27e67cd9596d8b0f557b8b9eaff9ab (diff)
03_locale_c.utf8.patch: based on a patch from Martin Dickopp. Treat C.UTF-8 and C.utf8 locales as built in the C library. Closes: #717423.
-rw-r--r--debian/changelog3
-rw-r--r--debian/patches/03_locale_c.utf8.patch13
-rw-r--r--debian/patches/series1
3 files changed, 17 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index b5de639..9e75861 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ fontconfig (2.11.0-2) unstable; urgency=low
* 02_indic_names.patch: patch from Vasudev Kamath to fix Indic font
family names. Closes: #661245.
* Mark libfontconfig1-dev as multi-arch: same. Closes: #677885.
+ * 03_locale_c.utf8.patch: based on a patch from Martin Dickopp. Treat
+ C.UTF-8 and C.utf8 locales as built in the C library.
+ Closes: #717423.
-- Josselin Mouette <joss@debian.org> Fri, 22 Nov 2013 10:15:58 +0100
diff --git a/debian/patches/03_locale_c.utf8.patch b/debian/patches/03_locale_c.utf8.patch
new file mode 100644
index 0000000..8f23f97
--- /dev/null
+++ b/debian/patches/03_locale_c.utf8.patch
@@ -0,0 +1,13 @@
+Index: fontconfig-2.11.0/src/fclang.c
+===================================================================
+--- fontconfig-2.11.0.orig/src/fclang.c 2013-11-23 19:51:18.830649663 +0100
++++ fontconfig-2.11.0/src/fclang.c 2013-11-23 19:51:37.697966141 +0100
+@@ -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");
diff --git a/debian/patches/series b/debian/patches/series
index fd6afe9..a42e258 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
01_path_max.patch
02_indic_names.patch
+03_locale_c.utf8.patch