consolekit 0.4.5: remove patch that forcibly disables consolekit

Polkit support is actually needed for consolekit to function properly, without you get things like:

	** (gnome-panel:547): WARNING **: Could not ask session manager if shut down is available: Timeout was reached

Various applications will timeout and less well written ones will crash (e.g. the clock applet).

(From OE-Core rev: eb828308b8e721e4ad7edbd15f47ecad22ee81cf)

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Koen Kooi
2011-06-25 11:24:45 +02:00
committed by Richard Purdie
parent c3acb9ca8e
commit c1fd6f0c53
2 changed files with 3 additions and 22 deletions

View File

@@ -2,18 +2,17 @@ DESCRIPTION = "ConsoleKit is a framework for defining and tracking users, login
HOMEPAGE="http://www.freedesktop.org/wiki/Software/ConsoleKit"
BUGTRACKER="https://bugs.freedesktop.org/buglist.cgi?query_format=specific&product=ConsoleKit"
PR = "r2"
PR = "r3"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
file://src/main.c;endline=21;md5=0a994e09769780220163255d8f9071c3"
DEPENDS = "dbus ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
DEPENDS = "dbus polkit ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
inherit gnome
SRC_URI = "http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-${PV}.tar.bz2 \
file://nopolkit.patch"
SRC_URI = "http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-${PV}.tar.bz2"
SRC_URI[md5sum] = "f2657f93761206922d558471a936fbc3"
SRC_URI[sha256sum] = "43e0780c53078e125efcec3f847e484dc3533e49b408ce6a0ab1b223686b9c38"

View File

@@ -1,18 +0,0 @@
Upstream-Status: Inappropriate [configuration]
Index: ConsoleKit-0.4.3/configure.ac
===================================================================
--- ConsoleKit-0.4.3.orig/configure.ac 2010-10-26 22:34:03.000000000 +0800
+++ ConsoleKit-0.4.3/configure.ac 2010-11-28 15:28:26.000000000 +0800
@@ -55,10 +55,7 @@
gthread-2.0 >= $GLIB_REQUIRED_VERSION
)
-PKG_CHECK_MODULES(POLKIT,
- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION,
- have_polkit=yes,
- have_polkit=no)
+have_polkit=no
if test "x$have_polkit" = "xyes" ; then
AC_DEFINE(HAVE_POLKIT, [], [Define if we have polkit])
fi