From 97b6048fe647cbc432d3607452697c263e05ad72 Mon Sep 17 00:00:00 2001 From: Steve Prybylski Date: Tue, 8 Sep 2015 13:34:06 -0400 Subject: [PATCH 1/6] lightdm: update to 1.16.0 --- srcpkgs/lightdm/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/lightdm/template b/srcpkgs/lightdm/template index b331eba8c66..66cf7ad933b 100644 --- a/srcpkgs/lightdm/template +++ b/srcpkgs/lightdm/template @@ -1,7 +1,7 @@ # Template file for 'lightdm' pkgname=lightdm -version=1.14.2 -revision=3 +version=1.16.0 +revision=1 build_pie=yes build_style=gnu-configure configure_args="--sbindir=/usr/bin --with-greeter-session=lightdm-gtk-greeter @@ -12,7 +12,7 @@ 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=28b078979870782aaa1a9167945e1dab19cc6d699747af3d0c0c9a3bdb8dbba1 +checksum=b2e31beed0c3045bce6119617e96f18e9ee3540582f61fac5aca9697e747abc6 build_options="gir" hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection)" From 7c28c8fbd9a56f4c43480440190766b718a243e5 Mon Sep 17 00:00:00 2001 From: Steve Prybylski Date: Tue, 8 Sep 2015 13:35:18 -0400 Subject: [PATCH 2/6] lightdm: fix musl --- .../lightdm/files/musl/musl-language.patch | 34 +++++++++++++++++++ .../lightdm/files/musl/musl-updwtmpx.patch | 13 +++++++ srcpkgs/lightdm/template | 10 ++++++ 3 files changed, 57 insertions(+) create mode 100644 srcpkgs/lightdm/files/musl/musl-language.patch create mode 100644 srcpkgs/lightdm/files/musl/musl-updwtmpx.patch diff --git a/srcpkgs/lightdm/files/musl/musl-language.patch b/srcpkgs/lightdm/files/musl/musl-language.patch new file mode 100644 index 00000000000..890965c195c --- /dev/null +++ b/srcpkgs/lightdm/files/musl/musl-language.patch @@ -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]); diff --git a/srcpkgs/lightdm/files/musl/musl-updwtmpx.patch b/srcpkgs/lightdm/files/musl/musl-updwtmpx.patch new file mode 100644 index 00000000000..afdbf943c42 --- /dev/null +++ b/srcpkgs/lightdm/files/musl/musl-updwtmpx.patch @@ -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; + diff --git a/srcpkgs/lightdm/template b/srcpkgs/lightdm/template index 66cf7ad933b..e5a1bd1097a 100644 --- a/srcpkgs/lightdm/template +++ b/srcpkgs/lightdm/template @@ -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 From cdec393eec97595b67bd2b19f8d3ac4edf2dce80 Mon Sep 17 00:00:00 2001 From: Steve Prybylski Date: Tue, 8 Sep 2015 16:07:43 -0400 Subject: [PATCH 3/6] lightdm-gtk3-greeter: trigger rebuild for musl --- srcpkgs/lightdm-gtk3-greeter/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/lightdm-gtk3-greeter/template b/srcpkgs/lightdm-gtk3-greeter/template index 1e0a0f645c3..5dee7d624c8 100644 --- a/srcpkgs/lightdm-gtk3-greeter/template +++ b/srcpkgs/lightdm-gtk3-greeter/template @@ -1,7 +1,7 @@ # Template file for 'lightdm-gtk3-greeter' pkgname=lightdm-gtk3-greeter version=2.0.1 -revision=2 +revision=3 wrksrc="${pkgname/3/}-${version}" build_style=gnu-configure configure_args="--sbindir=/usr/bin --disable-static" From aa67e218c7e5ae892ca924beab291a7abd88e8c2 Mon Sep 17 00:00:00 2001 From: Steve Prybylski Date: Tue, 8 Sep 2015 16:41:31 -0400 Subject: [PATCH 4/6] lightdm-kde-greeter: trigger rebuild for musl --- srcpkgs/lightdm-kde-greeter/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/lightdm-kde-greeter/template b/srcpkgs/lightdm-kde-greeter/template index f47df292d7a..37547aff4a7 100644 --- a/srcpkgs/lightdm-kde-greeter/template +++ b/srcpkgs/lightdm-kde-greeter/template @@ -1,7 +1,7 @@ # Template file for 'lightdm-kde-greeter' pkgname=lightdm-kde-greeter version=0.3.2.2 -revision=3 +revision=4 wrksrc="lightdm-0.3.2.1" build_style=cmake hostmakedepends="cmake automoc4 qt-qmake perl pkg-config" From 9427e9fbd18f426f8e947673af4413d194cd9966 Mon Sep 17 00:00:00 2001 From: Steve Prybylski Date: Tue, 8 Sep 2015 16:41:56 -0400 Subject: [PATCH 5/6] light-locker: trigger rebuild for musl --- srcpkgs/light-locker/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/light-locker/template b/srcpkgs/light-locker/template index ea1ea2b5659..32f4383b1bf 100644 --- a/srcpkgs/light-locker/template +++ b/srcpkgs/light-locker/template @@ -1,7 +1,7 @@ # Template file for 'light-locker' pkgname=light-locker version=1.6.0 -revision=2 +revision=3 build_style=gnu-configure short_desc="A simple session-locker for lightdm" maintainer="Emanuel Serpa " From e8d8f46bdee703e7f26b457bee73371cfdebf5ac Mon Sep 17 00:00:00 2001 From: Steve Prybylski Date: Tue, 8 Sep 2015 16:53:47 -0400 Subject: [PATCH 6/6] lightdm-gtk-greeter: trigger rebuild for musl --- srcpkgs/lightdm-gtk-greeter/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/lightdm-gtk-greeter/template b/srcpkgs/lightdm-gtk-greeter/template index e6f66f1bb68..6789882950f 100644 --- a/srcpkgs/lightdm-gtk-greeter/template +++ b/srcpkgs/lightdm-gtk-greeter/template @@ -1,7 +1,7 @@ # Template file for 'lightdm-gtk-greeter' pkgname=lightdm-gtk-greeter version=1.8.5 -revision=2 +revision=3 build_style=gnu-configure configure_args="--sbindir=/usr/bin --disable-static --with-gtk2" hostmakedepends="pkg-config intltool"