Re: [OE-core] [PATCH 2/2] consolekit 0.4.5: remove patch that forcibly disables consolekit

2011-06-30 Thread Richard Purdie
On Sat, 2011-06-25 at 11:24 +0200, Koen Kooi wrote:
 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 k...@dominion.thruhere.net

Merged to master, thanks.

Richard


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core


[OE-core] [PATCH 2/2] consolekit 0.4.5: remove patch that forcibly disables consolekit

2011-06-25 Thread Koen Kooi
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 k...@dominion.thruhere.net
---
 .../recipes-support/consolekit/consolekit_0.4.5.bb |7 +++
 .../consolekit/files/nopolkit.patch|   18 --
 2 files changed, 3 insertions(+), 22 deletions(-)
 delete mode 100644 meta/recipes-support/consolekit/files/nopolkit.patch

diff --git a/meta/recipes-support/consolekit/consolekit_0.4.5.bb 
b/meta/recipes-support/consolekit/consolekit_0.4.5.bb
index 2b85455..c934d0f 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=specificproduct=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 a0d9d06..000
--- 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.0 +0800
-+++ ConsoleKit-0.4.3/configure.ac  2010-11-28 15:28:26.0 +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
-- 
1.6.6.1


___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core