summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2011-06-25 09:24:45 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-30 19:57:07 (GMT)
commitc1fd6f0c53dc7b539aecc162704c6edc5a9141ed (patch)
treefdfd7317669a1528f9751b9f329084614b51071e
parentc3acb9ca8e1973097db93c7111f67176fe30fa2f (diff)
downloadpoky-c1fd6f0c53dc7b539aecc162704c6edc5a9141ed.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). (From OE-Core rev: eb828308b8e721e4ad7edbd15f47ecad22ee81cf) Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/consolekit/consolekit_0.4.5.bb7
-rw-r--r--meta/recipes-support/consolekit/files/nopolkit.patch18
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 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
2HOMEPAGE="http://www.freedesktop.org/wiki/Software/ConsoleKit" 2HOMEPAGE="http://www.freedesktop.org/wiki/Software/ConsoleKit"
3BUGTRACKER="https://bugs.freedesktop.org/buglist.cgi?query_format=specific&product=ConsoleKit" 3BUGTRACKER="https://bugs.freedesktop.org/buglist.cgi?query_format=specific&product=ConsoleKit"
4 4
5PR = "r2" 5PR = "r3"
6 6
7LICENSE = "GPLv2+" 7LICENSE = "GPLv2+"
8LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ 8LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
9 file://src/main.c;endline=21;md5=0a994e09769780220163255d8f9071c3" 9 file://src/main.c;endline=21;md5=0a994e09769780220163255d8f9071c3"
10 10
11DEPENDS = "dbus ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 11DEPENDS = "dbus polkit ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
12 12
13inherit gnome 13inherit gnome
14 14
15SRC_URI = "http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-${PV}.tar.bz2 \ 15SRC_URI = "http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-${PV}.tar.bz2"
16 file://nopolkit.patch"
17SRC_URI[md5sum] = "f2657f93761206922d558471a936fbc3" 16SRC_URI[md5sum] = "f2657f93761206922d558471a936fbc3"
18SRC_URI[sha256sum] = "43e0780c53078e125efcec3f847e484dc3533e49b408ce6a0ab1b223686b9c38" 17SRC_URI[sha256sum] = "43e0780c53078e125efcec3f847e484dc3533e49b408ce6a0ab1b223686b9c38"
19 18
diff --git a/meta/recipes-support/consolekit/files/nopolkit.patch b/meta/recipes-support/consolekit/files/nopolkit.patch
deleted file mode 100644
index a0d9d06..0000000
--- a/meta/recipes-support/consolekit/files/nopolkit.patch
+++ /dev/null
@@ -1,18 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3Index: ConsoleKit-0.4.3/configure.ac
4===================================================================
5--- ConsoleKit-0.4.3.orig/configure.ac 2010-10-26 22:34:03.000000000 +0800
6+++ ConsoleKit-0.4.3/configure.ac 2010-11-28 15:28:26.000000000 +0800
7@@ -55,10 +55,7 @@
8 gthread-2.0 >= $GLIB_REQUIRED_VERSION
9 )
10
11-PKG_CHECK_MODULES(POLKIT,
12- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION,
13- have_polkit=yes,
14- have_polkit=no)
15+have_polkit=no
16 if test "x$have_polkit" = "xyes" ; then
17 AC_DEFINE(HAVE_POLKIT, [], [Define if we have polkit])
18 fi