From d19e8461ced6a4705e0bdfb185cebb15dfe23d57 Mon Sep 17 00:00:00 2001
From: markd <markd@pkgsrc.org>
Date: Thu, 28 Nov 2002 03:36:42 +0000
Subject: ioctl APM_IOC_GETPOWER has changed between 1.5 and 1.6, so we need to
 set batteryid (or clear apm_power_info structure) before calling it.  From PR
 18447 by Takeshi Nakayama.

---
 misc/kdeutils2/distinfo         |  4 ++--
 misc/kdeutils2/patches/patch-ai | 11 +++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'misc')

diff --git a/misc/kdeutils2/distinfo b/misc/kdeutils2/distinfo
index 6b6bf3115b1..30649b001e3 100644
--- a/misc/kdeutils2/distinfo
+++ b/misc/kdeutils2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2001/12/07 14:07:27 skrll Exp $
+$NetBSD: distinfo,v 1.8 2002/11/28 03:36:42 markd Exp $
 
 SHA1 (kdeutils-2.2.2.tar.bz2) = 3cd4ef2fbe4cf04a9fecc54ab6863f687ee1ae83
 Size (kdeutils-2.2.2.tar.bz2) = 1466910 bytes
@@ -10,4 +10,4 @@ SHA1 (patch-ae) = 8c5fc5eb276d79ef96b373ee8f014e586416fc3d
 SHA1 (patch-af) = 75cf91c960fe26cc977e47ba5292609ba0d7aac0
 SHA1 (patch-ag) = d494f9459b903cb1a49633741643b705ae15386a
 SHA1 (patch-ah) = 8a9608147abc72a000f79c4b94402bf57b56ce6f
-SHA1 (patch-ai) = 5597b771e15b21ff678c1b2fce29be893ad6dedf
+SHA1 (patch-ai) = 4608e652bf8d34d1ae7fa90c07d41f691ec7032f
diff --git a/misc/kdeutils2/patches/patch-ai b/misc/kdeutils2/patches/patch-ai
index 35039d996f2..521a163361d 100644
--- a/misc/kdeutils2/patches/patch-ai
+++ b/misc/kdeutils2/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.3 2001/12/03 15:37:15 skrll Exp $
+$NetBSD: patch-ai,v 1.4 2002/11/28 03:36:43 markd Exp $
 
---- klaptopdaemon/portable.cpp.orig	Sun Feb 18 15:31:14 2001
-+++ klaptopdaemon/portable.cpp
-@@ -658,6 +658,238 @@
+--- klaptopdaemon/portable.cpp.orig	Wed May 16 11:16:35 2001
++++ klaptopdaemon/portable.cpp	Mon Sep 16 14:45:41 2002
+@@ -658,6 +658,241 @@
  {
  	return(1);
  }
@@ -41,6 +41,7 @@ $NetBSD: patch-ai,v 1.3 2001/12/03 15:37:15 skrll Exp $
 +	}
 +
 +	struct apm_power_info info;
++	memset(&info, 0, sizeof(info));
 +	ret=ioctl(fd, APM_IOC_GETPOWER, &info);
 +	::close(fd);
 +
@@ -62,6 +63,7 @@ $NetBSD: patch-ai,v 1.3 2001/12/03 15:37:15 skrll Exp $
 +	  return 0;
 +
 +	struct apm_power_info info;
++	memset(&info, 0, sizeof(info));
 +	ret=ioctl(fd, APM_IOC_GETPOWER, &info);
 +	::close(fd);
 +
@@ -212,6 +214,7 @@ $NetBSD: patch-ai,v 1.3 2001/12/03 15:37:15 skrll Exp $
 +         	goto bad;
 +
 +       	struct apm_power_info info;
++	memset(&info, 0, sizeof(info));
 +       	ret=ioctl(fd, APM_IOC_GETPOWER, &info);
 +       	::close(fd);
 +	
-- 
cgit v1.2.3