Workaround for compilation problems on Solaris/gcc.

23 files changed, 304 insertions, 14 deletions

diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo
index 342dbfb7309..2abffff7d45 100644
--- a/x11/kdebase3/distinfo
+++ b/x11/kdebase3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.56 2004/10/13 11:54:11 markd Exp $
+$NetBSD: distinfo,v 1.57 2004/11/01 16:39:06 gavan Exp $
 
 SHA1 (kdebase-3.3.1.tar.bz2) = b3eafb32553ab621569301bb7628a5063a497dcf
 Size (kdebase-3.3.1.tar.bz2) = 19906317 bytes
@@ -10,12 +10,12 @@ SHA1 (patch-aa) = fcb678ef0112e2d39f2d7ced126c88f2862b3351
 SHA1 (patch-ab) = 453c1b09d7c0b78f058fd34c1040830257b2904d
 SHA1 (patch-ac) = 8be0f15be839f4f01d3e079501b83e27f1fab2eb
 SHA1 (patch-ad) = 031e5622acb376ce1867d08b35c55bce101e8855
-SHA1 (patch-ae) = bea53dcd5c8e7d1670de293e131befb5d6db78b5
+SHA1 (patch-ae) = 5e3e097598874a87719074370eb11851e1ce5f36
 SHA1 (patch-af) = ad9b3a97151c964d4adea2d8fecd780c6198b205
 SHA1 (patch-ag) = 89f50ee8b328cd654aebf1da5424e87eb6b42628
 SHA1 (patch-aj) = 2a0b38f4968bfca00e56ef4a6e06bfc3a874ae33
 SHA1 (patch-ak) = df7ff2bf5ed6bb2442d49df1c277712712a7f966
-SHA1 (patch-bb) = 1b6c717a1bedafbeae0037ee382795d8aa59f081
+SHA1 (patch-bb) = d4d352c9fb24792a2e5931ee9c5131cd735cec21
 SHA1 (patch-bc) = c236cc8b3f9caebf2540425232f2d90ec66c70d1
 SHA1 (patch-bx) = d58d16fd484fc0a46c1ae93267af19e73af6f990
 SHA1 (patch-ep) = 10e341753321415043b08cad0494a269f8d19643
@@ -28,4 +28,23 @@ SHA1 (patch-fc) = 8bdc76aa9c34e270de2fba14213db0c179c5cd31
 SHA1 (patch-fd) = 879a072170b5a38ae80d6854540ab1dae5f59bfc
 SHA1 (patch-fe) = 3da89e7228d5246e98a244d7f52d9052c3dbcfa2
 SHA1 (patch-ff) = a027ccd5f578d41560e970aa54fca9b5760da0ac
