Index: head/x11/lightdm/Makefile =================================================================== --- head/x11/lightdm/Makefile (revision 446522) +++ head/x11/lightdm/Makefile (revision 446523) @@ -1,68 +1,68 @@ # Created by: Ben Woods # $FreeBSD$ PORTNAME= lightdm PORTVERSION= 1.20.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11 MASTER_SITES= https://launchpad.net/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}/+download/ MAINTAINER= woodsb02@FreeBSD.org COMMENT= Lightweight Display Manager # library/bindings are LGPLv2 or LGPLv3, the rest GPLv3+ LICENSE= LGPL20 LGPL3 GPLv3 LICENSE_COMB= multi LICENSE_FILE_LGPL20= ${WRKSRC}/COPYING.LGPL2 LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LGPL3 LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING.GPL3 BUILD_DEPENDS= itstool:textproc/itstool LIB_DEPENDS= libaccountsservice.so:sysutils/accountsservice \ libck-connector.so:sysutils/consolekit \ libgcrypt.so:security/libgcrypt \ libxklavier.so:x11/libxklavier USES= compiler:c++11-lang localbase gettext gmake libtool pathfix \ pkgconfig tar:xz USE_CXXSTD= c++11 GNU_CONFIGURE= yes USE_GNOME= glib20 intlhack USE_XORG= x11 xcb xdmcp CONFIGURE_ARGS= --disable-tests # PAM errors INSTALL_TARGET= install-strip USE_RC_SUBR= lightdm SUB_FILES= Xsession USERS= lightdm GROUPS= lightdm OPTIONS_DEFINE= DOCS VALA OPTIONS_DEFAULT=VALA OPTIONS_SUB= yes DOCS_BUILD_DEPENDS= gtkdoc-check:textproc/gtk-doc DOCS_CONFIGURE_ENABLE= gtk-doc VALA_BUILD_DEPENDS= vapigen:lang/vala VALA_CONFIGURE_ENABLE= vala VALA_USE= gnome=introspection:build post-patch: @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' \ ${WRKSRC}/data/lightdm.conf post-install: ${RM} -r ${STAGEDIR}${PREFIX}/etc/init ${INSTALL_SCRIPT} ${WRKDIR}/Xsession ${STAGEDIR}${PREFIX}/etc/lightdm/ ${MV} ${STAGEDIR}${PREFIX}/etc/lightdm/keys.conf ${STAGEDIR}${PREFIX}/etc/lightdm/keys.conf.sample ${MV} ${STAGEDIR}${PREFIX}/etc/lightdm/lightdm.conf ${STAGEDIR}${PREFIX}/etc/lightdm/lightdm.conf.sample ${MV} ${STAGEDIR}${PREFIX}/etc/lightdm/users.conf ${STAGEDIR}${PREFIX}/etc/lightdm/users.conf.sample ${MKDIR} ${STAGEDIR}/var/cache/lightdm \ ${STAGEDIR}/var/log/lightdm \ ${STAGEDIR}/var/run/lightdm ${MKDIR} ${STAGEDIR}${PREFIX}/share/xgreeters @(cd ${STAGEDIR}${PREFIX}/share/xgreeters && \ ${LN} -sf lightdm-gtk-greeter.desktop default.desktop) .include Index: head/x11/lightdm/files/patch-liblightdm-gobject_language.c =================================================================== --- head/x11/lightdm/files/patch-liblightdm-gobject_language.c (revision 446522) +++ head/x11/lightdm/files/patch-liblightdm-gobject_language.c (revision 446523) @@ -1,38 +1,82 @@ 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); +#ifdef LC_IDENTIFICATION setlocale (LC_IDENTIFICATION, locale); +#endif setlocale (LC_MESSAGES, ""); +#ifdef _NL_IDENTIFICATION_LANGUAGE gchar *language_en = nl_langinfo (_NL_IDENTIFICATION_LANGUAGE); +#else + gchar *language_en = "Unknown"; +#endif 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); +#ifdef LC_IDENTIFICATION setlocale (LC_IDENTIFICATION, locale); +#endif setlocale (LC_MESSAGES, ""); +#ifdef _NL_IDENTIFICATION_TERRITORY gchar *country_en = nl_langinfo (_NL_IDENTIFICATION_TERRITORY); +#else + gchar *country_en = "Unknown"; +#endif if (country_en && strlen (country_en) > 0 && g_strcmp0 (country_en, "ISO") != 0) priv->territory = g_strdup (dgettext ("iso_3166", country_en)); Index: head/x11/lightdm-gtk-greeter/Makefile =================================================================== --- head/x11/lightdm-gtk-greeter/Makefile (revision 446522) +++ head/x11/lightdm-gtk-greeter/Makefile (revision 446523) @@ -1,23 +1,28 @@ # Created by: Ben Woods # $FreeBSD$ PORTNAME= lightdm-gtk-greeter PORTVERSION= 2.0.2 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= https://launchpad.net/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}/+download/ MAINTAINER= woodsb02@FreeBSD.org COMMENT= GTK+ greeter for LightDM LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= liblightdm-gobject-1.so:x11/lightdm USES= gettext gmake localbase pkgconfig xfce GNU_CONFIGURE= yes 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 Index: head/x11/lightdm-gtk-greeter/files/patch-src_lightdm-gtk-greeter.c =================================================================== --- head/x11/lightdm-gtk-greeter/files/patch-src_lightdm-gtk-greeter.c (nonexistent) +++ head/x11/lightdm-gtk-greeter/files/patch-src_lightdm-gtk-greeter.c (revision 446523) @@ -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, '@'); Property changes on: head/x11/lightdm-gtk-greeter/files/patch-src_lightdm-gtk-greeter.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/x11/lightdm-gtk-greeter/pkg-plist =================================================================== --- head/x11/lightdm-gtk-greeter/pkg-plist (revision 446522) +++ head/x11/lightdm-gtk-greeter/pkg-plist (revision 446523) @@ -1,98 +1,98 @@ -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 share/icons/hicolor/scalable/places/gnome-classic_badge-symbolic.svg share/icons/hicolor/scalable/places/gnome-fallback-compiz_badge-symbolic.svg share/icons/hicolor/scalable/places/gnome-fallback_badge-symbolic.svg share/icons/hicolor/scalable/places/gnome-flashback-compiz_badge-symbolic.svg share/icons/hicolor/scalable/places/gnome-flashback_badge-symbolic.svg share/icons/hicolor/scalable/places/gnome-shell_badge-symbolic.svg share/icons/hicolor/scalable/places/gnome_badge-symbolic.svg share/icons/hicolor/scalable/places/kde-plasma_badge-symbolic.svg share/icons/hicolor/scalable/places/kde_badge-symbolic.svg share/icons/hicolor/scalable/places/lubuntu_badge-symbolic.svg share/icons/hicolor/scalable/places/lxde_badge-symbolic.svg share/icons/hicolor/scalable/places/mate_badge-symbolic.svg share/icons/hicolor/scalable/places/pantheon_badge-symbolic.svg share/icons/hicolor/scalable/places/ubuntu-2d_badge-symbolic.svg share/icons/hicolor/scalable/places/ubuntu_badge-symbolic.svg share/icons/hicolor/scalable/places/ubuntustudio_badge-symbolic.svg share/icons/hicolor/scalable/places/wmaker-common_badge-symbolic.svg share/icons/hicolor/scalable/places/xfce_badge-symbolic.svg share/icons/hicolor/scalable/places/xterm_badge-symbolic.svg share/icons/hicolor/scalable/places/xubuntu_badge-symbolic.svg share/locale/ar/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/ast/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/be/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/bg/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/bn/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/bo/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/br/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/bs/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/ca/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/ca@valencia/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/cs/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/da/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/de/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/el/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/en_AU/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/en_CA/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/en_GB/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/eo/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/es/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/et/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/eu/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/fi/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/fr/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/fy/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/gd/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/gl/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/he/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/hi/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/hr/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/hu/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/ia/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/id/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/is/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/it/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/ja/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/kk/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/km/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/ko/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/ku/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/lb/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/lt/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/lv/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/mhr/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/ml/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/ms/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/nb/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/nl/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/nn/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/oc/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/pl/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/pt/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/pt_BR/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/ro/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/ru/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/sd/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/si/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/sk/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/sl/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/sq/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/sr/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/sv/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/ta/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/te/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/th/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/tr/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/ug/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/uk/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/uz/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/vi/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/wae/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/zh_CN/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/zh_HK/LC_MESSAGES/lightdm-gtk-greeter.mo share/locale/zh_TW/LC_MESSAGES/lightdm-gtk-greeter.mo share/xgreeters/lightdm-gtk-greeter.desktop