diff --git a/srcpkgs/lightdm/files/musl/musl-updwtmpx.patch b/srcpkgs/lightdm/files/musl/musl-updwtmpx.patch deleted file mode 100644 index afdbf943c42..00000000000 --- a/srcpkgs/lightdm/files/musl/musl-updwtmpx.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- ./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; - diff --git a/srcpkgs/lightdm/files/musl/musl-language.patch b/srcpkgs/lightdm/patches/musl-language.patch similarity index 100% rename from srcpkgs/lightdm/files/musl/musl-language.patch rename to srcpkgs/lightdm/patches/musl-language.patch diff --git a/srcpkgs/lightdm/patches/musl-updwtmpx.patch b/srcpkgs/lightdm/patches/musl-updwtmpx.patch new file mode 100644 index 00000000000..55522450049 --- /dev/null +++ b/srcpkgs/lightdm/patches/musl-updwtmpx.patch @@ -0,0 +1,38 @@ +--- ./src/session-child.c.orig 2015-09-11 18:01:00.262401041 -0400 ++++ ./src/session-child.c 2015-09-11 18:02:23.249398508 -0400 +@@ -199,7 +199,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) + { + struct utmp u; + +@@ -385,7 +385,7 @@ + ut.ut_tv.tv_sec = tv.tv_sec; + ut.ut_tv.tv_usec = tv.tv_usec; + +- updwtmpx ("/var/log/btmp", &ut); ++ _updwtmpx ("/var/log/btmp", &ut); + } + + /* Check account is valid */ +@@ -700,7 +700,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); + } + + waitpid (child_pid, &return_code, 0); +@@ -736,7 +736,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); + } + } + diff --git a/srcpkgs/lightdm/template b/srcpkgs/lightdm/template index e5a1bd1097a..1218f3fe1a7 100644 --- a/srcpkgs/lightdm/template +++ b/srcpkgs/lightdm/template @@ -1,7 +1,7 @@ # Template file for 'lightdm' pkgname=lightdm version=1.16.0 -revision=1 +revision=2 build_pie=yes build_style=gnu-configure configure_args="--sbindir=/usr/bin --with-greeter-session=lightdm-gtk-greeter @@ -42,16 +42,6 @@ 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