testing/lightdm: upgrade to 1.10.1

5 files changed, 72 insertions, 28 deletions

diff --git a/testing/lightdm/APKBUILD b/testing/lightdm/APKBUILD
index 694f83a739..a047722687 100644
--- a/testing/lightdm/APKBUILD
+++ b/testing/lightdm/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lightdm
-pkgver=1.4.0
+pkgver=1.10.1
 pkgrel=0
 pkgdesc="A cross-desktop display manager"
 url="http://www.freedesktop.org/wiki/Software/LightDM"
@@ -10,12 +10,15 @@ license="GPL-3"
 depends="dbus"
 depends_dev=""
 makedepends="linux-pam-dev gtk+3.0-dev libxklavier-dev libxext-dev
-	autoconf automake libtool gobject-introspection-dev itstool"
+	autoconf automake libtool gobject-introspection-dev itstool
+	libgcrypt-dev"
 install="$pkgname.pre-install"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="https://launchpad.net/lightdm/${pkgver%.*}/$pkgver/+download/lightdm-$pkgver.tar.gz
+source="https://launchpad.net/lightdm/${pkgver%.*}/$pkgver/+download/lightdm-$pkgver.tar.xz
+	musl-language.patch
+	musl-is-linux.patch
+	musl-updwtmpx.patch
 	disallow-guest.patch
-	uclibc-language.patch
 	lightdm.initd"
 
 _builddir="$srcdir"/lightdm-$pkgver
@@ -31,7 +34,10 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
+	CFLAGS="$CFLAGS -D_GNU_SOURCE" ./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--enable-liblightdm-gobject \
@@ -53,7 +59,21 @@ package() {
 	install -Dm755 "$srcdir"/lightdm.initd "$pkgdir"/etc/init.d/lightdm
 }
 
-md5sums="622d9087ec773dd0626a250a5868f88c  lightdm-1.4.0.tar.gz
-72a44670872ce38ec0229e6595f0c629  disallow-guest.patch
-66782244aa11446e586d80e52ca74775  uclibc-language.patch
+md5sums="b237530f833bd3aafe613a85b76a5826  lightdm-1.10.1.tar.xz
+9ec182924cb4c113c6ca70eb34e9192d  musl-language.patch
+83463e0720df1c4462fd988d48ae4edc  musl-is-linux.patch
+518dbd5723f352c19d59f3d645ee1636  musl-updwtmpx.patch
+19a8a105b6d60c4c5c4e8138f57cb105  disallow-guest.patch
 9eb01e4202919424face9bafbda4936c  lightdm.initd"
+sha256sums="737123001a7ae2ab126c75f61dcebb767d082ec043c012285eab6fa6b0d6a58f  lightdm-1.10.1.tar.xz
+869834983f3dfd4818aac7b18b78e4c78a4e3bdf3740c7a21be2fa9b56e7664e  musl-language.patch
+65e8d3ae8f40c5803b89e66b2cbeb9b0dbc7303c398770a9e28680312b1864f5  musl-is-linux.patch
+38bfafdf569407f98261f998936ce23152fa9e4c53b797f6f775c697c7c25ebe  musl-updwtmpx.patch
+97f658c6382133ce3456de59c70ebe1a850a1035cb871ff1e0885027559e56dd  disallow-guest.patch
+cb9c10fe131073dbe589222beeab8fdb7fd28897001aa6b3c71eaab587fac3ef  lightdm.initd"
+sha512sums="e235eeb03999d31d693c89a0e06fc33371d40f7c3c216942440a8498990b1efa0b5f19c72bc0ed18611a3b401b8ee521e2c2caa5e441247bad625466a8346278  lightdm-1.10.1.tar.xz
+04df1146c8e33410c0fbbd016a3197e7e11b8ac5792f4578cb1a3fccba432294e1f4597b3fcab85f5167cac3dea8ead416872cf8c97cf381db5d0d7e9772d1a7  musl-language.patch
+480b2757321212aa04c265ee052f2226059dc45c99a2e19c9dd06198bf03237a34ccdd87d997eb0e1addcf8e1d429a43e0d61e9e0b871f7dc28d203ee7fc2006  musl-is-linux.patch
+46ab123c1b0e9d89020dbb50f73418e41aa9fb5c7614eaf1add0aca3496f2f178e7f0e485abbd0de2ed15297ff00099e37ef7f7d245d280ec356d5d7b09af77d  musl-updwtmpx.patch
+404a4cb4f58921e750aa29b3757c684ecb9d2b9146fd31b7359e49bf3a63400f757bb85d9f3ceabf0cbabc88bbbd18f11369713ccd7bae18574821c75af7143f  disallow-guest.patch
+dfaf02f094dc621f4b094b766c9a10d836943506df5f3655bd00f0981b2e8466e829b25fb7ea4374570598ea4a12c1cdde3091280e9681fcc07b64229c2d86f1  lightdm.initd"
diff --git a/testing/lightdm/disallow-guest.patch b/testing/lightdm/disallow-guest.patch
index e443359625..72782d3a79 100644
--- a/testing/lightdm/disallow-guest.patch
+++ b/testing/lightdm/disallow-guest.patch
@@ -1,17 +1,6 @@
---- ./data/lightdm.conf.orig
-+++ ./data/lightdm.conf
-@@ -75,7 +75,7 @@
- #greeter-show-manual-login=false
- #greeter-show-remote-login=true
- #user-session=default
--#allow-guest=true
-+#allow-guest=false
- #guest-session=UNIMPLEMENTED
- #session-wrapper=lightdm-session
- #display-setup-script=
 --- ./src/lightdm.c.orig
 +++ ./src/lightdm.c
