aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2011-09-30 06:32:50 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2011-09-30 06:33:07 +0000
commitcb6731c91c12e70a79b1319c5778e3e5e78fe2e1 (patch)
treee65c5ef68b723a8d7ddb272744f7e6149141c9a7 /main
parent961149da61fd7cd84a3dd1199a32a201b35a9cb8 (diff)
downloadaports-cb6731c91c12e70a79b1319c5778e3e5e78fe2e1.tar.bz2
aports-cb6731c91c12e70a79b1319c5778e3e5e78fe2e1.tar.xz
main/lxdm: upgrade to 0.4.1
Diffstat (limited to 'main')
-rw-r--r--main/lxdm/APKBUILD16
-rw-r--r--main/lxdm/lxdm-execinfo.patch47
-rw-r--r--main/lxdm/lxdm-nopam.patch18
3 files changed, 6 insertions, 75 deletions
diff --git a/main/lxdm/APKBUILD b/main/lxdm/APKBUILD
index 56754a97ef..4b93c4ac9a 100644
--- a/main/lxdm/APKBUILD
+++ b/main/lxdm/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: William Pitcock <nenolod@dereferenced.org>
# Maintainer: William Pitcock <nenolod@dereferenced.org>
pkgname=lxdm
-pkgver=0.3.0
-pkgrel=3
+pkgver=0.4.1
+pkgrel=0
pkgdesc="LXDE desktop login manager"
url="http://wiki.lxde.org/en/LXDM"
license="GPL"
@@ -11,9 +11,7 @@ makedepends="autoconf automake gtk+-dev consolekit-dev"
install=
source="http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz
background.png
- lxdm.initd
- lxdm-execinfo.patch
- lxdm-nopam.patch"
+ lxdm.initd"
arch="all"
_builddir="$srcdir"/$pkgname-$pkgver
@@ -56,8 +54,6 @@ package() {
install -m644 -D "$srcdir"/background.png "$pkgdir"/usr/share/lxdm/themes/Industrial/background.png
}
-md5sums="1d0688e088edab7c3c563263eb2f9654 lxdm-0.3.0.tar.gz
-50022ef35118455e23d4e4b8e2e912af background.png
-d6455d172d5d897f6bfcefe9a1a632c7 lxdm.initd
-045da38f5bb183ccacc489ea7e50e927 lxdm-execinfo.patch
-0d44e8cd97894fd680e3f09e680c3481 lxdm-nopam.patch"
+md5sums="8da1cfc2be6dc9217c85a7cf51e1e821 lxdm-0.4.1.tar.gz
+a510afe725112947d16f6c1f0602effe background.png
+d6455d172d5d897f6bfcefe9a1a632c7 lxdm.initd"
diff --git a/main/lxdm/lxdm-execinfo.patch b/main/lxdm/lxdm-execinfo.patch
deleted file mode 100644
index b81ef2fc84..0000000000
--- a/main/lxdm/lxdm-execinfo.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- lxdm-0.3.0/configure.ac
-+++ lxdm-0.3.0.mod/configure.ac
-@@ -23,7 +23,7 @@
-
- # Checks for header files.
- AC_PATH_X
--AC_CHECK_HEADERS([shadow.h stdlib.h string.h unistd.h])
-+AC_CHECK_HEADERS([shadow.h stdlib.h string.h unistd.h execinfo.h])
-
- # Checks for typedefs, structures, and compiler characteristics.
- AC_TYPE_PID_T
-Only in lxdm-0.3.0: data/LoginReady
-Only in lxdm-0.3.0: data/PostLogin
-Only in lxdm-0.3.0: data/PostLogout
-Only in lxdm-0.3.0: data/PreLogin
-Only in lxdm-0.3.0: data/PreReboot
-Only in lxdm-0.3.0: data/PreShutdown
---- lxdm-0.3.0/src/lxdm.c
-+++ lxdm-0.3.0.mod/src/lxdm.c
-@@ -51,7 +51,9 @@
- #include <sys/ioctl.h>
- #include <sys/stat.h>
-
-+#ifdef HAVE_EXECINFO_H
- #include <execinfo.h>
-+#endif
-
- #include <utmp.h>
-
-@@ -1480,6 +1482,7 @@
-
- static void log_sigsegv(void)
- {
-+#ifdef HAVE_EXECINFO_H
- void *array[40];
- size_t size;
- char **bt_strs;
-@@ -1492,6 +1495,9 @@
- fprintf(stderr, "%s\n", bt_strs[i]);
-
- free(bt_strs);
-+#else
-+ fprintf(stderr, "backtrace is unavailable\n");
-+#endif
- }
-
- static void sigsegv_handler(int sig)
diff --git a/main/lxdm/lxdm-nopam.patch b/main/lxdm/lxdm-nopam.patch
deleted file mode 100644
index 86c808fcb6..0000000000
--- a/main/lxdm/lxdm-nopam.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- lxdm-0.3.0/src/lxdm.c
-+++ lxdm-0.3.0.mod/src/lxdm.c
-@@ -152,6 +152,7 @@
- while( waitpid(-1, 0, WNOHANG) > 0 ) ;
- }
-
-+#if HAVE_LIBPAM
- static void close_pam_session(pam_handle_t *pamh)
- {
- int err;
-@@ -161,6 +162,7 @@
- pam_end(pamh, err);
- pamh = NULL;
- }
-+#endif
-
- static LXSession *lxsession_find_greeter(void)
- {