5 files changed, 82 insertions, 2 deletions
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index 81622f29cbc9..7bf0173069af 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -1,10 +1,12 @@
 AUX README.gentoo 494 BLAKE2B 8a92171cbc9e8a93cc5e73101bf478b27945e85f843ef244daea881f0aa061820645c425e52dd6a75adc0bd09c95126a059694bc7d5f6084e4f0222fc5e8ab85 SHA512 07e35ef0ac603b2b817c33fd2bc06b9b254a2e3fee16e7ec8fc0c86d27330c795b8d1eae660c42c414de4d721faea2cab1d41c5950ca7a1032d758626011ae3c
 AUX Xsession 1921 BLAKE2B 9127e95c28d2a22f6a1d5f2997edf5997315667d20522c7a8b839fe492d576e0e69cf280ce2fea1fb8d4df61e3b254a38782dbd3c78fdc4ef79924b224311306 SHA512 efa046db5445464e7deb3c5aa43b1a2e1abb7ec0537d4040567d4d9932f15b954866cdd9c3a2bd703de9d7818d4fccff76008426061bc97dc342f7805cb645c1
+AUX lightdm-1.30.0-musl-locale.patch 1479 BLAKE2B 9187e6837820f14be86cd302cd2e76e11bca1c3256289c9c8bcd63640203d71d1f09fe1c8a9b35f6e34176130bc885b805901df17fc90d6869f095da5cb9dad9 SHA512 effa56b8b4716d92c33c1e64755ff735de8899c9781259759c03ea81e8e9e751de63ff867346ec72a739661932cb99990a73371875477fb0230f19f1567bea44
+AUX lightdm-1.30.0-musl-updwtmpx.patch 950 BLAKE2B aaf6169707e0fd98e24b893c0b8602a1ccf982e7506f85e584b2623bb645eeb8c13b36cda1662085e01735e0472f6d279c02fe34b1b5cbea2b9e351f277898b2 SHA512 fe41980da22a0aac067ef1c0ef4a1cba8dc5523a0436b6f264f065bcf83264d2f900c0a0d71aae2f24ccd23a87e34b4015e350046253285f150be5b13df4c4bd
 AUX lightdm-autologin 157 BLAKE2B 54ce42f09f88c793e90f5f21743e17a0184227b83c11192e766d6f3c1020fe0dc4227da0eb8e404c8d67d6a5bcfe9b55075820fb911f1611347e99cd5c99493f SHA512 35bfeee42d2e4e34a42f5cd645c2b7aac801d8a8396b42ec7725179827ec8a52b3db106dcddaa100c3d5d6d19a2df5e462f121a18c848bd898dcce3e43fa791f
 AUX lightdm.service 279 BLAKE2B 92a9602d1d1c10fedfabd58b0794a68a278939d905f4d790ea9c2a0632abe8238a6187b3e01b4296a1187349864b30291853889ceaa519f5a12a98b2aecbb1ea SHA512 5b60788e35ebd7918b21ab52dc3f5cc29dd3aa45ddf6cfe75a72d1c541620f0438378a9bd681e2c151a465cf981e803b399f61b48ff5d0f2e1a3cc950c30d23a
 DIST introspection-20110205.m4.tar.bz2 1220 BLAKE2B 01483c1a7b73568e01cc4d84b43c4cd946aaaac0b5fa13aa27805fa17297112bfaabb1c5a34bd83d2ecdef2033b622dbd5e63914baacb8f6edf488a7396d26d9 SHA512 5c49239935b93d86cce68b577b43d1a56d8749ab5747029bfcfa67339697134be24ef29ba6c3d133b8c03e867864637c8eb61491a4b7f6bb1e56386ed66cb9be
 DIST lightdm-1.30.0.tar.xz 509220 BLAKE2B 5b6fcc6b955d7a7eb3a810a7e28707a812810d7f2568d6985a4411b1bf6f06b35ff721bd8a9388a85a4e4a64a39f5e30e86a9dbaa6d344e898ae49e9f39785ff SHA512 bca25a0aa73caf7d51e5882889a1707d2527470a170658c1be98ecfb96c8f85fd616494fc5bed658e744f91b9f8b0a98d2a0cf42f9c030242ae470c8a27145ce
 DIST lightdm-1.32.0.tar.xz 518168 BLAKE2B 90191559895a58e2c5892705ea95766aaaaa87d3470f1372ab90fcf3991d27f9280d5bbabe0cfce70e25f960d63c1e7eab7beeeb501341996afd155788cbe1c7 SHA512 81497fb25904bc2e8687dc99992628eb534f7418f72e1908c4766e917fc1221714210d998739417e1cae2ee15e3197a2eb8d4981cb944cfeb0334dc9e356e716