-SHA1 (patch-fg) = 31219a3d9b45f143dc76ffebd75bbb9b140fcdfa
+SHA1 (patch-fg) = 94cdd68ddeb14655b40b42f37ad263097ea4d195
+SHA1 (patch-fh) = 1d06d8f8f5fa00cca5c5aad74c9d1a27f2d1565c
+SHA1 (patch-fi) = 6bf3eec107f8c4ae9d82c05e84f5db0998536364
+SHA1 (patch-fj) = b7bdf2c069d6bd66af733ce6866295487ac716d3
+SHA1 (patch-fk) = b315f3338fcb2f960c4fa9daa00d80fbdbfb67a7
+SHA1 (patch-fl) = 7a51ca1c9b20b8dbab4437427812d9fda6a454d8
+SHA1 (patch-fm) = 9727089bbf03382ecd5d2fe5fa7d6c7ee7d1f765
+SHA1 (patch-fn) = 374ada59e17e881620f8673be6e15c8a3cbf9eea
+SHA1 (patch-fo) = 927622a2200c2cb07e73e5e1e596a1fe66e50af4
+SHA1 (patch-fp) = de7c6445500053146ec4b464b3a4f07bf3cb9225
+SHA1 (patch-fq) = 4fa1c71a501808e28685cf4ea37ec11019e74e2a
+SHA1 (patch-fr) = 886c854a662157b500a85b99b9e0e61b2dcd1bf3
+SHA1 (patch-fs) = c4e130bef6cc202e12c9ebcf2b571ede0e0a34eb
+SHA1 (patch-ft) = 673763fa1329d943e32b0612262cde906c839ba7
+SHA1 (patch-fu) = 4765f271a7b5636cca4b94c8b261c55a76f8bf8c
+SHA1 (patch-fv) = 8ec683f004e0e432b3820cbe8660f1d547d71fb6
+SHA1 (patch-fw) = bf0b590b6d416cfccbaed5dca4174002462db1ed
+SHA1 (patch-fx) = 95451a2c5c614d5e1ff4799991b2e2dc11eada0f
+SHA1 (patch-fy) = cf91cc7a5fe14bdfb38e4ca3ad4d82ffba86a05e
+SHA1 (patch-fz) = 49dcc3508edf4deccadce5ff788b424bb0fc6d78
diff --git a/x11/kdebase3/patches/patch-ae b/x11/kdebase3/patches/patch-ae
index 83169f2994a..404a0a09079 100644
--- a/x11/kdebase3/patches/patch-ae
+++ b/x11/kdebase3/patches/patch-ae
@@ -1,8 +1,17 @@
-$NetBSD: patch-ae,v 1.6 2004/06/10 11:51:52 markd Exp $
+$NetBSD: patch-ae,v 1.7 2004/11/01 16:39:06 gavan Exp $
 
---- kcontrol/krdb/krdb.cpp.orig	2004-04-04 19:42:18.000000000 +1200
+--- kcontrol/krdb/krdb.cpp.orig	2004-07-17 18:52:04.000000000 +0100
 +++ kcontrol/krdb/krdb.cpp
