Date: Fri, 8 Jan 2016 00:40:49 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r405493 - in head/x11/gnome-desktop: . files Message-ID: <201601080040.u080enuB013352@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kwm Date: Fri Jan 8 00:40:48 2016 New Revision: 405493 URL: https://svnweb.freebsd.org/changeset/ports/405493 Log: 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. Added: head/x11/gnome-desktop/files/ head/x11/gnome-desktop/files/patch-libgnome-desktop_gnome-languages.c (contents, props changed) Modified: head/x11/gnome-desktop/Makefile Modified: head/x11/gnome-desktop/Makefile ============================================================================== --- head/x11/gnome-desktop/Makefile Fri Jan 8 00:01:53 2016 (r405492) +++ head/x11/gnome-desktop/Makefile Fri Jan 8 00:40:48 2016 (r405493) @@ -3,6 +3,7 @@ PORTNAME= gnome-desktop PORTVERSION= 3.16.2 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 Added: head/x11/gnome-desktop/files/patch-libgnome-desktop_gnome-languages.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/gnome-desktop/files/patch-libgnome-desktop_gnome-languages.c Fri Jan 8 00:40:48 2016 (r405493) @@ -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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601080040.u080enuB013352>