-EBUILD lightdm-1.30.0-r3.ebuild 4032 BLAKE2B ed5d0eb3806fd77814ba2fea76455a8d2bf0cea76532b76ab02245623d7614f2bdf9849b8747f3f961a2f3ead512f80b091e2d5875b2754c62a4cbc61678dee7 SHA512 c3dbbd3af45fb8e5f496c1635885f2e6e761760924be7950d55f4d0421fa3c0927b3d49867b78896fe859a8ab646eada1c2bd75558a3d6cdf9a4bd5e5615bbb1
-EBUILD lightdm-1.32.0.ebuild 3987 BLAKE2B c9dfbf09347b521b0a7f9d5378a8ceac41c33e93913057c40fbba2afadb323890b0bbdabbe28dbd4999cc9be89d2a9ed87ff38ae79cd4f0d34a8cfc9968f7434 SHA512 90ef88ba3997239cc687cd0d5d0042a7fb5db9fb88b13ca2ec74495cb8ba759bcf63bd09b25de04b775404758bb7dc3c47ce15d57fdfad3f26c732be4e162198
+EBUILD lightdm-1.30.0-r3.ebuild 4139 BLAKE2B bb436a18ccb2e229b57ec10be9524542fc81dae8034b802b00dee64b69f704723a9d79b270c2a46ac056edb837c47827c7fab9fe36efe78ce4015f0cda886d20 SHA512 c004da29823aa0dd3db06c22a0bb36548d6d25a593636cff79511c1972b695f1b7920e17f23f4a7b911b7bfd45e0bc1cfea81986bf7d92c463536ca3549740f7
+EBUILD lightdm-1.32.0.ebuild 4094 BLAKE2B bf75edebcf6b8da393be5d4aaa50c6768d792c1a4431d1e80b7e81f606d1df47baec7c2a58af713997b10f6145db826d404dd26141c6b81fa6a8f23876d86f2f SHA512 4ca285fb16cc7b7d5c496f2994fbcb23e46953e65ddfd699016bafe144cc5904817fcf4356192413f6b6e0253e1bddc232d56e13aea478b8a36fb867db296594
 MISC metadata.xml 454 BLAKE2B 66c069f7c5e3b820059e67736ebd898389a8243bce08fd364c8d0a1704f484a13a935bc2a7a31ad975535f8df5a091cbc337c48ea65f45a1cebdcb2c0888b8dc SHA512 f5e5c7467eef552ac808daa8289f803438fc72c81028b48cb20f4f18ff2462216520312294eeff8fffc1357a4330e1e264da70dd35ef3c20baff2c5c26bc654e