-@@ -384,7 +384,14 @@ static void createGtkrc( bool exportColo
+@@ -42,6 +42,8 @@
+ 
+ #include <X11/Xlib.h>
+ 
++#undef truncate
++
+ inline const char * gtkEnvVar(int version)
+ {
+     return 2==version ? "GTK2_RC_FILES" : "GTK_RC_FILES";
+@@ -384,7 +386,14 @@ static void createGtkrc( bool exportColo
          // not every button, checkbox, etc.
          t << "style \"MenuItem\"" << endl;
          t << "{" << endl;
diff --git a/x11/kdebase3/patches/patch-bb b/x11/kdebase3/patches/patch-bb
index 8a3aafe244d..4c1368e09f1 100644
--- a/x11/kdebase3/patches/patch-bb
+++ b/x11/kdebase3/patches/patch-bb
@@ -1,8 +1,16 @@
-$NetBSD: patch-bb,v 1.4 2004/04/20 12:33:56 markd Exp $
+$NetBSD: patch-bb,v 1.5 2004/11/01 16:39:06 gavan Exp $
 
---- kdesktop/init.cc.orig	2004-04-04 19:42:34.000000000 +1200
+--- kdesktop/init.cc.orig	2004-05-22 21:26:46.000000000 +0100
 +++ kdesktop/init.cc
-@@ -81,6 +81,9 @@ static void copyDirectoryFile(const QStr
+@@ -33,6 +33,7 @@
+ #include <dirent.h>
+ #include <stdlib.h>
+ 
++#undef truncate
+ 
+ // for multihead
+ extern int kdesktop_screen_number;
+@@ -79,6 +80,9 @@ static void copyDirectoryFile(const QStr
      cmd += " ";
      cmd += KProcess::quote(dir+"/.directory");
      system( QFile::encodeName(cmd) );
@@ -12,7 +20,7 @@ $NetBSD: patch-bb,v 1.4 2004/04/20 12:33:56 markd Exp $
    }
  }
  
-@@ -114,6 +117,9 @@ void copyDesktopLinks()
+@@ -112,6 +116,9 @@ void copyDesktopLinks()
  	cmd += " ";
  	cmd += QFile::encodeName(KProcess::quote(desktopPath));
  	system( cmd );
diff --git a/x11/kdebase3/patches/patch-fg b/x11/kdebase3/patches/patch-fg
index 8e0b71a96b4..732d69580d3 100644
--- a/x11/kdebase3/patches/patch-fg
+++ b/x11/kdebase3/patches/patch-fg
@@ -1,8 +1,17 @@
-$NetBSD: patch-fg,v 1.2 2004/02/04 14:25:59 markd Exp $
+$NetBSD: patch-fg,v 1.3 2004/11/01 16:39:06 gavan Exp $
 
---- ksysguard/gui/ksysguard.cc.orig	2003-10-26 23:47:16.000000000 +1300
+--- ksysguard/gui/ksysguard.cc.orig	2004-08-05 19:57:19.000000000 +0100
 +++ ksysguard/gui/ksysguard.cc
-@@ -162,7 +162,7 @@ void TopLevel::resetWorkSheets()
+@@ -34,6 +34,8 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ 
++#undef open
++
+ #include <kaboutdata.h>
+ #include <kaction.h>
+ #include <kcmdlineargs.h>
+@@ -145,7 +147,7 @@ void TopLevel::resetWorkSheets()
    mWorkSpace->removeAllWorkSheets();
  
    KStandardDirs* kstd = KGlobal::dirs();
diff --git a/x11/kdebase3/patches/patch-fh b/x11/kdebase3/patches/patch-fh
new file mode 100644
index 00000000000..6e15599a3e4
--- /dev/null
+++ b/x11/kdebase3/patches/patch-fh
@@ -0,0 +1,13 @@
+$NetBSD: patch-fh,v 1.3 2004/11/01 16:39:06 gavan Exp $
+
+--- kate/app/kategrepdialog.cpp.orig	2004-10-03 08:10:53.000000000 +0100
++++ kate/app/kategrepdialog.cpp
+@@ -48,6 +48,8 @@
+ #include <kcombobox.h>
+ #include <klineedit.h>
+ 
++#undef truncate
++
+ const char *template_desc[] = {
+   "normal",
+   "assignment",
diff --git a/x11/kdebase3/patches/patch-fi b/x11/kdebase3/patches/patch-fi
new file mode 100644
index 00000000000..884d3e25059
--- /dev/null
+++ b/x11/kdebase3/patches/patch-fi
@@ -0,0 +1,13 @@
+$NetBSD: patch-fi,v 1.1 2004/11/01 16:39:06 gavan Exp $
+
+--- kcontrol/info/memory_solaris.cpp.orig	2004-05-22 21:26:41.000000000 +0100
++++ kcontrol/info/memory_solaris.cpp
+@@ -4,6 +4,8 @@
+  *  Torsten Kasch <tk@Genetik.Uni-Bielefeld.DE>
+  */
+ 
++#undef _FILE_OFFSET_BITS
++
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <kstat.h>
diff --git a/x11/kdebase3/patches/patch-fj b/x11/kdebase3/patches/patch-fj
new file mode 100644
index 00000000000..b19bddc9d2c
--- /dev/null
+++ b/x11/kdebase3/patches/patch-fj
@@ -0,0 +1,13 @@
+$NetBSD: patch-fj,v 1.1 2004/11/01 16:39:06 gavan Exp $
+
+--- kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp.orig	2004-10-03 08:10:57.000000000 +0100
++++ kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp
+@@ -29,6 +29,8 @@
+ #include <qregexp.h>
+ #include <qfile.h>
+ 
++#undef truncate
++
+ #define HOSTPORT_PATTERN "[a-zA-Z0-9][a-zA-Z0-9+-]*(?:\\:[0-9]{1,5})?(?:/\\w*)*"
+ 
+ /**
diff --git a/x11/kdebase3/patches/patch-fk b/x11/kdebase3/patches/patch-fk
new file mode 100644
index 00000000000..2c08c52af8d
--- /dev/null
+++ b/x11/kdebase3/patches/patch-fk
@@ -0,0 +1,12 @@
+$NetBSD: patch-fk,v 1.1 2004/11/01 16:39:06 gavan Exp $
+
+--- kcontrol/kfontinst/lib/GetPid.c.orig	2004-05-22 21:26:42.000000000 +0100
++++ kcontrol/kfontinst/lib/GetPid.c
+@@ -243,6 +243,7 @@ unsigned int kfi_getPid(const char *proc
+ #include <pwd.h>
+ #include <sys/resource.h>
+ #ifdef OS_Solaris
++#undef _FILE_OFFSET_BITS
+ #include <procfs.h>
+ #else
+ #include <sys/procfs.h>
diff --git a/x11/kdebase3/patches/patch-fl b/x11/kdebase3/patches/patch-fl
new file mode 100644
index 00000000000..a4eec346fc9
--- /dev/null
+++ b/x11/kdebase3/patches/patch-fl
@@ -0,0 +1,13 @@
+$NetBSD: patch-fl,v 1.1 2004/11/01 16:39:06 gavan Exp $
+
+--- kdeprint/slave/kio_print.cpp.orig	2004-05-22 21:26:46.000000000 +0100
++++ kdeprint/slave/kio_print.cpp
+@@ -46,6 +46,8 @@
+ #include <stdlib.h>
+ #include <sys/stat.h>
+ 
++#undef stat
++
+ #define	PRINT_DEBUG	kdDebug(7019) << "kio_print: "
+ 
+ extern "C"
diff --git a/x11/kdebase3/patches/patch-fm b/x11/kdebase3/patches/patch-fm
new file mode 100644
index 00000000000..f3fd50b6297
--- /dev/null
+++ b/x11/kdebase3/patches/patch-fm
@@ -0,0 +1,13 @@
+$NetBSD: patch-fm,v 1.1 2004/11/01 16:39:06 gavan Exp $
+
+--- khotkeys/shared/actions.cpp.orig	2004-07-17 18:52:06.000000000 +0100
++++ khotkeys/shared/actions.cpp
+@@ -35,6 +35,8 @@
+ 
+ #include <X11/X.h>
+ 
++#undef truncate
++
+ namespace KHotKeys
+ {
+ 
diff --git a/x11/kdebase3/patches/patch-fn b/x11/kdebase3/patches/patch-fn
new file mode 100644
index 00000000000..2b7c7be38b9
--- /dev/null
+++ b/x11/kdebase3/patches/patch-fn
@@ -0,0 +1,13 @@
+$NetBSD: patch-fn,v 1.1 2004/11/01 16:39:06 gavan Exp $
+
+--- libkonq/konq_operations.cc.orig	2004-10-03 08:11:27.000000000 +0100
++++ libkonq/konq_operations.cc
+@@ -33,6 +33,8 @@
+ #include "konq_defaults.h"
+ #include "konqbookmarkmanager.h"
+ 
++#undef stat
++
+ // For doDrop
+ #include <qdir.h>//first
+ #include <assert.h>
diff --git a/x11/kdebase3/patches/patch-fo b/x11/kdebase3/patches/patch-fo
new file mode 100644
index 00000000000..552e2ec10b2
--- /dev/null
+++ b/x11/kdebase3/patches/patch-fo
@@ -0,0 +1,13 @@
+$NetBSD: patch-fo,v 1.1 2004/11/01 16:39:06 gavan Exp $
+
+--- kioslave/man/kio_man.cpp.orig	2004-08-05 19:57:13.000000000 +0100
++++ kioslave/man/kio_man.cpp
+@@ -46,6 +46,8 @@
+ #include <kfilterbase.h>
+ #include <kfilterdev.h>
+ 
++#undef truncate
++
+ using namespace KIO;
+ 
+ MANProtocol *MANProtocol::_self = 0;
diff --git a/x11/kdebase3/patches/patch-fp b/x11/kdebase3/patches/patch-fp
new file mode 100644
index 00000000000..280bdd43ede
--- /dev/null
+++ b/x11/kdebase3/patches/patch-fp
@@ -0,0 +1,13 @@
+$NetBSD: patch-fp,v 1.1 2004/11/01 16:39:06 gavan Exp $
+
+--- kioslave/pop3/pop3.cc.orig	2004-07-17 18:52:07.000000000 +0100
++++ kioslave/pop3/pop3.cc
+@@ -59,6 +59,8 @@
+ 
+ #include "pop3.h"
+ 
++#undef truncate
++
+ #define GREETING_BUF_LEN 1024
+ #define MAX_RESPONSE_LEN 512
+ #define MAX_COMMANDS 10
diff --git a/x11/kdebase3/patches/patch-fq b/x11/kdebase3/patches/patch-fq
new file mode 100644
index 00000000000..f298d10c994
--- /dev/null
+++ b/x11/kdebase3/patches/patch-fq
@@ -0,0 +1,14 @@
+$NetBSD: patch-fq,v 1.1 2004/11/01 16:39:06 gavan Exp $
+
+--- kioslave/imap4/imap4.cc.orig	2004-07-17 18:52:07.000000000 +0100
++++ kioslave/imap4/imap4.cc
+@@ -71,6 +71,9 @@
+ #include <kio/passdlg.h>
+ #include <klocale.h>
+ 
++#undef truncate
++#undef stat
++
+ using namespace KIO;
+ 
+ extern "C"
diff --git a/x11/kdebase3/patches/patch-fr b/x11/kdebase3/patches/patch-fr
new file mode 100644
index 00000000000..6ca5bb9f857
--- /dev/null
+++ b/x11/kdebase3/patches/patch-fr
@@ -0,0 +1,12 @@
+$NetBSD: patch-fr,v 1.1 2004/11/01 16:39:06 gavan Exp $
+
+--- kmenuedit/menufile.cpp.orig	2004-07-17 18:52:07.000000000 +0100
++++ kmenuedit/menufile.cpp
+@@ -27,6 +27,7 @@
+ 
+ #include "menufile.h"
+ 
++#undef truncate
+ 
+ #define MF_MENU		"Menu"
+ #define MF_PUBLIC_ID	"-//freedesktop//DTD Menu 1.0//EN"
diff --git a/x11/kdebase3/patches/patch-fs b/x11/kdebase3/patches/patch-fs
new file mode 100644
index 00000000000..bb28cfaffb1
--- /dev/null
+++ b/x11/kdebase3/patches/patch-fs
@@ -0,0 +1,13 @@
+$NetBSD: patch-fs,v 1.1 2004/11/01 16:39:06 gavan Exp $
+
+--- kmenuedit/treeview.cpp.orig	2004-07-17 18:52:07.000000000 +0100
++++ kmenuedit/treeview.cpp
+@@ -21,6 +21,8 @@
+ 
+ #include <unistd.h>
+ 
++#undef truncate
++
+ #include <qcstring.h>
+ #include <qcursor.h>
+ #include <qdatastream.h>
diff --git a/x11/kdebase3/patches/patch-ft b/x11/kdebase3/patches/patch-ft
new file mode 100644
index 00000000000..8ed9be6db53
--- /dev/null
+++ b/x11/kdebase3/patches/patch-ft
@@ -0,0 +1,13 @@
+$NetBSD: patch-ft,v 1.1 2004/11/01 16:39:06 gavan Exp $
+
+--- konsole/konsole/session.cpp.orig	2004-05-22 21:26:55.000000000 +0100
++++ konsole/konsole/session.cpp
+@@ -14,6 +14,8 @@
+ #include <qregexp.h>
+ #include <qtextedit.h>
+ 
++#undef truncate
++
+ #ifndef HERE
+ #define HERE fprintf(stderr,"%s(%d): here\n",__FILE__,__LINE__)
+ #endif
diff --git a/x11/kdebase3/patches/patch-fu b/x11/kdebase3/patches/patch-fu
new file mode 100644
index 00000000000..183fcc192b6
--- /dev/null
+++ b/x11/kdebase3/patches/patch-fu
@@ -0,0 +1,13 @@
+$NetBSD: patch-fu,v 1.1 2004/11/01 16:39:06 gavan Exp $
+
+--- konsole/konsole/konsole.cpp.orig	2004-10-03 08:11:17.000000000 +0100
++++ konsole/konsole/konsole.cpp
+@@ -3761,6 +3761,8 @@ void Konsole::slotFindDone()
+   m_finddialog->hide();
+ }
+ 
++#undef open
++
+ void Konsole::slotSaveHistory()
+ {
+   KURL url = KFileDialog::getSaveURL(QString::null, QString::null, 0L, i18n("Save History"));
diff --git a/x11/kdebase3/patches/patch-fv b/x11/kdebase3/patches/patch-fv
new file mode 100644
index 00000000000..dcc879c8a96
--- /dev/null
+++ b/x11/kdebase3/patches/patch-fv
@@ -0,0 +1,13 @@
+$NetBSD: patch-fv,v 1.1 2004/11/01 16:39:06 gavan Exp $
+
+--- kpersonalizer/kcountrypage.cpp.orig	2004-07-17 18:52:08.000000000 +0100
++++ kpersonalizer/kcountrypage.cpp
+@@ -33,6 +33,8 @@
+ 
+ #include "kcountrypage.h"
+ 
++#undef truncate
++
+ KCountryPage::KCountryPage(QWidget *parent, const char *name ) : KCountryPageDlg(parent,name) {
+ 
+ 	px_introSidebar->setPixmap(UserIcon("step1.png"));
diff --git a/x11/kdebase3/patches/patch-fw b/x11/kdebase3/patches/patch-fw
new file mode 100644
index 00000000000..aad89db0033
--- /dev/null
+++ b/x11/kdebase3/patches/patch-fw
@@ -0,0 +1,13 @@
+$NetBSD: patch-fw,v 1.1 2004/11/01 16:39:06 gavan Exp $
+
+--- ksysguard/ksysguardd/Solaris/Memory.c.orig	2004-05-22 21:26:59.000000000 +0100
++++ ksysguard/ksysguardd/Solaris/Memory.c
+@@ -20,6 +20,8 @@
+ 
+ */
+ 
++#undef _FILE_OFFSET_BITS
++
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
diff --git a/x11/kdebase3/patches/patch-fx b/x11/kdebase3/patches/patch-fx
new file mode 100644
index 00000000000..5bb3f56867c
--- /dev/null
+++ b/x11/kdebase3/patches/patch-fx
@@ -0,0 +1,13 @@
+$NetBSD: patch-fx,v 1.1 2004/11/01 16:39:06 gavan Exp $
+
+--- ksysguard/ksysguardd/Solaris/LoadAvg.c.orig	2004-05-22 21:26:59.000000000 +0100
++++ ksysguard/ksysguardd/Solaris/LoadAvg.c
+@@ -20,6 +20,8 @@
+ 
+ */
+ 
++#undef _FILE_OFFSET_BITS
++
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
diff --git a/x11/kdebase3/patches/patch-fy b/x11/kdebase3/patches/patch-fy
new file mode 100644
index 00000000000..e65d023d245
--- /dev/null
+++ b/x11/kdebase3/patches/patch-fy
@@ -0,0 +1,13 @@
+$NetBSD: patch-fy,v 1.1 2004/11/01 16:39:06 gavan Exp $
+
+--- ksysguard/ksysguardd/Solaris/ProcessList.c.orig	2004-05-22 21:26:59.000000000 +0100
++++ ksysguard/ksysguardd/Solaris/ProcessList.c
+@@ -20,6 +20,8 @@
+ 
+ */
+ 
++#undef _FILE_OFFSET_BITS
++
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
diff --git a/x11/kdebase3/patches/patch-fz b/x11/kdebase3/patches/patch-fz
new file mode 100644
index 00000000000..1ea5d42e9de
--- /dev/null
+++ b/x11/kdebase3/patches/patch-fz
@@ -0,0 +1,12 @@
+$NetBSD: patch-fz,v 1.1 2004/11/01 16:39:06 gavan Exp $
+
+--- konqueror/sidebar/trees/konq_sidebartree.cpp.orig	2004-10-08 14:57:27.000000000 +0100
++++ konqueror/sidebar/trees/konq_sidebartree.cpp
+@@ -49,6 +49,7 @@
+ #include <stdlib.h>
+ #include <assert.h>
+ 
++#undef truncate
+ 
+ static const int autoOpenTimeout = 750;
+