From 88ab886ebcb734f481ba0f9de280b85c6b002f3e Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 22 Feb 2010 15:50:33 +0100 Subject: [PATCH] ConsoleKit: add patch to fix initialization through dbus, from Archlinux. Bump revision. --HG-- extra : convert_revision : 099869362b9a2931bd106ee438c8a416068074ba --- .../patches/reorder-initialization.patch | 41 +++++++++++++++++++ srcpkgs/ConsoleKit/template | 2 +- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/ConsoleKit/patches/reorder-initialization.patch diff --git a/srcpkgs/ConsoleKit/patches/reorder-initialization.patch b/srcpkgs/ConsoleKit/patches/reorder-initialization.patch new file mode 100644 index 00000000000..7d349504727 --- /dev/null +++ b/srcpkgs/ConsoleKit/patches/reorder-initialization.patch @@ -0,0 +1,41 @@ +Fixes initialization with hal-0.5.14 through dbus, from Archlinux. + +--- src/main.c.reorder-initialization 2009-12-18 14:51:38.821212946 -0500 ++++ src/main.c 2009-12-18 14:52:19.246211176 -0500 +@@ -294,11 +294,19 @@ main (int argc, + + setup_debug_log (debug); + ++ g_debug ("initializing console-kit-daemon %s", VERSION); ++ + connection = get_system_bus (); + if (connection == NULL) { + goto out; + } + ++ manager = ck_manager_new (); ++ ++ if (manager == NULL) { ++ goto out; ++ } ++ + bus_proxy = get_bus_proxy (connection); + if (bus_proxy == NULL) { + g_warning ("Could not construct bus_proxy object; bailing out"); +@@ -310,16 +318,8 @@ main (int argc, + goto out; + } + +- g_debug ("initializing console-kit-daemon %s", VERSION); +- + create_pid_file (); + +- manager = ck_manager_new (); +- +- if (manager == NULL) { +- goto out; +- } +- + loop = g_main_loop_new (NULL, FALSE); + + g_signal_connect (bus_proxy, diff --git a/srcpkgs/ConsoleKit/template b/srcpkgs/ConsoleKit/template index 3a8737aef39..9c5f1280b1b 100644 --- a/srcpkgs/ConsoleKit/template +++ b/srcpkgs/ConsoleKit/template @@ -1,7 +1,7 @@ # Template file for 'ConsoleKit' pkgname=ConsoleKit version=0.4.1 -revision=1 +revision=2 distfiles="http://www.freedesktop.org/software/$pkgname/dist/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--enable-docbook-docs --enable-pam-module