diff options
| author | Ben Woods <woodsb02@FreeBSD.org> | 2017-07-24 12:47:45 +0000 |
|---|---|---|
| committer | Ben Woods <woodsb02@FreeBSD.org> | 2017-07-24 12:47:45 +0000 |
| commit | 2300533f5500ce753463775974ff535f08a58d50 (patch) | |
| tree | 0dd1a4ea55f9ebe83df9b813f5324a6d936defda /x11/lightdm-gtk-greeter | |
| parent | 9d5d212aa13bfe069ff61b0fe9e0aac3dd1da34a (diff) | |
| download | ports-2300533f5500ce753463775974ff535f08a58d50.tar.gz ports-2300533f5500ce753463775974ff535f08a58d50.zip | |
x11/lightdm: Fix locale selection
- Allow locale selection on login screen. First, lightdm must be patched
to correctly detect utf8 locales, which have a UTF-8 suffix on FreeBSD
instead of utf8 like on Linux systems. Secondly, we have to use locale
codes in the language menuitem as FreeBSD doesn't have support for
locale naming (missing _NL_IDENTIFICATION_LANGUAGE implementation).
- Use @sample for lightdm-gtk-greeter config file to prevent it from
being overwritten when the package is reinstalled / upgraded.
PR: 220614
Submitted by: pawel
MFH: 2017Q3
Notes
Notes:
svn path=/head/; revision=446523
Diffstat (limited to 'x11/lightdm-gtk-greeter')
| -rw-r--r-- | x11/lightdm-gtk-greeter/Makefile | 5 | ||||
| -rw-r--r-- | x11/lightdm-gtk-greeter/files/patch-src_lightdm-gtk-greeter.c | 15 | ||||
| -rw-r--r-- | x11/lightdm-gtk-greeter/pkg-plist | 2 |
3 files changed, 21 insertions, 1 deletions
diff --git a/x11/lightdm-gtk-greeter/Makefile b/x11/lightdm-gtk-greeter/Makefile index 20fa0b9db4ec..2592488dc67a 100644 --- a/x11/lightdm-gtk-greeter/Makefile +++ b/x11/lightdm-gtk-greeter/Makefile @@ -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_GNOME= cairo gdkpixbuf2 gtk30 intltool 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> diff --git a/x11/lightdm-gtk-greeter/files/patch-src_lightdm-gtk-greeter.c b/x11/lightdm-gtk-greeter/files/patch-src_lightdm-gtk-greeter.c new file mode 100644 index 000000000000..8f41d73b3cd7 --- /dev/null +++ b/x11/lightdm-gtk-greeter/files/patch-src_lightdm-gtk-greeter.c @@ -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, '@'); diff --git a/x11/lightdm-gtk-greeter/pkg-plist b/x11/lightdm-gtk-greeter/pkg-plist index a56ba79b03c8..08e288a0e14a 100644 --- a/x11/lightdm-gtk-greeter/pkg-plist +++ b/x11/lightdm-gtk-greeter/pkg-plist @@ -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 |