Attachment #127855 for bug #171727

View | Details | Raw Unified | Return to bug 171727
Collapse All | Expand All

Lines 8-14 Link Here

(-)Makefile (-2 / +3 lines)
8		8
9	PORTNAME= hal	9	PORTNAME= hal
10	DISTVERSION= 0.5.14	10	DISTVERSION= 0.5.14
11	PORTREVISION= 19	11	PORTREVISION= 20
12	CATEGORIES= sysutils	12	CATEGORIES= sysutils
13	MASTER_SITES= http://hal.freedesktop.org/releases/	13	MASTER_SITES= http://hal.freedesktop.org/releases/
14		14
Lines 19-25 Link Here
19	LIB_DEPENDS= polkit.2:${PORTSDIR}/sysutils/policykit \	19	LIB_DEPENDS= polkit.2:${PORTSDIR}/sysutils/policykit \
20	volume_id.0:${PORTSDIR}/devel/libvolume_id \	20	volume_id.0:${PORTSDIR}/devel/libvolume_id \
21	ck-connector.0:${PORTSDIR}/sysutils/consolekit	21	ck-connector.0:${PORTSDIR}/sysutils/consolekit
22	RUN_DEPENDS= ${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids	22	RUN_DEPENDS= ${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids \
		23	${LOCALBASE}/share/hal/fdi/information/10freedesktop/30-keymap-misc.fdi:${PORTSDIR}/sysutils/hal-info
23		24
24	USE_GETTEXT= yes	25	USE_GETTEXT= yes
25	USE_GMAKE= yes	26	USE_GMAKE= yes

Lines 234-239 Link Here

(-)hald/freebsd/hf-drm.c (+6 lines)
234	{	234	{
235	HalDevice *parent = HAL_DEVICE(l->data);	235	HalDevice *parent = HAL_DEVICE(l->data);
236		236
		237	if (hf_device_store_match(hald_get_gdl(),
		238	"info.parent", HAL_PROPERTY_TYPE_STRING, hal_device_get_udi(parent),
		239	"info.subsystem", HAL_PROPERTY_TYPE_STRING, "drm",
		240	NULL))
		241	continue;
		242
237	if (! hal_device_property_get_bool(parent, "info.ignore"))	243	if (! hal_device_property_get_bool(parent, "info.ignore"))
238	{	244	{
239	Card *card;	245	Card *card;





      hfp_cdrom_free(cdrom);
    }
  else
    {
      int fd;
      off_t size;

      fd = open(device_file, O_RDONLY | O_NONBLOCK);
      if (fd > -1)
	{
	  libhal_device_set_property_bool(hfp_ctx, hfp_udi, "storage.removable.media_available", TRUE, &hfp_error);
	  if (ioctl (fd, DIOCGMEDIASIZE, &size) == 0)
	    {
	      libhal_device_set_property_uint64(hfp_ctx, hfp_udi, "storage.removable.media_size", size, &hfp_error);
	    }
	  close(fd);
	}
      else
	{
	  libhal_device_set_property_bool(hfp_ctx, hfp_udi, "storage.removable.media_available", FALSE, &hfp_error);
	}

      if (! has_children) /* by definition, if it has children it has no fs */
    {
      struct volume_id *vid;



      volume_id_close(vid);
    }
    }

 end:
  return ret;

Return to bug 171727

Lines 236-242 Link Here

(-)hald/freebsd/probing/probe-storage.c (-1 / +22 lines)
236		236
237	hfp_cdrom_free(cdrom);	237	hfp_cdrom_free(cdrom);
238	}	238	}
239	else if (! has_children) /* by definition, if it has children it has no fs */	239	else
		240	{
		241	int fd;
		242	off_t size;
		243
		244	fd = open(device_file, O_RDONLY \| O_NONBLOCK);
		245	if (fd > -1)
		246	{
		247	libhal_device_set_property_bool(hfp_ctx, hfp_udi, "storage.removable.media_available", TRUE, &hfp_error);
		248	if (ioctl (fd, DIOCGMEDIASIZE, &size) == 0)
		249	{
		250	libhal_device_set_property_uint64(hfp_ctx, hfp_udi, "storage.removable.media_size", size, &hfp_error);
		251	}
		252	close(fd);
		253	}
		254	else
		255	{
		256	libhal_device_set_property_bool(hfp_ctx, hfp_udi, "storage.removable.media_available", FALSE, &hfp_error);
		257	}
		258
		259	if (! has_children) /* by definition, if it has children it has no fs */
240	{	260	{
241	struct volume_id *vid;	261	struct volume_id *vid;
242		262
Lines 249-254 Link Here
249		269
250	volume_id_close(vid);	270	volume_id_close(vid);
251	}	271	}
		272	}
252		273
253	end:	274	end:
254	return ret;	275	return ret;