Merge pull request #2484 from steski/lightdm

Lightdm: fix musl and update to 1.16.0

srcpkgs/light-locker/template

@@ -1,7 +1,7 @@
 # Template file for 'light-locker'
 pkgname=light-locker
 version=1.6.0
-revision=2
+revision=3
 build_style=gnu-configure
 short_desc="A simple session-locker for lightdm"
 maintainer="Emanuel Serpa <emanuel@openmailbox.org>"

srcpkgs/lightdm-gtk-greeter/template

@@ -1,7 +1,7 @@
 # Template file for 'lightdm-gtk-greeter'
 pkgname=lightdm-gtk-greeter
 version=1.8.5
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --disable-static --with-gtk2"
 hostmakedepends="pkg-config intltool"

srcpkgs/lightdm-gtk3-greeter/template

@@ -1,7 +1,7 @@
 # Template file for 'lightdm-gtk3-greeter'
 pkgname=lightdm-gtk3-greeter
 version=2.0.1
-revision=2
+revision=3
 wrksrc="${pkgname/3/}-${version}"
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --disable-static"

srcpkgs/lightdm-kde-greeter/template

@@ -1,7 +1,7 @@
 # Template file for 'lightdm-kde-greeter'
 pkgname=lightdm-kde-greeter
 version=0.3.2.2
-revision=3
+revision=4
 wrksrc="lightdm-0.3.2.1"
 build_style=cmake
 hostmakedepends="cmake automoc4 qt-qmake perl pkg-config"

srcpkgs/lightdm/files/musl/musl-language.patch

@@ -0,0 +1,34 @@
+--- ./liblightdm-gobject/language.c.orig	2015-09-08 14:44:54.377669101 -0400
++++ ./liblightdm-gobject/language.c	2015-09-08 14:45:12.453668549 -0400
+@@ -224,6 +224,7 @@
+ 
+     if (!priv->name)
+     {
++#if HAVE_LC_IDENTIFICATION
+         gchar *locale = get_locale_name (priv->code);
+         if (locale)
+         {
+@@ -238,6 +239,7 @@
+             setlocale (LC_ALL, current);
+         }
+         if (!priv->name)
++#endif
+         {
+             gchar **tokens = g_strsplit_set (priv->code, "_.@", 2);
+             priv->name = g_strdup (tokens[0]);
+@@ -267,6 +269,7 @@
+ 
+     if (!priv->territory && strchr (priv->code, '_'))
+     {
++#if HAVE_LC_IDENTIFICATION
+         gchar *locale = get_locale_name (priv->code);
+         if (locale)
+         {
+@@ -281,6 +284,7 @@
+             setlocale (LC_ALL, current);
+         }
+         if (!priv->territory)
++#endif
+         {
+             gchar **tokens = g_strsplit_set (priv->code, "_.@", 3);
+             priv->territory = g_strdup (tokens[1]);

srcpkgs/lightdm/files/musl/musl-updwtmpx.patch

@@ -0,0 +1,13 @@
+--- ./src/session-child.c.orig	2015-09-08 14:47:47.260663825 -0400
++++ ./src/session-child.c	2015-09-08 14:48:01.578663388 -0400
+@@ -198,8 +198,8 @@
+ }
+ 
+ /* GNU provides this but we can't rely on that so let's make our own version */
+-static void
+-updwtmpx (const gchar *wtmp_file, struct utmpx *ut)
++void
++updwtmpx (const char *wtmp_file, const struct utmpx *ut)
+ {
+     struct utmp u;
+ 

srcpkgs/lightdm/template

@@ -1,7 +1,7 @@
 # Template file for 'lightdm'
 pkgname=lightdm
-version=1.14.2
-revision=3
+version=1.16.0
+revision=1
 build_pie=yes
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --with-greeter-session=lightdm-gtk-greeter
@@ -12,7 +12,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-3, LGPL-3"
 homepage="https://launchpad.net/lightdm"
 distfiles="https://launchpad.net/lightdm/${version%.*}/$version/+download/$pkgname-$version.tar.xz"
-checksum=28b078979870782aaa1a9167945e1dab19cc6d699747af3d0c0c9a3bdb8dbba1
+checksum=b2e31beed0c3045bce6119617e96f18e9ee3540582f61fac5aca9697e747abc6
 
 build_options="gir"
 hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection)"
@@ -42,6 +42,16 @@ if [ -z "$CROSS_BUILD" ]; then
 	subpackages+=" liblightdm-qt liblightdm-qt5"
 fi
 
+post_extract() {
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl)
+			for f in ${FILESDIR}/musl/*.patch; do
+				patch -Np1 -i $f
+			done
+			;;
+	esac
+}
+
 post_install() {
 	# Remove provided init file and use our own.
 	rm -rf ${DESTDIR}/etc/init