From 658cf98492439c7a918d1b1aa2235a38e1f57623 Mon Sep 17 00:00:00 2001
From: maya <maya>
Date: Wed, 26 Apr 2017 12:10:43 +0000
Subject: hal: help RHEL7 builds along by including <stddef.h> for size_t used
 by another header, scsi/sg.h.

Blind fix.
---
 sysutils/hal/distinfo                                     |  4 ++--
 .../hal/patches/patch-hald_linux_addons_addon-storage.c   | 15 +++++++++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

(limited to 'sysutils')

diff --git a/sysutils/hal/distinfo b/sysutils/hal/distinfo
index ba7da3c8e57..041d9b2cb92 100644
--- a/sysutils/hal/distinfo
+++ b/sysutils/hal/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2017/01/17 15:25:27 wiz Exp $
+$NetBSD: distinfo,v 1.28 2017/04/26 12:10:43 maya Exp $
 
 SHA1 (hal-0.5.14.tar.bz2) = a6ec098d78112e18e2773afa5f9ed642b00c4c59
 RMD160 (hal-0.5.14.tar.bz2) = 0314dace9512bf49a62bd1556963fc60a6c9caf9
@@ -43,7 +43,7 @@ SHA1 (patch-hald_linux_addons_addon-leds.c) = e56747b39bf5e6e03286fedcb73ef226c0
 SHA1 (patch-hald_linux_addons_addon-macbookpro-backlight.c) = c508a7b9070c319679b8b8e715d29410957ba41a
 SHA1 (patch-hald_linux_addons_addon-omap-backlight.c) = 72ba398a1d661fb726778bf7df7460735fee988f
 SHA1 (patch-hald_linux_addons_addon-rfkill-killswitch.c) = 800fac10408b65b12cd644b93b8612c8b2970da0
-SHA1 (patch-hald_linux_addons_addon-storage.c) = 9949c8768395295f27aebc792b8b8091e988d2d9
+SHA1 (patch-hald_linux_addons_addon-storage.c) = 27c07d3a499aa9fa37938ff3f918dc01c625b5fd
 SHA1 (patch-hald_linux_addons_addon-usb-csr.c) = 34b5be5ff308f9aafcf505b303d36cbc2483d015
 SHA1 (patch-hald_netbsd_devinfo__mass.c) = be1c7bf311e21e9891199d67c0ebf87978bd735f
 SHA1 (patch-na) = 2786db8149a55dbd5ea11419d789f420bac1993c
diff --git a/sysutils/hal/patches/patch-hald_linux_addons_addon-storage.c b/sysutils/hal/patches/patch-hald_linux_addons_addon-storage.c
index c6a82688148..fc9ec083e05 100644
--- a/sysutils/hal/patches/patch-hald_linux_addons_addon-storage.c
+++ b/sysutils/hal/patches/patch-hald_linux_addons_addon-storage.c
@@ -1,8 +1,19 @@
-$NetBSD: patch-hald_linux_addons_addon-storage.c,v 1.1 2012/05/14 03:12:01 sbd Exp $
+$NetBSD: patch-hald_linux_addons_addon-storage.c,v 1.2 2017/04/26 12:10:43 maya Exp $
+
+include stddef.h for size_t used in scsi/sg.h
+glib2 now only allows glib.h to be included
 
 --- hald/linux/addons/addon-storage.c.orig	2009-08-24 12:42:30.000000000 +0000
 +++ hald/linux/addons/addon-storage.c
-@@ -39,7 +39,7 @@
+@@ -32,6 +32,7 @@
+ #include <linux/cdrom.h>
+ #include <linux/fs.h>
+ #include <mntent.h>
++#include <stddef.h>
+ #include <scsi/sg.h>
+ #include <stdint.h>
+ #include <stdio.h>
+@@ -39,7 +40,7 @@
  #include <string.h>
  #include <sys/ioctl.h>
  #include <unistd.h>
-- 
cgit v1.2.3