lightdm: fix musl

This commit is contained in:
Steve Prybylski 2015-09-08 13:35:18 -04:00
parent 97b6048fe6
commit 7c28c8fbd9
3 changed files with 57 additions and 0 deletions

View File

@ -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]);

View File

@ -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;

View File

@ -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