From 25474731a025c076f20a580fad7c568335b76758 Mon Sep 17 00:00:00 2001 From: skrll Date: Tue, 20 Aug 2002 18:48:33 +0000 Subject: Avoid namespace collision on errno. This should now build again. --- sysutils/kdf/distinfo | 5 ++++- sysutils/kdf/patches/patch-ac | 13 +++++++++++++ sysutils/kdf/patches/patch-ad | 16 ++++++++++++++++ sysutils/kdf/patches/patch-ae | 13 +++++++++++++ 4 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 sysutils/kdf/patches/patch-ac create mode 100644 sysutils/kdf/patches/patch-ad create mode 100644 sysutils/kdf/patches/patch-ae (limited to 'sysutils/kdf') diff --git a/sysutils/kdf/distinfo b/sysutils/kdf/distinfo index 83550f8633c..86241876ebf 100644 --- a/sysutils/kdf/distinfo +++ b/sysutils/kdf/distinfo @@ -1,6 +1,9 @@ -$NetBSD: distinfo,v 1.2 2001/04/19 11:29:04 agc Exp $ +$NetBSD: distinfo,v 1.3 2002/08/20 18:48:33 skrll Exp $ SHA1 (kdf-0.5.1.tgz) = 66f8fa8fde7ec9984e1c89d041df8a543ad06a74 Size (kdf-0.5.1.tgz) = 193989 bytes SHA1 (patch-aa) = 5e1e76aa521c92ae80368a36940813ef1f184f67 SHA1 (patch-ab) = 8f7fa93665371eda1448317cd12db2e68c49034e +SHA1 (patch-ac) = 297143df78c6939b6ed1f752b44d49e0415d64af +SHA1 (patch-ad) = bc98f04ee70b716209805a4c4af62157dc6a9e6b +SHA1 (patch-ae) = 8a97c64ee1916149b80c390877c1379e3997d62f diff --git a/sysutils/kdf/patches/patch-ac b/sysutils/kdf/patches/patch-ac new file mode 100644 index 00000000000..b6a3e1d0bd2 --- /dev/null +++ b/sysutils/kdf/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.1 2002/08/20 18:48:34 skrll Exp $ + +--- kdf/disks.h.orig Tue Aug 20 20:44:18 2002 ++++ kdf/disks.h +@@ -80,7 +80,7 @@ public: + float percentFull() const; + + signals: +- void sysCallError(DiskEntry *disk, int errno); ++ void sysCallError(DiskEntry *disk, int syscall_errno); + void deviceNameChanged(); + void mountPointChanged(); + void mountOptionsChanged(); diff --git a/sysutils/kdf/patches/patch-ad b/sysutils/kdf/patches/patch-ad new file mode 100644 index 00000000000..28ee5c9beea --- /dev/null +++ b/sysutils/kdf/patches/patch-ad @@ -0,0 +1,16 @@ +$NetBSD: patch-ad,v 1.1 2002/08/20 18:48:35 skrll Exp $ + +--- kdf/kwikdisk.cpp.orig Sun Mar 21 14:59:50 1999 ++++ kdf/kwikdisk.cpp +@@ -221,9 +221,9 @@ void DockWidget::mousePressEvent(QMouseE + updateDF(); + }; + +-void DockWidget::sysCallError(DiskEntry *disk, int errno) ++void DockWidget::sysCallError(DiskEntry *disk, int syscall_errno) + { +- if (errno!=0) ++ if (syscall_errno!=0) + KMsgBox::message(this,klocale->translate("KwikDisk"), + disk->lastSysError(),KMsgBox::STOP); + }; diff --git a/sysutils/kdf/patches/patch-ae b/sysutils/kdf/patches/patch-ae new file mode 100644 index 00000000000..489251100f9 --- /dev/null +++ b/sysutils/kdf/patches/patch-ae @@ -0,0 +1,13 @@ +$NetBSD: patch-ae,v 1.1 2002/08/20 18:48:35 skrll Exp $ + +--- kdf/kwikdisk.h.orig Sun Mar 21 14:51:24 1999 ++++ kdf/kwikdisk.h +@@ -99,7 +99,7 @@ private slots: + void updateDF(); + void updateDFDone(); + void setUpdateFreq(int freq); +- void sysCallError(DiskEntry *disk, int errno); ++ void sysCallError(DiskEntry *disk, int syscall_errno); + + protected: + void mousePressEvent(QMouseEvent *); -- cgit v1.2.3