x11/lightdm: Update to 1.30.0, fix crash and change default config

This update addresses a crash in lightdm, related to the way the
user environment for the lightdm process is setup in src/process.c.

The configuration option in lightdm.conf for locked memory is now
honoured - the default configuration has been updated to disable this,
and pkg-message has been updated to reflect this change.

Changes this release:
  https://github.com/CanonicalLtd/lightdm/releases/tag/1.30.0

PR:		238083
Submitted by:	madpilot
Reported by:	David.Boyd49@twc.com
Differential Revision:	https://reviews.freebsd.org/D20541

6 files changed, 143 insertions, 144 deletions

diff --git a/x11/lightdm/Makefile b/x11/lightdm/Makefile
index fece8ca18e34..642b56ab1e5d 100644
--- a/x11/lightdm/Makefile
+++ b/x11/lightdm/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	lightdm
-PORTVERSION=	1.28.0
-PORTREVISION=	1
+PORTVERSION=	1.30.0
 CATEGORIES=	x11
 MASTER_SITES=	https://github.com/CanonicalLtd/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/
 
@@ -39,16 +38,16 @@ GROUPS=		lightdm
 PORTSCOUT=	limitw:1,even
 SUB_FILES=	Xsession
 
-OPTIONS_DEFINE=	DOCS VALA
-OPTIONS_DEFAULT=VALA
+OPTIONS_DEFINE=	DOCS VAPI
+OPTIONS_DEFAULT=VAPI
 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
+VAPI_BUILD_DEPENDS=	vapigen:lang/vala
+VAPI_CONFIGURE_ENABLE=	vala
+VAPI_USE=		gnome=introspection:build
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' \
diff --git a/x11/lightdm/distinfo b/x11/lightdm/distinfo
index 5a51b4844a43..022d54bad452 100644
--- a/x11/lightdm/distinfo
+++ b/x11/lightdm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1549074437
-SHA256 (lightdm-1.28.0.tar.xz) = f20f599d8d7cf90b77a2df33c6e9e615abc443123b1b228de1c20a636aecfa07
-SIZE (lightdm-1.28.0.tar.xz) = 517460
+TIMESTAMP = 1559844986
+SHA256 (lightdm-1.30.0.tar.xz) = a118779650a3a5b20f05d53c4f9e377b484fbc1810a6b0914a60840d9a581f95
+SIZE (lightdm-1.30.0.tar.xz) = 509220
diff --git a/x11/lightdm/files/patch-data_lightdm.conf b/x11/lightdm/files/patch-data_lightdm.conf
index 24def133f02f..4fa124de5e6e 100644
--- a/x11/lightdm/files/patch-data_lightdm.conf
+++ b/x11/lightdm/files/patch-data_lightdm.conf
@@ -1,15 +1,17 @@
---- data/lightdm.conf.orig	2016-12-07 02:20:29 UTC
+--- data/lightdm.conf.orig	2018-09-05 01:33:31 UTC
 +++ data/lightdm.conf
-@@ -22,7 +22,7 @@
+@@ -22,8 +22,8 @@
  #start-default-seat=true
  #greeter-user=lightdm
  #minimum-display-number=0
 -#minimum-vt=7
+-#lock-memory=true
 +minimum-vt=9
- #lock-memory=true
++lock-memory=false
  #user-authority-in-system-dir=false
  #guest-account-script=guest-account
-@@ -114,7 +114,7 @@
+ #logind-check-graphical=false
+@@ -108,7 +108,7 @@
  #allow-user-switching=true
  #allow-guest=true
  #guest-session=
diff --git a/x11/lightdm/files/patch-src_process.c b/x11/lightdm/files/patch-src_process.c
index 3a61886b1dc8..ef18f78fb2a9 100644
--- a/x11/lightdm/files/patch-src_process.c
+++ b/x11/lightdm/files/patch-src_process.c
@@ -1,20 +1,11 @@
 --- src/process.c.orig	2018-08-30 00:28:55 UTC
 +++ src/process.c
-@@ -238,11 +238,16 @@ process_start (Process *process, gboolean block)
- 
-         /* Set environment */
-         if (priv->clear_environment)
-+        {
- #ifdef HAVE_CLEARENV
-             clearenv ();
- #else
--            environ = NULL;
-+            extern char **environ;
-+            char *cleanenv[1];
-+            environ = cleanenv;
-+            cleanenv[0] = NULL;
- #endif
-+        }
-         for (guint i = 0; i < env_length; i++)
-             setenv (env_keys[i], env_values[i], TRUE);
+@@ -73,6 +73,8 @@ static GHashTable *processes = NULL;
+ static pid_t signal_pid;
+ static int signal_pipe[2];
  
