[Pkg-utopia-commits] r3211 - in /packages/unstable/hal/debian: changelog patches/50_kfreebsd.patch
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Wed Aug 12 21:29:38 UTC 2009
Author: biebl
Date: Wed Aug 12 21:29:37 2009
New Revision: 3211
URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3211
Log:
* debian/patches/50_kfreebsd.patch
- Present input.keys capability on GNU/kFreeBSD. (Closes: #541189)
Thanks to Aurelien Jarno for the updated patch.
Modified:
packages/unstable/hal/debian/changelog
packages/unstable/hal/debian/patches/50_kfreebsd.patch
Modified: packages/unstable/hal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/changelog?rev=3211&op=diff
==============================================================================
--- packages/unstable/hal/debian/changelog (original)
+++ packages/unstable/hal/debian/changelog Wed Aug 12 21:29:37 2009
@@ -1,3 +1,11 @@
+hal (0.5.13-3) UNRELEASED; urgency=low
+
+ * debian/patches/50_kfreebsd.patch
+ - Present input.keys capability on GNU/kFreeBSD. (Closes: #541189)
+ Thanks to Aurelien Jarno for the updated patch.
+
+ -- Michael Biebl <biebl at debian.org> Fri, 07 Aug 2009 18:52:40 +0200
+
hal (0.5.13-2) unstable; urgency=low
* debian/control
Modified: packages/unstable/hal/debian/patches/50_kfreebsd.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/patches/50_kfreebsd.patch?rev=3211&op=diff
==============================================================================
--- packages/unstable/hal/debian/patches/50_kfreebsd.patch (original)
+++ packages/unstable/hal/debian/patches/50_kfreebsd.patch Wed Aug 12 21:29:37 2009
@@ -186,8 +186,8 @@
all: all-am
---- hal-0.5.13.orig/hald/freebsd/addons/addon-storage.c
-+++ hal-0.5.13/hald/freebsd/addons/addon-storage.c
+--- a/hald/freebsd/addons/addon-storage.c
++++ b/hald/freebsd/addons/addon-storage.c
@@ -181,10 +181,12 @@
static void
update_proc_title (const char *device, boolean polling_enabled)
@@ -201,10 +201,8 @@
}
static DBusHandlerResult
-only in patch2:
-unchanged:
---- hal-0.5.13.orig/hald/freebsd/probing/probe-storage.c
-+++ hal-0.5.13/hald/freebsd/probing/probe-storage.c
+--- a/hald/freebsd/probing/probe-storage.c
++++ b/hald/freebsd/probing/probe-storage.c
@@ -33,7 +33,7 @@
#include <sys/types.h>
#include <netinet/in.h>
@@ -271,8 +269,8 @@
}
end:
---- hal-0.5.13.orig/hald/freebsd/probing/probe-hiddev.c
-+++ hal-0.5.13/hald/freebsd/probing/probe-hiddev.c
+--- a/hald/freebsd/probing/probe-hiddev.c
++++ b/hald/freebsd/probing/probe-hiddev.c
@@ -62,8 +62,10 @@
if (fd < 0)
goto end;
@@ -284,10 +282,41 @@
if (ioctl(fd, USB_GET_REPORT_ID, &report_id) < 0)
goto end;
-only in patch2:
-unchanged:
---- hal-0.5.13.orig/hald/freebsd/probing/probe-scsi.c
-+++ hal-0.5.13/hald/freebsd/probing/probe-scsi.c
+@@ -120,30 +120,22 @@
+
+ hid_dispose_report_desc(report_desc);
+
+- if (is_keyboard || is_mouse || is_joystick)
++ if (is_keyboard || is_mouse || is_joystick || is_keypad)
+ {
+ libhal_device_add_capability(hfp_ctx, hfp_udi, "input", &hfp_error);
++ libhal_device_set_property_string(hfp_ctx, hfp_udi, "info.category", "input.keyboard", &hfp_error);
+ libhal_device_set_property_string(hfp_ctx, hfp_udi, "input.device", device_file, &hfp_error);
+ }
+ if (is_keyboard)
+- {
+ libhal_device_add_capability(hfp_ctx, hfp_udi, "input.keyboard", &hfp_error);
+- libhal_device_set_property_string(hfp_ctx, hfp_udi, "info.category", "input.keyboard", &hfp_error);
+- }
+ if (is_keypad)
+ libhal_device_add_capability(hfp_ctx, hfp_udi, "input.keypad", &hfp_error);
+ if (is_keyboard || is_keypad)
+ libhal_device_add_capability(hfp_ctx, hfp_udi, "input.keys", &hfp_error);
+ if (is_mouse)
+- {
+ libhal_device_add_capability(hfp_ctx, hfp_udi, "input.mouse", &hfp_error);
+- libhal_device_set_property_string(hfp_ctx, hfp_udi, "info.category", "input.mouse", &hfp_error);
+- }
+ if (is_joystick)
+- {
+ libhal_device_add_capability(hfp_ctx, hfp_udi, "input.joystick", &hfp_error);
+- libhal_device_set_property_string(hfp_ctx, hfp_udi, "info.category", "input.joystick", &hfp_error);
+- }
+
+ end:
+ return 0;
+--- a/hald/freebsd/probing/probe-scsi.c
++++ b/hald/freebsd/probing/probe-scsi.c
@@ -47,8 +47,10 @@
if (! device_file)
goto end;
@@ -489,4 +518,102 @@
+ hal_device_property_set_int (device, "org.freedesktop.Hal.version.micro", micro);
}
}
-
+
+--- a/hald/freebsd/hf-util.c
++++ b/hald/freebsd/hf-util.c
+@@ -326,24 +326,31 @@
+
+ void
+ hf_device_set_input (HalDevice *device,
+- const char *class,
++ const char *capability1,
++ const char *capability2,
+ const char *devname)
+ {
+ g_return_if_fail(HAL_IS_DEVICE(device));
+
+ hal_device_add_capability(device, "input");
++ if (capability1)
++ {
++ char *capability;
+
+- if (class)
++ capability = g_strdup_printf("input.%s", capability1);
++ hal_device_add_capability(device, capability);
++ g_free(capability);
++ }
++ if (capability2)
+ {
+- char *category;
++ char *capability;
+
+- category = g_strdup_printf("input.%s", class);
+- hal_device_property_set_string(device, "info.category", category);
+- hal_device_add_capability(device, category);
+- g_free(category);
++ capability = g_strdup_printf("input.%s", capability2);
++ hal_device_add_capability(device, capability);
++ g_free(capability);
+ }
+- else
+- hal_device_property_set_string(device, "info.category", "input");
++
++ hal_device_property_set_string(device, "info.category", "input");
+
+ if (devname)
+ hf_device_property_set_string_printf(device, "input.device", "/dev/%s", devname);
+--- a/hald/freebsd/hf-usb.c
++++ b/hald/freebsd/hf-usb.c
+@@ -424,9 +424,9 @@
+ hf_devtree_device_set_name(device, di->udi_devnames[0]);
+
+ if ((devname = hf_usb_get_devname(di, "ukbd"))) /* USB keyboard */
+- hf_device_set_input(device, "keyboard", devname);
++ hf_device_set_input(device, "keyboard", "keys", devname);
+ else if ((devname = hf_usb_get_devname(di, "ums"))) /* USB mouse */
+- hf_device_set_input(device, "mouse", devname);
++ hf_device_set_input(device, "mouse", NULL, devname);
+ else if ((devname = hf_usb_get_devname(di, "uhid"))) /* UHID device */
+ {
+ hal_device_property_set_string(device, "info.category", "hiddev");
+--- a/hald/freebsd/hf-util.h
++++ b/hald/freebsd/hf-util.h
+@@ -87,7 +87,8 @@
+ ...) G_GNUC_PRINTF(3, 4);
+
+ void hf_device_set_input (HalDevice *device,
+- const char *class,
++ const char *capability1,
++ const char *capability2,
+ const char *devname);
+
+ HalDevice *hf_device_store_get_parent (HalDeviceStore *store,
+--- a/hald/freebsd/hf-devtree.c
++++ b/hald/freebsd/hf-devtree.c
+@@ -186,7 +186,7 @@
+ static void
+ hf_devtree_atkbd_set_properties (HalDevice *device)
+ {
+- hf_device_set_input(device, "keyboard", NULL);
++ hf_device_set_input(device, "keyboard", "keys", NULL);
+ }
+
+ static void
+@@ -195,7 +195,7 @@
+ char *devname;
+
+ devname = hf_devtree_device_get_name(device);
+- hf_device_set_input(device, "mouse", devname);
++ hf_device_set_input(device, "mouse", NULL, devname);
+ g_free(devname);
+ }
+
+@@ -205,7 +205,7 @@
+ char *devname;
+
+ devname = hf_devtree_device_get_name(device);
+- hf_device_set_input(device, "joystick", devname);
++ hf_device_set_input(device, "joystick", NULL, devname);
+ g_free(devname);
+
+ if (! hal_device_has_property(device, "info.product"))
More information about the Pkg-utopia-commits
mailing list