On Thursday 10 March 2011 13:01:13 Alberto Villa wrote: > cd /usr/ports/sysutils/hal/files && patch < $attached_patch
ehm... patch attached -- Alberto Villa, FreeBSD committer <[email protected]> http://people.FreeBSD.org/~avilla You are standing on my toes.
Index: files/patch-hald_freebsd_probing_probe-volume.c
===================================================================
RCS file: /home/pcvs/ports/sysutils/hal/files/patch-hald_freebsd_probing_probe-volume.c,v
retrieving revision 1.3
diff -u -r1.3 patch-hald_freebsd_probing_probe-volume.c
--- files/patch-hald_freebsd_probing_probe-volume.c 10 May 2010 21:18:40 -0000 1.3
+++ files/patch-hald_freebsd_probing_probe-volume.c 10 Mar 2011 11:51:08 -0000
@@ -1,6 +1,15 @@
---- hald/freebsd/probing/probe-volume.c.orig 2009-12-23 14:06:53.000000000 -0500
-+++ hald/freebsd/probing/probe-volume.c 2009-12-23 14:07:01.000000000 -0500
-@@ -574,6 +574,7 @@ main (int argc, char **argv)
+--- hald/freebsd/probing/probe-volume.c.orig 2009-09-17 15:45:09.000000000 +0200
++++ hald/freebsd/probing/probe-volume.c 2011-03-10 12:45:48.293506507 +0100
+@@ -407,7 +407,7 @@
+ int type;
+ guint64 capacity;
+
+- libhal_device_set_property_string(hfp_ctx, hfp_udi, "info.category", "volume.disc", &hfp_error);
++ libhal_device_set_property_string(hfp_ctx, hfp_udi, "info.category", "volume", &hfp_error);
+ libhal_device_add_capability(hfp_ctx, hfp_udi, "volume.disc", &hfp_error);
+
+ libhal_device_set_property_bool(hfp_ctx, hfp_udi, "volume.disc.has_audio", has_audio, &hfp_error);
+@@ -574,6 +574,7 @@
snprintf(ufsid, sizeof(ufsid), "%08x%08x", ufsdisk.d_fs.fs_id[0], ufsdisk.d_fs.fs_id[1]);
libhal_device_set_property_string(hfp_ctx, hfp_udi, "volume.freebsd.ufsid", ufsid, &hfp_error);
@@ -8,7 +17,7 @@
ufs_devs = libhal_manager_find_device_string_match(hfp_ctx,
"volume.freebsd.ufsid",
ufsid,
-@@ -582,16 +583,17 @@ main (int argc, char **argv)
+@@ -582,16 +583,17 @@
dbus_error_free(&hfp_error);
for (i = 0; i < num_udis; i++)
{
Index: files/patch-hald_hf-storage.c
===================================================================
RCS file: /home/pcvs/ports/sysutils/hal/files/patch-hald_hf-storage.c,v
retrieving revision 1.8
diff -u -r1.8 patch-hald_hf-storage.c
--- files/patch-hald_hf-storage.c 29 Aug 2010 17:51:18 -0000 1.8
+++ files/patch-hald_hf-storage.c 10 Mar 2011 11:51:08 -0000
@@ -1,5 +1,5 @@
---- hald/freebsd/hf-storage.c.orig 2009-08-24 08:42:29.000000000 -0400
-+++ hald/freebsd/hf-storage.c 2010-08-29 12:22:03.000000000 -0400
+--- hald/freebsd/hf-storage.c.orig 2009-08-24 14:42:29.000000000 +0200
++++ hald/freebsd/hf-storage.c 2011-03-10 12:46:39.123394874 +0100
@@ -30,6 +30,7 @@
#include <limits.h>
#include <inttypes.h>
@@ -8,7 +8,7 @@
#include <sys/param.h>
#include <sys/types.h>
#include <sys/disklabel.h>
-@@ -418,10 +419,41 @@ hf_storage_parse_conftxt (const char *co
+@@ -418,10 +419,41 @@
continue;
}
@@ -50,7 +50,7 @@
geom_obj->type = -1; /* We use -1 here to denote a missing type. */
geom_obj->hash = hash;
-@@ -589,11 +621,18 @@ hf_storage_devd_notify (const char *syst
+@@ -589,11 +621,18 @@
char *conftxt;
GSList *new_disks;
@@ -70,7 +70,7 @@
new_disks = hf_storage_parse_conftxt(conftxt);
g_free(conftxt);
-@@ -669,7 +708,7 @@ hf_storage_conftxt_timeout_cb (gpointer
+@@ -669,7 +708,7 @@
if (hf_is_waiting)
return TRUE;
@@ -79,3 +79,12 @@
return TRUE;
}
+@@ -743,7 +782,7 @@
+ g_return_if_fail(HAL_IS_DEVICE(device));
+
+ hal_device_add_capability(device, "storage.cdrom");
+- hal_device_property_set_string(device, "info.category", "storage.cdrom");
++ hal_device_property_set_string(device, "info.category", "storage");
+ hal_device_property_set_string(device, "storage.drive_type", "cdrom");
+ hal_device_property_set_bool(device, "storage.removable", TRUE);
+ /* enable media checks */
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ kde-freebsd mailing list [email protected] https://mail.kde.org/mailman/listinfo/kde-freebsd See also http://freebsd.kde.org/ for latest information
