[Pkg-utopia-commits] r3052 - in /packages/unstable/hal/debian: changelog patches/11-direct-hal-set-propery.patch patches/series
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Wed Apr 8 08:18:41 UTC 2009
Author: biebl
Date: Wed Apr 8 08:18:41 2009
New Revision: 3052
URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3052
Log:
Add --direct option to hal-set-property.
* debian/patches/11-direct-hal-set-propery.patch
- Add --direct option to hal-set-property which will be required by X to
correctly set the keymap. (Closes: #513928)
Thanks to Julien Cristau for the patch.
Added:
packages/unstable/hal/debian/patches/11-direct-hal-set-propery.patch
Modified:
packages/unstable/hal/debian/changelog
packages/unstable/hal/debian/patches/series
Modified: packages/unstable/hal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/changelog?rev=3052&op=diff
==============================================================================
--- packages/unstable/hal/debian/changelog (original)
+++ packages/unstable/hal/debian/changelog Wed Apr 8 08:18:41 2009
@@ -57,6 +57,10 @@
* debian/rules
- Pass --enable-policy-kit, --enable-console-kit and
--enable-acl-management to ./configure.
+ * debian/patches/11-direct-hal-set-propery.patch
+ - Add --direct option to hal-set-property which will be required by X to
+ correctly set the keymap. (Closes: #513928)
+ Thanks to Julien Cristau for the patch.
-- Michael Biebl <biebl at debian.org> Wed, 07 Jan 2009 23:55:22 +0100
Added: packages/unstable/hal/debian/patches/11-direct-hal-set-propery.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/patches/11-direct-hal-set-propery.patch?rev=3052&op=file
==============================================================================
--- packages/unstable/hal/debian/patches/11-direct-hal-set-propery.patch (added)
+++ packages/unstable/hal/debian/patches/11-direct-hal-set-propery.patch Wed Apr 8 08:18:41 2009
@@ -1,0 +1,99 @@
+# In order to set the X keymap correctly in the future it looks like we'll
+# need the following patch in hal to make hal-set-property call
+# libhal_ctx_init_direct.
+# Debian http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=513928
+diff -up hal-0.5.10/tools/hal_set_property.c.jx hal-0.5.10/tools/hal_set_property.c
+--- hal-0.5.10/tools/hal_set_property.c.jx 2007-07-26 14:00:28.000000000 -0400
++++ hal-0.5.10/tools/hal_set_property.c 2008-03-10 14:22:58.000000000 -0400
+@@ -66,7 +66,7 @@ usage (int argc, char *argv[])
+ " (--int <value> | --string <value> | --bool <value> |\n"
+ " --strlist-pre <value> | --strlist-post <value> |\n"
+ " --strlist-rem <value> | --double <value> | --remove)\n"
+- " [--help] [--version]\n");
++ " [--direct] [--help] [--version]\n");
+ fprintf (stderr,
+ "\n" " --udi Unique Device Id\n"
+ " --key Key of the property to set\n"
+@@ -81,6 +81,7 @@ usage (int argc, char *argv[])
+ " --strlist-post Append a string to a list\n"
+ " --strlist-rem Remove a string from a list\n"
+ " --remove Indicates that the property should be removed\n"
++ " --direct Use direct HAL connection\n"
+ " --version Show version and exit\n"
+ " --help Show this information and exit\n"
+ "\n"
+@@ -114,6 +115,7 @@ main (int argc, char *argv[])
+ dbus_bool_t is_version = FALSE;
+ int type = PROP_INVALID;
+ DBusError error;
++ dbus_bool_t direct = FALSE;
+
+ if (argc <= 1) {
+ usage (argc, argv);
+@@ -135,6 +137,7 @@ main (int argc, char *argv[])
+ {"strlist-pre", 1, NULL, 0},
+ {"strlist-post", 1, NULL, 0},
+ {"strlist-rem", 1, NULL, 0},
++ {"direct", 0, NULL, 0},
+ {"remove", 0, NULL, 0},
+ {"version", 0, NULL, 0},
+ {"help", 0, NULL, 0},
+@@ -188,6 +191,8 @@ main (int argc, char *argv[])
+ type = PROP_STRLIST_REM;
+ } else if (strcmp (opt, "remove") == 0) {
+ remove = TRUE;
++ } else if (strcmp (opt, "direct") == 0) {
++ direct = TRUE;
+ } else if (strcmp (opt, "udi") == 0) {
+ udi = strdup (optarg);
+ } else if (strcmp (opt, "version") == 0) {
+@@ -215,24 +220,32 @@ main (int argc, char *argv[])
+
+ fprintf (stderr, "\n");
+
+- dbus_error_init (&error);
+- if ((hal_ctx = libhal_ctx_new ()) == NULL) {
+- fprintf (stderr, "error: libhal_ctx_new\n");
+- return 1;
+- }
+- if (!libhal_ctx_set_dbus_connection (hal_ctx, dbus_bus_get (DBUS_BUS_SYSTEM, &error))) {
+- fprintf (stderr, "error: libhal_ctx_set_dbus_connection: %s: %s\n", error.name, error.message);
+- LIBHAL_FREE_DBUS_ERROR (&error);
+- return 1;
+- }
+- if (!libhal_ctx_init (hal_ctx, &error)) {
+- if (dbus_error_is_set(&error)) {
+- fprintf (stderr, "error: libhal_ctx_init: %s: %s\n", error.name, error.message);
+- dbus_error_free (&error);
++ dbus_error_init (&error);
++ if (direct) {
++ if ((hal_ctx = libhal_ctx_init_direct (&error)) == NULL) {
++ fprintf (stderr, "error: libhal_ctx_init_direct\n");
++ LIBHAL_FREE_DBUS_ERROR (&error);
++ return 1;
++ }
++ } else {
++ if ((hal_ctx = libhal_ctx_new ()) == NULL) {
++ fprintf (stderr, "error: libhal_ctx_new\n");
++ return 1;
++ }
++ if (!libhal_ctx_set_dbus_connection (hal_ctx, dbus_bus_get (DBUS_BUS_SYSTEM, &error))) {
++ fprintf (stderr, "error: libhal_ctx_set_dbus_connection: %s: %s\n", error.name, error.message);
++ LIBHAL_FREE_DBUS_ERROR (&error);
++ return 1;
++ }
++ if (!libhal_ctx_init (hal_ctx, &error)) {
++ if (dbus_error_is_set(&error)) {
++ fprintf (stderr, "error: libhal_ctx_init: %s: %s\n", error.name, error.message);
++ dbus_error_free (&error);
++ }
++ fprintf (stderr, "Could not initialise connection to hald.\n"
++ "Normally this means the HAL daemon (hald) is not running or not ready.\n");
++ return 1;
+ }
+- fprintf (stderr, "Could not initialise connection to hald.\n"
+- "Normally this means the HAL daemon (hald) is not running or not ready.\n");
+- return 1;
+ }
+
+ if (remove) {
Modified: packages/unstable/hal/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/patches/series?rev=3052&op=diff
==============================================================================
--- packages/unstable/hal/debian/patches/series (original)
+++ packages/unstable/hal/debian/patches/series Wed Apr 8 08:18:41 2009
@@ -1,3 +1,4 @@
10-no-polkit-policy-file-validate-check.patch
23_addon_acpi.patch
40_readme_remove_hacking.patch
+11-direct-hal-set-propery.patch
More information about the Pkg-utopia-commits
mailing list