Patchwork [meta-oe/meta-xfce,1/2] lxdm: update to latest git version

login
register
mail settings
Submitter Andreas Müller
Date Oct. 16, 2013, 10:42 p.m.
Message ID <1381963336-18888-1-git-send-email-schnitzeltony@googlemail.com>
Download mbox | patch
Permalink /patch/60043/
State Accepted, archived
Commit 19943f942746b0e628ef894c02a1c7f26288d682
Headers show

Comments

Andreas Müller - Oct. 16, 2013, 10:42 p.m.
fixes crashing after first log off

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 ...heck-only-for-ck-connector-in-case-consol.patch | 48 ----------------------
 meta-oe/recipes-graphics/lxdm/lxdm_git.bb          |  6 +--
 2 files changed, 2 insertions(+), 52 deletions(-)
 delete mode 100644 meta-oe/recipes-graphics/lxdm/lxdm/0002-configure-check-only-for-ck-connector-in-case-consol.patch

Patch

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 e2ba52a..0000000
--- a/meta-oe/recipes-graphics/lxdm/lxdm/0002-configure-check-only-for-ck-connector-in-case-consol.patch
+++ /dev/null
@@ -1,48 +0,0 @@ 
-From 8657bfcfc5c26382989001e9b6d18295d740c709 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Fri, 7 Jun 2013 14:13:41 +0200
-Subject: [PATCH] configure: check only for ck-connector in case consolekit is
- enabled
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-it failed for --disable-consolekit with
-
-| lxdm.c:70:26: fatal error: ck-connector.h: No such file or directory
-| compilation terminated.
-| make[2]: *** [lxdm_binary-lxdm.o] Error 1
-
-Upstream-Status: submitted [1]
-
-[1] http://sourceforge.net/mailarchive/message.php?msg_id=31010893
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
----
- configure.ac |    3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9e21a22..49ba944 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -28,8 +28,6 @@ if test "x$USE_PAM" != "xno" ; then
- 		 fi])
- fi
- 
--AC_CHECK_LIB([ck-connector],[ck_connector_open_session])
--
- # Checks for header files.
- AC_PATH_X
- AC_CHECK_HEADERS([shadow.h stdlib.h string.h unistd.h utmpx.h])
-@@ -102,6 +100,7 @@ if test "x$enable_consolekit" = "xyes" ; then
- 	AC_SUBST(CONSOLEKIT_LIBS)],[
- 	echo "ConsoleKit devel package not found"
- 	])
-+  AC_CHECK_LIB([ck-connector],[ck_connector_open_session])
- fi
- 
- 
--- 
-1.7.6.5
-
diff --git a/meta-oe/recipes-graphics/lxdm/lxdm_git.bb b/meta-oe/recipes-graphics/lxdm/lxdm_git.bb
index 97bda4c..5f9d2f4 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 = " \
     file://lxdm-pam \
     file://lxdm-pam-debug \
     ${@base_contains("DISTRO_TYPE", "debug", "", "file://0001-lxdm.conf.in-blacklist-root-for-release-images.patch",d)} \
-    file://0002-configure-check-only-for-ck-connector-in-case-consol.patch \
 "
 
 LXDM_PAM = "${@base_contains("DISTRO_TYPE", "debug", "lxdm-pam-debug", "lxdm-pam",d)}"
 
-SRCREV = "65e7cc8fdc150c2b925eb348ce82de17dee5eb0b"
-PV = "0.4.2+git${SRCPV}"
+SRCREV = "07fb151a99ef99318b71f3de0afbba977b1e6267"
+PV = "0.5.0+git${SRCPV}"
 PE = "1"
-PR = "r7"
 
 DEPENDS = "cairo dbus gdk-pixbuf glib-2.0 gtk+ virtual/libx11 libxcb pango"
 DEPENDS += "${@base_contains("DISTRO_FEATURES", "systemd", "", "consolekit", d)}"