-@@ -1004,7 +1004,7 @@
+@@ -1067,7 +1067,7 @@
      if (!config_has_key (config_get_instance (), "SeatDefaults", "start-session"))
          config_set_boolean (config_get_instance (), "SeatDefaults", "start-session", TRUE);
      if (!config_has_key (config_get_instance (), "SeatDefaults", "allow-guest"))
@@ -20,3 +9,14 @@
      if (!config_has_key (config_get_instance (), "SeatDefaults", "greeter-allow-guest"))
          config_set_boolean (config_get_instance (), "SeatDefaults", "greeter-allow-guest", TRUE);
      if (!config_has_key (config_get_instance (), "SeatDefaults", "greeter-show-remote-login"))
+--- ./data/lightdm.conf.orig
++++ ./data/lightdm.conf
+@@ -91,7 +91,7 @@
+ #greeter-show-manual-login=false
+ #greeter-show-remote-login=true
+ #user-session=default
+-#allow-guest=true
++#allow-guest=false
+ #guest-session=
+ #session-wrapper=lightdm-session
+ #greeter-wrapper=
diff --git a/testing/lightdm/musl-is-linux.patch b/testing/lightdm/musl-is-linux.patch
new file mode 100644
index 0000000000..d0a627c63c
--- /dev/null
+++ b/testing/lightdm/musl-is-linux.patch
@@ -0,0 +1,11 @@
+--- ./tests/src/libsystem.c.orig
++++ ./tests/src/libsystem.c
+@@ -205,7 +205,7 @@
+     return g_strdup (path);
+ }
+ 
+-#ifdef __linux__
++#ifdef __GLIBC__
+ static int
+ open_wrapper (const char *func, const char *pathname, int flags, mode_t mode)
+ {
diff --git a/testing/lightdm/uclibc-language.patch b/testing/lightdm/musl-language.patch
index b1bbe79701..8908bbc511 100644
--- a/testing/lightdm/uclibc-language.patch
+++ b/testing/lightdm/musl-language.patch
@@ -1,34 +1,34 @@
 --- ./liblightdm-gobject/language.c.orig
 +++ ./liblightdm-gobject/language.c
-@@ -225,6 +225,7 @@
+@@ -224,6 +224,7 @@
  
      if (!priv->name)
      {
-+#ifndef __UCLIBC__
++#if HAVE_LC_IDENTIFICATION
          gchar *locale = get_locale_name (priv->code);
          if (locale)
          {
 @@ -238,6 +239,7 @@
- 
              setlocale (LC_ALL, current);
          }
-+#endif
          if (!priv->name)
++#endif
          {
              gchar **tokens = g_strsplit_set (priv->code, "_.@", 2);
-@@ -268,6 +270,7 @@
+             priv->name = g_strdup (tokens[0]);
+@@ -267,6 +269,7 @@
  
      if (!priv->territory && strchr (priv->code, '_'))
      {
-+#ifndef __UCLIBC__
++#if HAVE_LC_IDENTITIFICATION
          gchar *locale = get_locale_name (priv->code);
          if (locale)
          {
 @@ -281,6 +284,7 @@
- 
              setlocale (LC_ALL, current);
          }
-+#endif
          if (!priv->territory)
++#endif
          {
              gchar **tokens = g_strsplit_set (priv->code, "_.@", 3);
+             priv->territory = g_strdup (tokens[1]);
diff --git a/testing/lightdm/musl-updwtmpx.patch b/testing/lightdm/musl-updwtmpx.patch
new file mode 100644
index 0000000000..106e366e16
--- /dev/null
+++ b/testing/lightdm/musl-updwtmpx.patch
@@ -0,0 +1,13 @@
+--- ./src/session-child.c.orig
++++ ./src/session-child.c
+@@ -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;
+