++extern char **environ;
++
+ Process *
+ process_get_current (void)
+ {
diff --git a/x11/lightdm/pkg-message b/x11/lightdm/pkg-message
index e7dfa70e54cd..bad0c5c5ec2e 100644
--- a/x11/lightdm/pkg-message
+++ b/x11/lightdm/pkg-message
@@ -1,9 +1,16 @@
+[
+{
+	message: <<EOD
 For LightDM to function, it requires one of the available greeters to be
 installed, which are available in the ports tree at x11/lightdm-*greeter*
 
-LightDM needs the maximum amount of memory a daemon may request to be locked
-into main memory using mlock(2) to be increased above the FreeBSD default.
-Without doing this, LightDM will often crash when the service is started.
+If you enable the lock-memory option in lightdm.conf (e.g. due to security
+concerns), you will also need to increase the maximum amount of memory FreeBSD
+will allow a daemon to lock into main memory using mlock(2).
 To increase this limit, run the following commands:
 # sed -i '' -e 's/memorylocked=128M/memorylocked=256M/' /etc/login.conf
 # cap_mkdb /etc/login.conf
+EOD,
+	type: install
+}
+]
diff --git a/x11/lightdm/pkg-plist b/x11/lightdm/pkg-plist
index dc0f4b7c735b..dba56a27e66a 100644
--- a/x11/lightdm/pkg-plist
+++ b/x11/lightdm/pkg-plist
@@ -18,7 +18,7 @@ include/lightdm-gobject-1/lightdm/power.h
 include/lightdm-gobject-1/lightdm/session.h
 include/lightdm-gobject-1/lightdm/system.h
 include/lightdm-gobject-1/lightdm/user.h
-%%VALA%%lib/girepository-1.0/LightDM-1.typelib
+%%VAPI%%lib/girepository-1.0/LightDM-1.typelib
 lib/liblightdm-gobject-1.a
 lib/liblightdm-gobject-1.so
 lib/liblightdm-gobject-1.so.0
@@ -32,7 +32,7 @@ share/accountsservice/interfaces/org.freedesktop.DisplayManager.AccountsService.
 share/bash-completion/completions/dm-tool
 share/bash-completion/completions/lightdm
 share/dbus-1/interfaces/org.freedesktop.DisplayManager.AccountsService.xml
-%%VALA%%share/gir-1.0/LightDM-1.gir
+%%VAPI%%share/gir-1.0/LightDM-1.gir
 %%PORTDOCS%%share/gtk-doc/html/lightdm-gobject-1/LightDMGreeter.html
 %%PORTDOCS%%share/gtk-doc/html/lightdm-gobject-1/LightDMLanguage.html
 %%PORTDOCS%%share/gtk-doc/html/lightdm-gobject-1/LightDMLayout.html
@@ -56,115 +56,115 @@ share/dbus-1/interfaces/org.freedesktop.DisplayManager.AccountsService.xml
 %%PORTDOCS%%share/gtk-doc/html/lightdm-gobject-1/style.css
 %%PORTDOCS%%share/gtk-doc/html/lightdm-gobject-1/up-insensitive.png
 %%PORTDOCS%%share/gtk-doc/html/lightdm-gobject-1/up.png
-%%VALA%%share/help/C/lightdm/autologin.page
-%%VALA%%share/help/C/lightdm/config.page
-%%VALA%%share/help/C/lightdm/default-greeter.page
-%%VALA%%share/help/C/lightdm/default-session.page
-%%VALA%%share/help/C/lightdm/diagnostics.page
-%%VALA%%share/help/C/lightdm/guest.page
-%%VALA%%share/help/C/lightdm/index.page
-%%VALA%%share/help/C/lightdm/legal.xml
-%%VALA%%share/help/C/lightdm/local-sessions.page
-%%VALA%%share/help/C/lightdm/remote-sessions.page
-%%VALA%%share/help/C/lightdm/seat.page
-%%VALA%%share/help/C/lightdm/standard-authentication.page
-%%VALA%%share/help/C/lightdm/user-list.page
-%%VALA%%share/help/C/lightdm/user-switching.page
-%%VALA%%share/help/C/lightdm/vnc.page
-%%VALA%%share/help/C/lightdm/write-greeter.page
-%%VALA%%share/help/C/lightdm/xdmcp.page
-%%VALA%%share/locale/af/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/an/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/ar/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/ast/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/az/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/be/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/bg/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/bn/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/bo/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/br/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/bs/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/ca/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/ca@valencia/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/ckb/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/cs/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/da/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/de/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/el/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/en_AU/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/en_CA/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/en_GB/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/eo/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/es/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/et/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/eu/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/fa/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/fi/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/fo/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/fr/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/fy/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/gd/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/gl/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/gu/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/he/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/hi/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/hr/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/hu/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/ia/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/id/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/is/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/it/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/ja/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/kk/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/km/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/kn/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/ko/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/ku/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/lb/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/lt/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/lv/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/mhr/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/mi/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/ml/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/mr/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/ms/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/my/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/nb/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/nl/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/nn/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/oc/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/pa/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/pl/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/pt/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/pt_BR/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/ro/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/ru/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/sc/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/sd/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/shn/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/si/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/sk/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/sl/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/sq/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/sr/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/sv/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/ta/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/te/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/tg/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/th/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/tl/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/tr/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/ug/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/uk/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/uz/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/vi/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/wae/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/zh_CN/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/zh_HK/LC_MESSAGES/lightdm.mo
-%%VALA%%share/locale/zh_TW/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/help/C/lightdm/autologin.page
+%%VAPI%%share/help/C/lightdm/config.page
+%%VAPI%%share/help/C/lightdm/default-greeter.page
+%%VAPI%%share/help/C/lightdm/default-session.page
+%%VAPI%%share/help/C/lightdm/diagnostics.page
+%%VAPI%%share/help/C/lightdm/guest.page
+%%VAPI%%share/help/C/lightdm/index.page
+%%VAPI%%share/help/C/lightdm/legal.xml
+%%VAPI%%share/help/C/lightdm/local-sessions.page
+%%VAPI%%share/help/C/lightdm/remote-sessions.page
+%%VAPI%%share/help/C/lightdm/seat.page
+%%VAPI%%share/help/C/lightdm/standard-authentication.page
+%%VAPI%%share/help/C/lightdm/user-list.page
+%%VAPI%%share/help/C/lightdm/user-switching.page
+%%VAPI%%share/help/C/lightdm/vnc.page
+%%VAPI%%share/help/C/lightdm/write-greeter.page
+%%VAPI%%share/help/C/lightdm/xdmcp.page
+%%VAPI%%share/locale/af/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/an/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/ar/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/ast/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/az/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/be/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/bg/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/bn/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/bo/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/br/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/bs/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/ca/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/ca@valencia/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/ckb/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/cs/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/da/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/de/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/el/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/en_AU/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/en_CA/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/en_GB/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/eo/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/es/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/et/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/eu/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/fa/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/fi/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/fo/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/fr/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/fy/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/gd/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/gl/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/gu/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/he/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/hi/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/hr/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/hu/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/ia/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/id/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/is/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/it/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/ja/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/kk/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/km/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/kn/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/ko/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/ku/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/lb/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/lt/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/lv/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/mhr/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/mi/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/ml/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/mr/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/ms/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/my/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/nb/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/nl/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/nn/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/oc/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/pa/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/pl/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/pt/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/pt_BR/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/ro/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/ru/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/sc/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/sd/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/shn/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/si/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/sk/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/sl/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/sq/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/sr/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/sv/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/ta/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/te/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/tg/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/th/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/tl/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/tr/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/ug/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/uk/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/uz/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/vi/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/wae/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/zh_CN/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/zh_HK/LC_MESSAGES/lightdm.mo
+%%VAPI%%share/locale/zh_TW/LC_MESSAGES/lightdm.mo
 share/polkit-1/actions/org.freedesktop.DisplayManager.AccountsService.policy
-%%VALA%%share/vala/vapi/liblightdm-gobject-1.deps
-%%VALA%%share/vala/vapi/liblightdm-gobject-1.vapi
+%%VAPI%%share/vala/vapi/liblightdm-gobject-1.deps
+%%VAPI%%share/vala/vapi/liblightdm-gobject-1.vapi
 share/xgreeters/default.desktop
 @dir /var/cache/lightdm
 @dir /var/log/lightdm