summaryrefslogtreecommitdiff
path: root/package/lxdm
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-03-31 22:27:39 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2011-03-31 22:27:39 +0200
commitbd015df1e472968ad28099544740f7b7e514312e (patch)
treeb535754145b5dfac8d9267a098795f7f2a2c276c /package/lxdm
parentf4e50548b0d41f5b4e6faae3ddc7283dd1a5dd6c (diff)
add lxde components, update libpng and firefox
Diffstat (limited to 'package/lxdm')
-rw-r--r--package/lxdm/Makefile34
-rw-r--r--package/lxdm/patches/patch-src_lxdm_c43
2 files changed, 77 insertions, 0 deletions
diff --git a/package/lxdm/Makefile b/package/lxdm/Makefile
new file mode 100644
index 000000000..f809888d8
--- /dev/null
+++ b/package/lxdm/Makefile
@@ -0,0 +1,34 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:= lxdm
+PKG_VERSION:= 0.3.0
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 1d0688e088edab7c3c563263eb2f9654
+PKG_DESCR:= LXDE display manager
+PKG_SECTION:= x11/lxde
+PKG_BUILDDEP:= libX11 glib gtk+ ConsoleKit
+PKG_DEPENDS:= libx11 glib libgtk consolekit
+PKG_URL:= http://lxde.org/
+PKG_SITES:= http://openadk.org/distfiles/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LXDM,lxdm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+lxdm-install:
+ $(INSTALL_DIR) $(IDIR_LXDM)/etc
+ $(CP) $(WRKINST)/etc/* $(IDIR_LXDM)/etc
+ $(INSTALL_DIR) $(IDIR_LXDM)/usr/libexec
+ $(CP) $(WRKINST)/usr/libexec/* \
+ $(IDIR_LXDM)/usr/libexec
+ $(INSTALL_DIR) $(IDIR_LXDM)/usr/sbin
+ $(INSTALL_BIN) $(WRKINST)/usr/sbin/lxdm* \
+ $(IDIR_LXDM)/usr/sbin
+ $(INSTALL_DIR) $(IDIR_LXDM)/usr/share/lxdm/themes
+ $(CP) $(WRKINST)/usr/share/lxdm/themes/* \
+ $(IDIR_LXDM)/usr/share/lxdm/themes
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/lxdm/patches/patch-src_lxdm_c b/package/lxdm/patches/patch-src_lxdm_c
new file mode 100644
index 000000000..b5eeaa4de
--- /dev/null
+++ b/package/lxdm/patches/patch-src_lxdm_c
@@ -0,0 +1,43 @@
+--- lxdm-0.3.0.orig/src/lxdm.c 2010-09-24 17:43:49.000000000 +0200
++++ lxdm-0.3.0/src/lxdm.c 2011-03-17 23:15:35.093370316 +0100
+@@ -51,8 +51,6 @@
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
+
+-#include <execinfo.h>
+-
+ #include <utmp.h>
+
+ #if HAVE_LIBPAM
+@@ -150,6 +148,7 @@ void stop_pid(int pid)
+ while( waitpid(-1, 0, WNOHANG) > 0 ) ;
+ }
+
++#if HAVE_LIBPAM
+ static void close_pam_session(pam_handle_t *pamh)
+ {
+ int err;
+@@ -159,6 +158,7 @@ static void close_pam_session(pam_handle
+ pam_end(pamh, err);
+ pamh = NULL;
+ }
++#endif
+
+ static LXSession *lxsession_find_greeter(void)
+ {
+@@ -1480,6 +1480,7 @@ int lxdm_do_auto_login(void)
+
+ static void log_sigsegv(void)
+ {
++/*
+ void *array[40];
+ size_t size;
+ char **bt_strs;
+@@ -1492,6 +1493,7 @@ static void log_sigsegv(void)
+ fprintf(stderr, "%s\n", bt_strs[i]);
+
+ free(bt_strs);
++*/
+ }
+
+ static void sigsegv_handler(int sig)