summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-graphics
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2013-10-16 22:42:15 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2013-10-21 12:15:02 +0200
commit19943f942746b0e628ef894c02a1c7f26288d682 (patch)
tree672fc600a5bc785408d4a5857d91322b7669f106 /meta-oe/recipes-graphics
parentbcaa7aabf8088aadfdbda4da4a3f1c30af8dd9d6 (diff)
downloadmeta-openembedded-19943f942746b0e628ef894c02a1c7f26288d682.tar.gz
lxdm: update to latest git version
fixes crashing after first log off Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-graphics')
-rw-r--r--meta-oe/recipes-graphics/lxdm/lxdm/0002-configure-check-only-for-ck-connector-in-case-consol.patch48
-rw-r--r--meta-oe/recipes-graphics/lxdm/lxdm_git.bb6
2 files changed, 2 insertions, 52 deletions
diff --git a/meta-oe/recipes-graphics/lxdm/lxdm/0002-configure-check-only-for-ck-connector-in-case-consol.patch b/meta-oe/recipes-graphics/lxdm/lxdm/0002-configure-check-only-for-ck-connector-in-case-consol.patch
deleted file mode 100644
index e2ba52a8c..000000000
--- a/meta-oe/recipes-graphics/lxdm/lxdm/0002-configure-check-only-for-ck-connector-in-case-consol.patch
+++ /dev/null
@@ -1,48 +0,0 @@
1From 8657bfcfc5c26382989001e9b6d18295d740c709 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Fri, 7 Jun 2013 14:13:41 +0200
4Subject: [PATCH] configure: check only for ck-connector in case consolekit is
5 enabled
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
9
10it failed for --disable-consolekit with
11
12| lxdm.c:70:26: fatal error: ck-connector.h: No such file or directory
13| compilation terminated.
14| make[2]: *** [lxdm_binary-lxdm.o] Error 1
15
16Upstream-Status: submitted [1]
17
18[1] http://sourceforge.net/mailarchive/message.php?msg_id=31010893
19
20Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
21---
22 configure.ac | 3 +--
23 1 files changed, 1 insertions(+), 2 deletions(-)
24
25diff --git a/configure.ac b/configure.ac
26index 9e21a22..49ba944 100644
27--- a/configure.ac
28+++ b/configure.ac
29@@ -28,8 +28,6 @@ if test "x$USE_PAM" != "xno" ; then
30 fi])
31 fi
32
33-AC_CHECK_LIB([ck-connector],[ck_connector_open_session])
34-
35 # Checks for header files.
36 AC_PATH_X
37 AC_CHECK_HEADERS([shadow.h stdlib.h string.h unistd.h utmpx.h])
38@@ -102,6 +100,7 @@ if test "x$enable_consolekit" = "xyes" ; then
39 AC_SUBST(CONSOLEKIT_LIBS)],[
40 echo "ConsoleKit devel package not found"
41 ])
42+ AC_CHECK_LIB([ck-connector],[ck_connector_open_session])
43 fi
44
45
46--
471.7.6.5
48
diff --git a/meta-oe/recipes-graphics/lxdm/lxdm_git.bb b/meta-oe/recipes-graphics/lxdm/lxdm_git.bb
index 97bda4c09..5f9d2f416 100644
--- a/meta-oe/recipes-graphics/lxdm/lxdm_git.bb
+++ b/meta-oe/recipes-graphics/lxdm/lxdm_git.bb
@@ -8,15 +8,13 @@ SRC_URI = " \
8 file://lxdm-pam \ 8 file://lxdm-pam \
9 file://lxdm-pam-debug \ 9 file://lxdm-pam-debug \
10 ${@base_contains("DISTRO_TYPE", "debug", "", "file://0001-lxdm.conf.in-blacklist-root-for-release-images.patch",d)} \ 10 ${@base_contains("DISTRO_TYPE", "debug", "", "file://0001-lxdm.conf.in-blacklist-root-for-release-images.patch",d)} \
11 file://0002-configure-check-only-for-ck-connector-in-case-consol.patch \
12" 11"
13 12
14LXDM_PAM = "${@base_contains("DISTRO_TYPE", "debug", "lxdm-pam-debug", "lxdm-pam",d)}" 13LXDM_PAM = "${@base_contains("DISTRO_TYPE", "debug", "lxdm-pam-debug", "lxdm-pam",d)}"
15 14
16SRCREV = "65e7cc8fdc150c2b925eb348ce82de17dee5eb0b" 15SRCREV = "07fb151a99ef99318b71f3de0afbba977b1e6267"
17PV = "0.4.2+git${SRCPV}" 16PV = "0.5.0+git${SRCPV}"
18PE = "1" 17PE = "1"
19PR = "r7"
20 18
21DEPENDS = "cairo dbus gdk-pixbuf glib-2.0 gtk+ virtual/libx11 libxcb pango" 19DEPENDS = "cairo dbus gdk-pixbuf glib-2.0 gtk+ virtual/libx11 libxcb pango"
22DEPENDS += "${@base_contains("DISTRO_FEATURES", "systemd", "", "consolekit", d)}" 20DEPENDS += "${@base_contains("DISTRO_FEATURES", "systemd", "", "consolekit", d)}"