New sysutils/hal does not patches
R.Mahmatkhanov
cvs-src at yandex.ru
Tue May 20 17:01:40 UTC 2008
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi there!
I've trying to update hal from 0.5.11.r2_8 to 0.5.11 and this process
files on patch applying stage:
- ---> Session started at: Tue, 20 May 2008 20:08:27 +0400
- ---> Upgrade of sysutils/hal started at: Tue, 20 May 2008 20:08:30 +0400
- ---> Upgrading 'hal-0.5.11.r2_8' to 'hal-0.5.11' (sysutils/hal)
- ---> Build of sysutils/hal started at: Tue, 20 May 2008 20:08:30 +0400
- ---> Building '/usr/ports/sysutils/hal'
===> Cleaning for hal-0.5.11
===> Found saved configuration for hal-0.5.8.20070403_2
===> Extracting for hal-0.5.11
=> MD5 Checksum OK for hal-0.5.11.tar.gz.
=> SHA256 Checksum OK for hal-0.5.11.tar.gz.
===> Patching for hal-0.5.11
===> hal-0.5.11 depends on file: /usr/local/bin/libtool - found
===> Applying extra patch
/usr/ports/sysutils/hal/files/extra-patch-tools_hal-storage-mount.c
1 out of 1 hunks failed--saving rejects to tools/hal-storage-mount.c.rej
*** Error code 1
Stop in /usr/ports/sysutils/hal.
*** Error code 1
Reject file attached.
Thanks.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.8 (FreeBSD)
iEYEARECAAYFAkgy+YQACgkQmY+KeAh7t3BxsgCg0ZYAzXuKqJexWJQ8E0DVEU7c
hwoAoIkL59QXkACk3o5ONwli/Y9ubd6+
=8VRs
-----END PGP SIGNATURE-----
-------------- next part --------------
***************
*** 583,605 ****
explicit_mount_point_given = FALSE;
if (strlen (mount_point) == 0) {
char *p;
- const char *label;
- if (volume != NULL)
- label = libhal_volume_get_label (volume);
- else
- label = NULL;
-
- if (label != NULL) {
- /* best - use label */
- g_strlcpy (mount_point, label, sizeof (mount_point));
-
- /* TODO: use drive type */
-
- } else {
- /* fallback - use "disk" */
- g_snprintf (mount_point, sizeof (mount_point), "%s", "disk");
- }
/* sanitize computed mount point name, e.g. replace invalid chars with '-' */
p = mount_point;
--- 583,593 ----
explicit_mount_point_given = FALSE;
if (strlen (mount_point) == 0) {
char *p;
+ char *basename;
+ basename = g_path_get_basename (device);
+ g_strlcpy (mount_point, basename, sizeof (mount_point));
+ g_free (basename);
/* sanitize computed mount point name, e.g. replace invalid chars with '-' */
p = mount_point;
More information about the freebsd-gnome
mailing list