summaryrefslogtreecommitdiffstats
path: root/lxde
diff options
context:
space:
mode:
authorFlorian Franzmann2011-10-27 13:39:22 +0200
committerFlorian Franzmann2011-10-27 13:39:22 +0200
commitda40750a4357df441bd42551847b830c873f0abf (patch)
tree90adf8d752b6f976ae3b49ba0bd4e29777e86066 /lxde
parente105b02ca8122a74339daa59442e102834f5c1f2 (diff)
lxde/lxdm: version 0.4.1
Diffstat (limited to 'lxde')
-rwxr-xr-xlxde/lxdm/DEPENDS2
-rwxr-xr-xlxde/lxdm/DETAILS4
-rw-r--r--lxde/lxdm/HISTORY6
-rwxr-xr-xlxde/lxdm/PRE_BUILD2
-rw-r--r--lxde/lxdm/lxdm-pam.patch18
5 files changed, 10 insertions, 22 deletions
diff --git a/lxde/lxdm/DEPENDS b/lxde/lxdm/DEPENDS
index 5b791f3fdc..001d95f995 100755
--- a/lxde/lxdm/DEPENDS
+++ b/lxde/lxdm/DEPENDS
@@ -1,4 +1,4 @@
-depends gtk+2 &&
+depends gtk+3 '--enable-gtk3' &&
depends consolekit &&
optional_depends linux-pam '--with-pam' '--without-pam' 'For PAM support' &&
optional_depends xauth '--enable-xauth' '--disable-xauth' 'For XAUTH support'
diff --git a/lxde/lxdm/DETAILS b/lxde/lxdm/DETAILS
index b5ec0c2b13..eee59e212c 100755
--- a/lxde/lxdm/DETAILS
+++ b/lxde/lxdm/DETAILS
@@ -1,8 +1,8 @@
SPELL=lxdm
- VERSION=0.3.0
+ VERSION=0.4.1
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=${SOURCEFORGE_URL}/lxde/${SOURCE}
- SOURCE_HASH=sha512:42498e54a716641407c83ffe04fb1554ff5055339dbbf9572bb0709f5732d809fffe27b3be64d1c5bdec3e0ebc2ced01cb39d552504f68c8b69ecd1131f451fc
+ SOURCE_HASH=sha512:8ed4a955a910def4db66958d1cb24976db178b8763199a024b6c2119894745e3646566c42d01472dffbbcbb7fd21784b01e74dc88038e01caebaa3b6d720ff27
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://lxde.org"
LICENSE[0]=GPL
diff --git a/lxde/lxdm/HISTORY b/lxde/lxdm/HISTORY
index bd4ef684b8..bfa0827aef 100644
--- a/lxde/lxdm/HISTORY
+++ b/lxde/lxdm/HISTORY
@@ -1,3 +1,9 @@
+2011-10-27 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.4.1
+ * PRE_BUILD: regenerate config files
+ * lxdm-pam.patch: removed
+ * DEPENDS: gtk+2 -> gtk+3
+
2010-11-27 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* DETAILS: version 0.3.0
* lxdm-pam.patch, PRE_BUILD: added patch to fix compile error
diff --git a/lxde/lxdm/PRE_BUILD b/lxde/lxdm/PRE_BUILD
index fe76665c22..5b7f69134a 100755
--- a/lxde/lxdm/PRE_BUILD
+++ b/lxde/lxdm/PRE_BUILD
@@ -1,3 +1,3 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-patch -p1 < ${SCRIPT_DIRECTORY}/lxdm-pam.patch
+rm ${SOURCE_DIRECTORY}/data/{PostLogin,PostLogout,PreLogin,PreReboot,PreShutdown,LoginReady,lxdm.conf}
diff --git a/lxde/lxdm/lxdm-pam.patch b/lxde/lxdm/lxdm-pam.patch
deleted file mode 100644
index 2194bb42d0..0000000000
--- a/lxde/lxdm/lxdm-pam.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- lxdm-0.3.0.orig/src/lxdm.c 2010-09-24 17:43:49.000000000 +0200
-+++ lxdm-0.3.0/src/lxdm.c 2010-11-27 08:51:27.000000000 +0100
-@@ -150,6 +150,7 @@
- while( waitpid(-1, 0, WNOHANG) > 0 ) ;
- }
-
-+#if HAVE_LIBPAM
- static void close_pam_session(pam_handle_t *pamh)
- {
- int err;
-@@ -159,6 +160,7 @@
- pam_end(pamh, err);
- pamh = NULL;
- }
-+#endif
-
- static LXSession *lxsession_find_greeter(void)
- {