Attachment 127855 Details for Bug 171727 – file.diff

[patch] file.diff

file.diff (text/plain), 2.31 KB, created by Alberto Villa on 2012-09-18 02:40:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alberto Villa

Created: 2012-09-18 02:40:05 UTC

Size: 2.31 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 304374)
>+++ Makefile	(working copy)
>@@ -8,7 +8,7 @@
> 
> PORTNAME=	hal
> DISTVERSION=	0.5.14
>-PORTREVISION=	19
>+PORTREVISION=	20
> CATEGORIES=	sysutils
> MASTER_SITES=	http://hal.freedesktop.org/releases/
> 
>@@ -19,7 +19,8 @@
> LIB_DEPENDS=	polkit.2:${PORTSDIR}/sysutils/policykit \
> 		volume_id.0:${PORTSDIR}/devel/libvolume_id \
> 		ck-connector.0:${PORTSDIR}/sysutils/consolekit
>-RUN_DEPENDS=	${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids
>+RUN_DEPENDS=	${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids \
>+		${LOCALBASE}/share/hal/fdi/information/10freedesktop/30-keymap-misc.fdi:${PORTSDIR}/sysutils/hal-info
> 
> USE_GETTEXT=	yes
> USE_GMAKE=	yes
>--- hald/freebsd/hf-drm.c.orig	2012-09-12 01:45:35.665050510 +0200
>+++ hald/freebsd/hf-drm.c	2012-09-12 01:25:28.125106626 +0200
>@@ -234,6 +234,12 @@
>   {
>     HalDevice *parent = HAL_DEVICE(l->data);
> 
>+    if (hf_device_store_match(hald_get_gdl(),
>+			      "info.parent", HAL_PROPERTY_TYPE_STRING, hal_device_get_udi(parent),
>+			      "info.subsystem", HAL_PROPERTY_TYPE_STRING, "drm",
>+			      NULL))
>+      continue;
>+
>     if (! hal_device_property_get_bool(parent, "info.ignore"))
>       {
>         Card *card;
>--- hald/freebsd/probing/probe-storage.c.orig	2012-09-12 01:46:34.554977683 +0200
>+++ hald/freebsd/probing/probe-storage.c	2012-09-12 01:38:45.000000000 +0200
>@@ -236,7 +236,27 @@
> 
>       hfp_cdrom_free(cdrom);
>     }
>-  else if (! has_children) /* by definition, if it has children it has no fs */
>+  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;
> 
>@@ -249,6 +269,7 @@
> 
>       volume_id_close(vid);
>     }
>+    }
> 
>  end:
>   return ret;

Actions: View | Diff

Attachments on bug 171727: 127855