summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2015-03-31 19:45:27 +0300
committerIgor Pashev <pashev.igor@gmail.com>2015-03-31 19:45:27 +0300
commit79876b718582ed6f923ebe968e06d9dc5ae9eaca (patch)
tree98042e57e5f53d3a5bdc71c519de54539d1315f4
parent6873fc1af55d2f1190e110b930f2ea1ce302c847 (diff)
downloadlightdm-79876b718582ed6f923ebe968e06d9dc5ae9eaca.tar.gz
Added debian/patches/dyson-LC_IDENTIFICATION.patch
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/dyson-LC_IDENTIFICATION.patch36
-rw-r--r--debian/patches/series1
3 files changed, 38 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 8ac8610..252a3ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ lightdm (1.10.3-3+dyson1) UNRELEASED; urgency=medium
* debian/rules: disable compiling of tests: FTBFS on Dyson and are not
used anyway
* Added SMF service for Dyson
+ * Added debian/patches/dyson-LC_IDENTIFICATION.patch
-- Igor Pashev <pashev.igor@gmail.com> Tue, 31 Mar 2015 19:05:08 +0300
diff --git a/debian/patches/dyson-LC_IDENTIFICATION.patch b/debian/patches/dyson-LC_IDENTIFICATION.patch
new file mode 100644
index 0000000..979c5b3
--- /dev/null
+++ b/debian/patches/dyson-LC_IDENTIFICATION.patch
@@ -0,0 +1,36 @@
+Index: lightdm-1.10.3/liblightdm-gobject/language.c
+===================================================================
+--- lightdm-1.10.3.orig/liblightdm-gobject/language.c
++++ lightdm-1.10.3/liblightdm-gobject/language.c
+@@ -224,6 +224,7 @@ lightdm_language_get_name (LightDMLangua
+
+ if (!priv->name)
+ {
++#ifdef LC_IDENTIFICATION
+ gchar *locale = get_locale_name (priv->code);
+ if (locale)
+ {
+@@ -237,6 +238,7 @@ lightdm_language_get_name (LightDMLangua
+
+ setlocale (LC_ALL, current);
+ }
++#endif
+ if (!priv->name)
+ {
+ gchar **tokens = g_strsplit_set (priv->code, "_.@", 2);
+@@ -267,6 +269,7 @@ lightdm_language_get_territory (LightDML
+
+ if (!priv->territory && strchr (priv->code, '_'))
+ {
++#ifdef LC_IDENTIFICATION
+ gchar *locale = get_locale_name (priv->code);
+ if (locale)
+ {
+@@ -280,6 +283,7 @@ lightdm_language_get_territory (LightDML
+
+ setlocale (LC_ALL, current);
+ }
++#endif
+ if (!priv->territory)
+ {
+ gchar **tokens = g_strsplit_set (priv->code, "_.@", 3);
diff --git a/debian/patches/series b/debian/patches/series
index 4d88677..385ac82 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
03_use-desktopnames-properties.patch
05_debianize-pam-files.patch
06_change-user-dirs.patch
+dyson-LC_IDENTIFICATION.patch