Attachment 184243 Details for Bug 220614 – locale-fix

[patch] locale-fix

lightdm-gtk-greeter.diff (text/plain), 5.26 KB, created by Pawel Pekala on 2017-07-10 21:56:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pawel Pekala

Created: 2017-07-10 21:56:00 UTC

Size: 5.26 KB

patch

obsolete

>Index: lightdm/Makefile
>===================================================================
>--- lightdm/Makefile	(wersja 445017)
>+++ lightdm/Makefile	(kopia robocza)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	lightdm
> PORTVERSION=	1.20.0
>-PORTREVISION=	6
>+PORTREVISION=	7
> CATEGORIES=	x11
> MASTER_SITES=	https://launchpad.net/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}/+download/
> 
>Index: lightdm/files/patch-liblightdm-gobject_language.c
>===================================================================
>--- lightdm/files/patch-liblightdm-gobject_language.c	(wersja 445017)
>+++ lightdm/files/patch-liblightdm-gobject_language.c	(kopia robocza)
>@@ -1,8 +1,52 @@
> https://bugs.launchpad.net/lightdm/+bug/790186
> 
>---- liblightdm-gobject/language.c.orig	2016-12-09 01:04:48 UTC
>+--- liblightdm-gobject/language.c.orig	2016-09-30 03:23:52 UTC
> +++ liblightdm-gobject/language.c
>-@@ -248,10 +248,16 @@ lightdm_language_get_name (LightDMLangua
>+@@ -36,6 +36,12 @@ G_DEFINE_TYPE (LightDMLanguage, lightdm_language, G_TY
>+ static gboolean have_languages = FALSE;
>+ static GList *languages = NULL;
>+ 
>++static gboolean
>++is_utf8 (const gchar *code)
>++{
>++    return g_strrstr (code, ".utf8") || g_strrstr (code, ".UTF-8");
>++}
>++
>+ static void
>+ update_languages (void)
>+ {
>+@@ -72,7 +78,7 @@ update_languages (void)
>+                 continue;
>+ 
>+             /* Ignore the non-interesting languages */
>+-            if (strcmp (command, "locale -a") == 0 && !g_strrstr (code, ".utf8"))
>++            if (strcmp (command, "locale -a") == 0 && !is_utf8 (code))
>+                 continue;
>+ 
>+             language = g_object_new (LIGHTDM_TYPE_LANGUAGE, "code", code, NULL);
>+@@ -88,12 +94,6 @@ update_languages (void)
>+     have_languages = TRUE;
>+ }
>+ 
>+-static gboolean
>+-is_utf8 (const gchar *code)
>+-{
>+-    return g_strrstr (code, ".utf8") || g_strrstr (code, ".UTF-8");
>+-}
>+-
>+ /* Get a valid locale name that can be passed to setlocale(), so we always can use nl_langinfo() to get language and country names. */
>+ static gchar *
>+ get_locale_name (const gchar *code)
>+@@ -133,7 +133,7 @@ get_locale_name (const gchar *code)
>+         for (i = 0; avail_locales[i]; i++)
>+         {
>+             gchar *loc = avail_locales[i];
>+-            if (!g_strrstr (loc, ".utf8"))
>++            if (!is_utf8 (loc))
>+                 continue;
>+             if (g_str_has_prefix (loc, language))
>+             {
>+@@ -227,10 +227,16 @@ lightdm_language_get_name (LightDMLanguage *language)
>          if (locale)
>          {
>              gchar *current = setlocale (LC_ALL, NULL);
>@@ -19,7 +63,7 @@
>              if (language_en && strlen (language_en) > 0)
>                  priv->name = g_strdup (dgettext ("iso_639_3", language_en));
>  
>-@@ -291,10 +297,16 @@ lightdm_language_get_territory (LightDML
>+@@ -270,10 +276,16 @@ lightdm_language_get_territory (LightDMLanguage *langu
>          if (locale)
>          {
>              gchar *current = setlocale (LC_ALL, NULL);
>Index: lightdm-gtk-greeter/Makefile
>===================================================================
>--- lightdm-gtk-greeter/Makefile	(wersja 445017)
>+++ lightdm-gtk-greeter/Makefile	(kopia robocza)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	lightdm-gtk-greeter
> PORTVERSION=	2.0.2
>+PORTREVISION=	1
> CATEGORIES=	x11
> MASTER_SITES=	https://launchpad.net/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}/+download/
> 
>@@ -20,4 +21,8 @@
> USE_XFCE=	libexo
> USE_XORG=	x11
> 
>+post-install:
>+	(cd ${STAGEDIR}${PREFIX}/etc/lightdm && ${MV} lightdm-gtk-greeter.conf \
>+		lightdm-gtk-greeter.conf.sample)
>+
> .include <bsd.port.mk>
>Index: lightdm-gtk-greeter/files/patch-src_lightdm-gtk-greeter.c
>===================================================================
>--- lightdm-gtk-greeter/files/patch-src_lightdm-gtk-greeter.c	(nonexistent)
>+++ lightdm-gtk-greeter/files/patch-src_lightdm-gtk-greeter.c	(kopia robocza)
>@@ -0,0 +1,15 @@
>+--- src/lightdm-gtk-greeter.c.orig	2017-06-08 17:51:50 UTC
>++++ src/lightdm-gtk-greeter.c
>+@@ -2930,11 +2930,7 @@ main (int argc, char **argv)
>+             gchar *label;
>+             GtkWidget *radiomenuitem;
>+ 
>+-            country = lightdm_language_get_territory (language);
>+-            if (country)
>+-                label = g_strdup_printf ("%s - %s", lightdm_language_get_name (language), country);
>+-            else
>+-                label = g_strdup (lightdm_language_get_name (language));
>++	    label = g_strdup (lightdm_language_get_code (language));
>+ 
>+             code = lightdm_language_get_code (language);
>+             gchar *modifier = strchr (code, '@');
>
>Zmiany atrybutÃ³w dla: lightdm-gtk-greeter/files/patch-src_lightdm-gtk-greeter.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: lightdm-gtk-greeter/pkg-plist
>===================================================================
>--- lightdm-gtk-greeter/pkg-plist	(wersja 445017)
>+++ lightdm-gtk-greeter/pkg-plist	(kopia robocza)
>@@ -1,4 +1,4 @@
>-etc/lightdm/lightdm-gtk-greeter.conf
>+@sample etc/lightdm/lightdm-gtk-greeter.conf.sample
> sbin/lightdm-gtk-greeter
> %%PORTDOCS%%%%DOCSDIR%%/sample-lightdm-gtk-greeter.css
> share/icons/hicolor/scalable/places/budgie-desktop_badge-symbolic.svg

Actions: View | Diff

Attachments on bug 220614: 184243