From 77d8dde366bf8b6ea912f45b256b4798e26a267e Mon Sep 17 00:00:00 2001
From: markd <markd>
Date: Mon, 26 Apr 2004 11:24:15 +0000
Subject: statfs -> statvfs in current. Patch from John R. Shannon in PR 25324
 with suggestion from Christos Zoulas

---
 x11/kdelibs3/distinfo         |  4 +++-
 x11/kdelibs3/patches/patch-af | 16 ++++++++++++++++
 x11/kdelibs3/patches/patch-ag | 28 ++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 x11/kdelibs3/patches/patch-af
 create mode 100644 x11/kdelibs3/patches/patch-ag

(limited to 'x11/kdelibs3')

diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index 8f6ba06e403..aca136e7cdf 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.35 2004/04/21 13:23:57 markd Exp $
+$NetBSD: distinfo,v 1.36 2004/04/26 11:24:15 markd Exp $
 
 SHA1 (kdelibs-3.2.2.tar.bz2) = 74899bccba17b1d6475cc1b154a03d462ef02e1f
 Size (kdelibs-3.2.2.tar.bz2) = 12716460 bytes
@@ -6,6 +6,8 @@ SHA1 (patch-aa) = be278f29b743c573b71c7804eff26324e78ed779
 SHA1 (patch-ab) = 1ebea4ea8b38f26e90f217ca7c3c209148b9e282
 SHA1 (patch-ad) = fc3a7b173dc93bad196fff3ddd9aef65c92dda64
 SHA1 (patch-ae) = 238f16203cd101a5944ff01aa965956392c5b16d
+SHA1 (patch-af) = 7fbb3abcbf56020e3827ddf9d056beab9d1f3cd7
+SHA1 (patch-ag) = e471fdf5428e0f515ef3fe5427622854886ef952
 SHA1 (patch-an) = 41d2721bd55d060cde630771dad0377dbe770d73
 SHA1 (patch-bc) = 434a48d290aa9716b8c6e372419460ebd33cf8ea
 SHA1 (patch-bd) = f233a73d0a8148e1ae7f4e777c3f5d50b56d768f
diff --git a/x11/kdelibs3/patches/patch-af b/x11/kdelibs3/patches/patch-af
new file mode 100644
index 00000000000..53874ab7f16
--- /dev/null
+++ b/x11/kdelibs3/patches/patch-af
@@ -0,0 +1,16 @@
+$NetBSD: patch-af,v 1.6 2004/04/26 11:24:15 markd Exp $
+
+--- kdecore/kmountpoint.cpp.orig	2003-09-21 20:39:00.000000000 +1200
++++ kdecore/kmountpoint.cpp
+@@ -219,7 +219,11 @@ KMountPoint::List KMountPoint::currentMo
+ 
+ #ifdef HAVE_GETMNTINFO
+ 
++#ifdef ST_RDONLY
++    struct statvfs *mounted;
++#else
+     struct statfs *mounted;
++#endif
+ 
+     int num_fs = getmntinfo(&mounted, MNT_NOWAIT);
+ 
diff --git a/x11/kdelibs3/patches/patch-ag b/x11/kdelibs3/patches/patch-ag
new file mode 100644
index 00000000000..144e151e565
--- /dev/null
+++ b/x11/kdelibs3/patches/patch-ag
@@ -0,0 +1,28 @@
+$NetBSD: patch-ag,v 1.8 2004/04/26 11:24:15 markd Exp $
+
+--- kio/kio/global.cpp.orig	2004-04-04 21:08:52.000000000 +1200
++++ kio/kio/global.cpp
+@@ -1390,7 +1390,11 @@ QString KIO::findDeviceMountPoint( const
+ 
+ #ifdef HAVE_GETMNTINFO
+ 
++#ifdef ST_RDONLY
++    struct statvfs *mounted;
++#else
+     struct statfs *mounted;
++#endif
+ 
+     int num_fs = getmntinfo(&mounted, MNT_NOWAIT);
+ 
+@@ -1656,7 +1660,11 @@ static QString get_mount_info(const QStr
+ 
+ #ifdef HAVE_GETMNTINFO
+ 
++#ifdef ST_RDONLY
++    struct statvfs *mounted;
++#else
+     struct statfs *mounted;
++#endif
+     char    realpath_buffer[MAXPATHLEN];
+ 
+     int num_fs = getmntinfo(&mounted, MNT_NOWAIT);
-- 
cgit v1.2.3