Commit 37b233b7 authored by Natanael Copa's avatar Natanael Copa

main/lxdm: build fix for musl

parent 69805420
......@@ -2,16 +2,18 @@
# Maintainer: William Pitcock <nenolod@dereferenced.org>
pkgname=lxdm
pkgver=0.4.1
pkgrel=5
pkgrel=6
pkgdesc="LXDE desktop login manager"
url="http://wiki.lxde.org/en/LXDM"
license="GPL"
depends="bash"
makedepends="gtk+-dev consolekit-dev"
makedepends="gtk+2.0-dev consolekit-dev autoconf automake libtool intltool"
install=
subpackages="$pkgname-lang"
source="http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz
execinfo.patch
glib2-2.32.0.patch
automake-subdirs.patch
background.png
lxdm.initd
index.theme.alpine"
......@@ -30,6 +32,8 @@ prepare() {
;;
esac
done
libtoolize --force && aclocal && autoheader && autoconf \
&& automake --add-missing || return 1
}
build() {
......@@ -71,7 +75,23 @@ package() {
}
md5sums="8da1cfc2be6dc9217c85a7cf51e1e821 lxdm-0.4.1.tar.gz
72ecfef17755c671963c11694bfc51b1 execinfo.patch
32400e029dcfae4873e957e4c9135787 glib2-2.32.0.patch
700df7102c1baa0d1af93f791f3d6b12 automake-subdirs.patch
a510afe725112947d16f6c1f0602effe background.png
d6455d172d5d897f6bfcefe9a1a632c7 lxdm.initd
06ea32ef440375839851c4bc7caea004 index.theme.alpine"
sha256sums="9e0d0a5672fcf31a18de8178ce73eab1723d6ae7097dfe41e9fe2c46e180cf08 lxdm-0.4.1.tar.gz
d7cca99d05f6a47c01190e88bd895adc104ac465a5ded56cc20bc6ede2f3330d execinfo.patch
e3583defbd446fe6d651b4fd70870496e2175eff155e7457d621567e79b455d8 glib2-2.32.0.patch
feceaea07161248ced5da758967557a5b0642b4dba1cb3898567c125a0042bdb automake-subdirs.patch
85c461814ff8ce3262badc51103b9a4802fbdda21dbe8160e536793224e83aa9 background.png
50b520ae187a71f002e5b246f1961c1ecfc3955681be94768f51ed78caa5ac65 lxdm.initd
223360ecc54cb829fe145dd06ea09b85ed052a08d4baba6517c0fa7ae2175f76 index.theme.alpine"
sha512sums="8ed4a955a910def4db66958d1cb24976db178b8763199a024b6c2119894745e3646566c42d01472dffbbcbb7fd21784b01e74dc88038e01caebaa3b6d720ff27 lxdm-0.4.1.tar.gz
b66d47a3c026f84c76fb6ae0701ff69d2736a2c0fdf898191836c0c5e2b0d624c7a7846cd38596ee800fab53ebcd843c26779c56c0f655df1659ecc5b251b576 execinfo.patch
0a01cf113a041c7a8275ab9122cd005438120780aa40c87ac04c2a57e2695c18f2c735e6db3e042778a92e166c1dc56ec7a38d493c3f560e81891f3b8298eddb glib2-2.32.0.patch
f375c0f922eeef6fea357cca88af37cbe1bb5a4c70b6e450d199ab5ba4744e0a50e25ec38d34257e49f1883a75c5a66e2a5caffd6131c0a4cdad44ce5dacd84d automake-subdirs.patch
89640deb308d4f4f22f664096992a99cc03eab39ca5caa690422611fb724c8f245795ae80260cf8b9cb75e3dddf7877ec3aa0670885e01530facc2628cf84ee0 background.png
2f456cfe46f51a1ac95a95b2a8fe5c166fb2991831368648e8e5912ce7c8fa1cea29c569a588c1d7bc4760fea87d8d7e2ee4d192e12a0b1ddf785a0c18478300 lxdm.initd
1374daa94bde0fb71056cebc8524da32b57c241a8af97501daa930c43dc087aa3fec2d79f10ceab5a73a4dcf9cce478fb77575d7019cafd54ad9731c9e9dd55f index.theme.alpine"
--- ./configure.ac.orig
+++ ./configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.63])
AC_INIT([lxdm], [0.4.1], [http://lxde.org/])
-AM_INIT_AUTOMAKE([-Wall -Werror foreign])
+AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
AC_CONFIG_SRCDIR([src/lxdm.c])
AC_CONFIG_HEADERS([config.h])
diff -auNr lxdm-0.4.1.orig//configure.ac lxdm-0.4.1/configure.ac
--- lxdm-0.4.1.orig//configure.ac 2011-11-16 22:27:33.624019150 +0100
+++ lxdm-0.4.1/configure.ac 2011-11-16 22:29:49.537310486 +0100
@@ -23,7 +23,7 @@
# Checks for header files.
AC_PATH_X
-AC_CHECK_HEADERS([shadow.h stdlib.h string.h unistd.h utmpx.h])
+AC_CHECK_HEADERS([shadow.h stdlib.h string.h unistd.h utmpx.h, execinfo.h])
# Checks for typedefs, structures, and compiler characteristics.
AC_TYPE_PID_T
diff -auNr lxdm-0.4.1.orig//src/lxdm.c lxdm-0.4.1/src/lxdm.c
--- lxdm-0.4.1.orig//src/lxdm.c 2011-11-16 22:27:33.617019240 +0100
+++ lxdm-0.4.1/src/lxdm.c 2011-11-16 22:29:19.030694008 +0100
@@ -52,7 +52,9 @@
#include <sys/ioctl.h>
#include <sys/stat.h>
+#ifdef HAVE_EXECINFO_H
#include <execinfo.h>
+#endif
#ifdef HAVE_UTMPX_H
#include <utmpx.h>
@@ -1576,6 +1578,7 @@
return success;;
}
+#ifdef HAVE_EXECINFO_H
static void log_sigsegv(void)
{
void *array[40];
@@ -1591,12 +1594,15 @@
free(bt_strs);
}
+#endif
static void sigsegv_handler(int sig)
{
switch(sig){
case SIGSEGV:
+#ifdef HAVE_EXECINFO_H
log_sigsegv();
+#endif
lxdm_quit_self(0);
break;
default:
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment