diff options
| author | Koop Mast <kwm@FreeBSD.org> | 2016-01-08 00:40:48 +0000 |
|---|---|---|
| committer | Koop Mast <kwm@FreeBSD.org> | 2016-01-08 00:40:48 +0000 |
| commit | 98c7e4b38ce73332b139b6132a71edfa93f9a964 (patch) | |
| tree | c9d4bba9d9ebd0c58daceaf2f07ec046387174d9 /x11/gnome-desktop | |
| parent | a901acd4955304bd69b8c3d272d053248fe47cb5 (diff) | |
| download | ports-98c7e4b38ce73332b139b6132a71edfa93f9a964.tar.gz ports-98c7e4b38ce73332b139b6132a71edfa93f9a964.zip | |
Fix a crash in gnome-control-center when the Region panel is selected
on FreeBSD 11.
When the region panel is selected it would crash right after printing:
GnomeDesktop-WARNING **: locale 'kk_Cyrl_KZ.UTF-8' isn't valid
This is because the gnome-desktop code that processes the locale doesn't
handle multi language locales like the one above. And the code wasn't
taking into account that language might be NULL.
Notes
Notes:
svn path=/head/; revision=405493
Diffstat (limited to 'x11/gnome-desktop')
| -rw-r--r-- | x11/gnome-desktop/Makefile | 1 | ||||
| -rw-r--r-- | x11/gnome-desktop/files/patch-libgnome-desktop_gnome-languages.c | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile index 566a99da4956..8ca15b581389 100644 --- a/x11/gnome-desktop/Makefile +++ b/x11/gnome-desktop/Makefile @@ -3,6 +3,7 @@ PORTNAME= gnome-desktop PORTVERSION= 3.16.2 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 diff --git a/x11/gnome-desktop/files/patch-libgnome-desktop_gnome-languages.c b/x11/gnome-desktop/files/patch-libgnome-desktop_gnome-languages.c new file mode 100644 index 000000000000..2892239bb633 --- /dev/null +++ b/x11/gnome-desktop/files/patch-libgnome-desktop_gnome-languages.c @@ -0,0 +1,11 @@ +--- libgnome-desktop/gnome-languages.c.orig 2016-01-08 00:52:40.415603000 +0100 ++++ libgnome-desktop/gnome-languages.c 2016-01-08 01:30:53.511431000 +0100 +@@ -229,7 +231,7 @@ + { + char *name; + +- g_assert (language[0] != 0); ++ g_assert (language == NULL || language[0] != 0); + g_assert (territory == NULL || territory[0] != 0); + g_assert (codeset == NULL || codeset[0] != 0); + g_assert (modifier == NULL || modifier[0] != 0); |