diff options
| author |   Koen Kooi <koen@dominion.thruhere.net> | 2011-06-25 11:24:45 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-30 20:54:51 +0100 |
| commit | eb828308b8e721e4ad7edbd15f47ecad22ee81cf (patch) | |
| tree | e61cdf2886c9120997ab47f5d95818655baf1cef /meta/recipes-support | |
| parent | 6b28a9f73773890e70fb4dc570520b5be060a919 (diff) | |
| download | openembedded-core-contrib-eb828308b8e721e4ad7edbd15f47ecad22ee81cf.tar.gz | |
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).
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta/recipes-support')
| -rw-r--r-- | meta/recipes-support/consolekit/consolekit_0.4.5.bb | 7 | ||||
| -rw-r--r-- | meta/recipes-support/consolekit/files/nopolkit.patch | 18 |
2 files changed, 3 insertions, 22 deletions
diff --git a/meta/recipes-support/consolekit/consolekit_0.4.5.bb b/meta/recipes-support/consolekit/consolekit_0.4.5.bb index 2b85455374..c934d0f838 100644 --- a/meta/recipes-support/consolekit/consolekit_0.4.5.bb +++ b/meta/recipes-support/consolekit/consolekit_0.4.5.bb @@ -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" diff --git a/meta/recipes-support/consolekit/files/nopolkit.patch b/meta/recipes-support/consolekit/files/nopolkit.patch deleted file mode 100644 index a0d9d06500..0000000000 --- a/meta/recipes-support/consolekit/files/nopolkit.patch +++ /dev/null @@ -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 |