diff --git a/x11-misc/lightdm/files/lightdm-1.30.0-musl-locale.patch b/x11-misc/lightdm/files/lightdm-1.30.0-musl-locale.patch
new file mode 100644
index 000000000000..46c65d79f764
--- /dev/null
+++ b/x11-misc/lightdm/files/lightdm-1.30.0-musl-locale.patch
@@ -0,0 +1,42 @@
+https://github.com/canonical/lightdm/pull/261
+
+# Fix LC_IDENTIFICATION undeclared on musl or other libc that doesn't have it defined
+# Patch is taken from Alpine linux [1]
+# [1]: https://git.alpinelinux.org/aports/tree/community/lightdm/musl-language.patch
+# Closes: https://bugs.gentoo.org/766866
+diff --git a/liblightdm-gobject/language.c b/liblightdm-gobject/language.c
+index 3d4fa96..e38f5ce 100644
+--- a/liblightdm-gobject/language.c
++++ b/liblightdm-gobject/language.c
+@@ -210,6 +210,7 @@ lightdm_language_get_name (LightDMLanguage *language)
+
+     if (!priv->name)
+     {
++#if HAVE_LC_IDENTIFICATION
+         g_autofree gchar *locale = get_locale_name (priv->code);
+         if (locale)
+         {
+@@ -223,6 +224,7 @@ lightdm_language_get_name (LightDMLanguage *language)
+
+             setlocale (LC_ALL, current);
+         }
++#endif
+         if (!priv->name)
+         {
+             g_auto(GStrv) tokens = g_strsplit_set (priv->code, "_.@", 2);
+@@ -250,6 +252,7 @@ lightdm_language_get_territory (LightDMLanguage *language)
+
+     if (!priv->territory && strchr (priv->code, '_'))
+     {
++#if HAVE_LC_IDENTIFICATION
+         g_autofree gchar *locale = get_locale_name (priv->code);
+         if (locale)
+         {
+@@ -263,6 +266,7 @@ lightdm_language_get_territory (LightDMLanguage *language)
+
+             setlocale (LC_ALL, current);
+         }
++#endif
+         if (!priv->territory)
+         {
+             g_auto(GStrv) tokens = g_strsplit_set (priv->code, "_.@", 3);
diff --git a/x11-misc/lightdm/files/lightdm-1.30.0-musl-updwtmpx.patch b/x11-misc/lightdm/files/lightdm-1.30.0-musl-updwtmpx.patch
new file mode 100644
index 000000000000..0df9bd4f051e
--- /dev/null
+++ b/x11-misc/lightdm/files/lightdm-1.30.0-musl-updwtmpx.patch
@@ -0,0 +1,26 @@
+https://github.com/canonical/lightdm/pull/261
+
+# A little bit modified version of Alpine linux patch [1]. On musl the default
+# implementation of updwtmpx will give conflicting types error and build will
+# fail. This patch should fix that. This issue is noticed together with bug
+# 766866 [2].
+# [1]: https://git.alpinelinux.org/aports/tree/community/lightdm/musl-updwtmpx.patch
+# [2]: https://bugs.gentoo.org/766866
+diff --git a/src/session-child.c b/src/session-child.c
+index eef51e4..0052904 100644
+--- a/src/session-child.c
++++ b/src/session-child.c
+@@ -193,8 +193,13 @@ read_xauth (void)
+ }
+
+ /* GNU provides this but we can't rely on that so let's make our own version */
++#if defined(__GLIBC__)
+ static void
+ updwtmpx (const gchar *wtmp_file, struct utmpx *ut)
++#else // use this version in libc's other than glibc
++void
++updwtmpx (const char *wtmp_file, const struct utmpx *ut)
++#endif
+ {
+     struct utmp u;
+     memset (&u, 0, sizeof (u));
diff --git a/x11-misc/lightdm/lightdm-1.30.0-r3.ebuild b/x11-misc/lightdm/lightdm-1.30.0-r3.ebuild
index 2c0883c92e03..5f23bb293fae 100644
--- a/x11-misc/lightdm/lightdm-1.30.0-r3.ebuild
+++ b/x11-misc/lightdm/lightdm-1.30.0-r3.ebuild
@@ -51,6 +51,11 @@ DOCS=( NEWS )
 RESTRICT="test"
 REQUIRED_USE="vala? ( introspection )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.30.0-musl-locale.patch
+	"${FILESDIR}"/${PN}-1.30.0-musl-updwtmpx.patch
+)
+
 pkg_setup() {
 	export LIGHTDM_USER=${LIGHTDM_USER:-lightdm}
 }
diff --git a/x11-misc/lightdm/lightdm-1.32.0.ebuild b/x11-misc/lightdm/lightdm-1.32.0.ebuild
index 48f403d1bc88..9c50443b7a3c 100644
--- a/x11-misc/lightdm/lightdm-1.32.0.ebuild
+++ b/x11-misc/lightdm/lightdm-1.32.0.ebuild
@@ -51,6 +51,11 @@ DOCS=( NEWS )
 RESTRICT="test"
 REQUIRED_USE="vala? ( introspection )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.30.0-musl-locale.patch
+	"${FILESDIR}"/${PN}-1.30.0-musl-updwtmpx.patch
+)
+
 pkg_setup() {
 	export LIGHTDM_USER=${LIGHTDM_USER:-lightdm}
 	vala_setup