[arch-commits] Commit in hal/repos (3 files)

[Jan de Groot]

    Date: Thursday, May 1, 2008 @ 10:53:47
  Author: jgc
Revision: 1156

Merged revisions 70-1155 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/hal/trunk

........
  r356 | aaron | 2008-04-18 22:56:27 +0000 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r514 | jgc | 2008-04-20 12:48:38 +0000 (Sun, 20 Apr 2008) | 1 line
  
  upgpkg: hal 0.5.11rc2-2
........
  r1155 | jgc | 2008-05-01 14:52:29 +0000 (Thu, 01 May 2008) | 2 lines
  
  Add missing patch
........

Added:
  hal/repos/extra-x86_64/addon-input-nval.patch
    (from rev 1155, hal/trunk/addon-input-nval.patch)
Modified:
  hal/repos/extra-x86_64/	(properties)
  hal/repos/extra-x86_64/PKGBUILD

------------------------+
 PKGBUILD               |    5 ++++-
 addon-input-nval.patch |   20 ++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)


Property changes on: hal/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /hal/trunk:1-69
   + /hal/trunk:1-1155

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-05-01 14:52:29 UTC (rev 1155)
+++ extra-x86_64/PKGBUILD	2008-05-01 14:53:47 UTC (rev 1156)
@@ -4,7 +4,7 @@
 
 pkgname=hal
 pkgver=0.5.11rc2
-pkgrel=1
+pkgrel=2
 pkgdesc="Hardware Abstraction Layer"
 arch=(i686 x86_64)
 license=('GPL' 'custom')
@@ -14,12 +14,14 @@
 options=('!libtool')
 install=hal.install
 source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
+	addon-input-nval.patch
 	hal
 	hal-policy.patch
 	cryptsetup_location.patch
 	hal-0.5.9-hide-diagnostic.patch
 	ntfs3g-valid-options.patch)
 md5sums=('ade962044a62e8f2dc4625a17f4a5c7e'
+	 '272755ed2004cfc362ffcf98167a4ef9'
          '882f67668cb14a0a9e4a27ef22278027'
          '5ba8b610aa9763a5f42b9f7cbd7a86ad'
          'c688a3c6574699365926f4fef7441545'
@@ -31,6 +33,7 @@
   patch -Np1 -i ${startdir}/src/cryptsetup_location.patch || return 1
   patch -Np1 -i ${startdir}/src/hal-0.5.9-hide-diagnostic.patch || return 1
   patch -Np0 -i ${startdir}/src/ntfs3g-valid-options.patch || return 1
+  patch -Np0 -i ${startdir}/src/addon-input-nval.patch || return 1
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
               --libexecdir=/usr/lib/hal --enable-static=no \

Copied: hal/repos/extra-x86_64/addon-input-nval.patch (from rev 1155, hal/trunk/addon-input-nval.patch)
===================================================================
--- extra-x86_64/addon-input-nval.patch	                        (rev 0)
+++ extra-x86_64/addon-input-nval.patch	2008-05-01 14:53:47 UTC (rev 1156)
@@ -0,0 +1,20 @@
+--- hald/linux/addons/addon-input.c.old	2008-04-18 17:11:59.000000000 -0400
++++ hald/linux/addons/addon-input.c	2008-04-18 17:12:12.000000000 -0400
+@@ -210,7 +210,7 @@
+ 	GError *gerror = NULL;
+ 	gsize read_bytes;
+ 
+-	if (condition & (G_IO_HUP | G_IO_ERR))
++	if (condition & (G_IO_HUP | G_IO_ERR | G_IO_NVAL))
+ 		return FALSE;
+ 
+ 	/** tbh, we can probably assume every time we read we have a whole
+@@ -383,7 +383,7 @@
+ 
+ 	g_hash_table_insert (inputs, g_strdup(udi), channel);
+ 	g_io_add_watch_full (channel,
+-			     G_PRIORITY_DEFAULT, G_IO_IN | G_IO_ERR | G_IO_HUP,
++			     G_PRIORITY_DEFAULT, G_IO_IN | G_IO_ERR | G_IO_HUP | G_IO_NVAL,
+ 			     event_io, data, (GDestroyNotify) destroy_data);
+ }
+