diff --git a/srcpkgs/lightdm/patches/musl-language.patch b/srcpkgs/lightdm/patches/musl-language.patch index 890965c195c..f08965c6f2a 100644 --- a/srcpkgs/lightdm/patches/musl-language.patch +++ b/srcpkgs/lightdm/patches/musl-language.patch @@ -1,34 +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 @@ +--- liblightdm-gobject/language.c.orig ++++ liblightdm-gobject/language.c +@@ -210,6 +210,7 @@ if (!priv->name) { +#if HAVE_LC_IDENTIFICATION - gchar *locale = get_locale_name (priv->code); + g_autofree gchar *locale = get_locale_name (priv->code); if (locale) { -@@ -238,6 +239,7 @@ +@@ -224,6 +225,7 @@ setlocale (LC_ALL, current); } if (!priv->name) +#endif { - gchar **tokens = g_strsplit_set (priv->code, "_.@", 2); + g_auto(GStrv) tokens = g_strsplit_set (priv->code, "_.@", 2); priv->name = g_strdup (tokens[0]); -@@ -267,6 +269,7 @@ +@@ -250,6 +252,7 @@ if (!priv->territory && strchr (priv->code, '_')) { +#if HAVE_LC_IDENTIFICATION - gchar *locale = get_locale_name (priv->code); + g_autofree gchar *locale = get_locale_name (priv->code); if (locale) { -@@ -281,6 +284,7 @@ +@@ -264,6 +267,7 @@ setlocale (LC_ALL, current); } if (!priv->territory) +#endif { - gchar **tokens = g_strsplit_set (priv->code, "_.@", 3); + g_auto(GStrv) tokens = g_strsplit_set (priv->code, "_.@", 3); priv->territory = g_strdup (tokens[1]); diff --git a/srcpkgs/lightdm/patches/musl-updwtmpx.patch b/srcpkgs/lightdm/patches/musl-updwtmpx.patch index 3f4f326372b..d96f518cdc5 100644 --- a/srcpkgs/lightdm/patches/musl-updwtmpx.patch +++ b/srcpkgs/lightdm/patches/musl-updwtmpx.patch @@ -1,15 +1,15 @@ ---- ./src/session-child.c.orig 2015-10-02 17:03:43.838859203 -0400 -+++ ./src/session-child.c 2015-10-02 17:06:55.192871600 -0400 -@@ -203,7 +203,7 @@ +--- src/session-child.c.orig ++++ src/session-child.c +@@ -194,7 +194,7 @@ /* 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) -+_updwtmpx (const char *wtmp_file, const struct utmpx *ut) ++_updwtmpx (const gchar *wtmp_file, struct utmpx *ut) { struct utmp u; - -@@ -415,7 +415,7 @@ + memset (&u, 0, sizeof (u)); +@@ -363,7 +363,7 @@ ut.ut_tv.tv_sec = tv.tv_sec; ut.ut_tv.tv_usec = tv.tv_usec; @@ -18,16 +18,16 @@ #if HAVE_LIBAUDIT audit_event (AUDIT_USER_LOGIN, username, -1, remote_host_name, tty, FALSE); -@@ -734,7 +734,7 @@ +@@ -708,7 +708,7 @@ if (!pututxline (&ut)) g_printerr ("Failed to write utmpx: %s\n", strerror (errno)); endutxent (); - updwtmpx ("/var/log/wtmp", &ut); + _updwtmpx ("/var/log/wtmp", &ut); - #if HAVE_LIBAUDIT + #if HAVE_LIBAUDIT audit_event (AUDIT_USER_LOGIN, username, uid, remote_host_name, tty, TRUE); -@@ -774,7 +774,7 @@ +@@ -749,7 +749,7 @@ if (!pututxline (&ut)) g_printerr ("Failed to write utmpx: %s\n", strerror (errno)); endutxent (); diff --git a/srcpkgs/lightdm/template b/srcpkgs/lightdm/template index 9e2d4ca21a0..a3a087a5f6d 100644 --- a/srcpkgs/lightdm/template +++ b/srcpkgs/lightdm/template @@ -1,17 +1,17 @@ # Template file for 'lightdm' pkgname=lightdm -version=1.24.0 -revision=2 +version=1.26.0 +revision=1 build_style=gnu-configure configure_args="--sbindir=/usr/bin --with-greeter-session=lightdm-gtk-greeter --with-greeter-user=lightdm --disable-static --disable-tests $(vopt_enable gir introspection)" short_desc="Light Display Manager" maintainer="Juan RP " -license="GPL-3, LGPL-3" -homepage="https://launchpad.net/lightdm" -distfiles="https://launchpad.net/lightdm/${version%.*}/$version/+download/$pkgname-$version.tar.xz" -checksum=cd509b74382bcf382c6e3e4b54ac30ba804022fec968d6993d134552ea1a43a2 +license="GPL-3.0-only, LGPL-3.0-only" +homepage="https://github.com/CanonicalLtd/lightdm" +distfiles="https://github.com/CanonicalLtd/lightdm/releases/download/${version}/lightdm-${version}.tar.xz" +checksum=c95e14e9131b5f95ecba42faaab2cfa917371193caa54fa1b4322ad7a89334f0 build_options="gir" hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection)"