Fix build with recent gcc.

Also aligned_u64 no longer defined on ArchLinux but needed for
linux/if_ppp.h

11 files changed, 141 insertions, 17 deletions

diff --git a/net/kdenetwork3/distinfo b/net/kdenetwork3/distinfo
index d29ba45d91e..5aa0edbbbc8 100644
--- a/net/kdenetwork3/distinfo
+++ b/net/kdenetwork3/distinfo
@@ -1,14 +1,19 @@
-$NetBSD: distinfo,v 1.48 2009/08/21 08:27:29 abs Exp $
+$NetBSD: distinfo,v 1.49 2011/01/20 12:19:30 markd Exp $
 
 SHA1 (kdenetwork-3.5.10.tar.bz2) = eb280bffaf4642bfda442cc6a9fb38dc4163b720
 RMD160 (kdenetwork-3.5.10.tar.bz2) = f888f53746f1e734d3c15c09eac1c2b9c0564b20
 Size (kdenetwork-3.5.10.tar.bz2) = 9336764 bytes
-SHA1 (patch-aa) = 951a131ad509a7592fcb62885a6a2084f7d56fe1
+SHA1 (patch-aa) = c4ddd5c2770d6141e8ee8d9bb27c81ddb7368f46
 SHA1 (patch-ac) = a0e2fbcf1348d5e91434878bac4977b649c94855
-SHA1 (patch-ae) = 401d126a6df6225641dd35803d3d467ec587c683
-SHA1 (patch-af) = d1955d7712b980db173f765586e6dc373cf3eea0
-SHA1 (patch-ag) = 6fad1af3bd383c01f80b7fa4da64184ad7172bb3
-SHA1 (patch-ah) = f13a567b6be1bd04e9d50185bab995f1a8a4d231
+SHA1 (patch-ae) = af76916e9939b3ad53091b9ad5afe0e11a0f36ef
+SHA1 (patch-af) = c2da62e219df9d5d7d9e86b2788b6392e42b43ad
+SHA1 (patch-ag) = fd4a64de96d798f3a63c0616315b27253861c5de
+SHA1 (patch-ah) = 66e14e03fa192e7b4cbb07334a4e9ec89dea5af2
 SHA1 (patch-ai) = 27ff86fa25381bcb05c321b4f54acc225e9b90dd
 SHA1 (patch-am) = a2f7d40793eed9122a9d8bf7f2ae0efc326bbae5
 SHA1 (patch-an) = 8a086d1fef4eb4f96380438a87fecfe76d147b04
+SHA1 (patch-ba) = 7b5062cc4b92a9ebc6c62fc7fdc8e59873baecd9
+SHA1 (patch-bb) = 4acd491934978af53ea74424ffcb5fd5c1e2706e
+SHA1 (patch-bc) = 8e6349eb5680fa7ac807c09d38816e744aa359c2
+SHA1 (patch-bd) = 05c285a1965f5a9af03b0570ac51a1ea19d7fed0
+SHA1 (patch-be) = 69eee4103409cd10dc673c3f7da3736c9505e927
diff --git a/net/kdenetwork3/patches/patch-aa b/net/kdenetwork3/patches/patch-aa
index 2ae23f9c149..0a4b0b6b096 100644
--- a/net/kdenetwork3/patches/patch-aa
+++ b/net/kdenetwork3/patches/patch-aa
@@ -1,11 +1,23 @@
-$NetBSD: patch-aa,v 1.17 2008/02/20 10:00:24 markd Exp $
+$NetBSD: patch-aa,v 1.18 2011/01/20 12:19:30 markd Exp $
+
+aligned_u64/__aligned_u64 mixup on ArchLinux
 
 utmpx patch gets ktalkd to build on Solaris 10 but wont actually
 read the file properly - needs to be fixed.
 
---- configure.orig	2006-10-03 07:24:51.000000000 +1300
+--- configure.orig	2008-08-20 15:49:39.000000000 +0000
 +++ configure
-@@ -44334,6 +44340,7 @@ else
+@@ -43655,6 +43655,9 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
++#if defined(linux)
++#define aligned_u64 __aligned_u64
++#endif
+ #if defined(__osf__) || defined(__svr4__)
+   #define _POSIX_PII_SOCKET
+   extern "C" int sethostname(char *name, int name_len);
+@@ -44540,6 +44543,7 @@ else
  	/var/run/utmp \
  	/var/adm/utmp \
  	/etc/utmp     \
diff --git a/net/kdenetwork3/patches/patch-ae b/net/kdenetwork3/patches/patch-ae
index 9d055c638b8..c42614b0995 100644
--- a/net/kdenetwork3/patches/patch-ae
+++ b/net/kdenetwork3/patches/patch-ae
@@ -1,7 +1,16 @@
-$NetBSD: patch-ae,v 1.4 2006/10/12 10:47:18 markd Exp $
+$NetBSD: patch-ae,v 1.5 2011/01/20 12:19:30 markd Exp $
 
---- kopete/protocols/groupwise/libgroupwise/rtf.ll.orig	2005-09-10 20:20:20.000000000 +1200
+--- kopete/protocols/groupwise/libgroupwise/rtf.ll.orig	2005-09-10 08:20:20.000000000 +0000
 +++ kopete/protocols/groupwise/libgroupwise/rtf.ll
+@@ -570,7 +570,7 @@ void Level::setText(const char *str)
+ 
+         FontDef& def = p->fonts[m_nFont-1];
+ 
+-        char *pp = strchr(str, ';');
++        const char *pp = strchr(str, ';');
+         unsigned size;
+         if (pp != NULL)
+            size = (pp - str);
 @@ -633,7 +633,7 @@ const unsigned RED			= 2;
  const unsigned GREEN		= 3;
  const unsigned BLUE			= 4;
diff --git a/net/kdenetwork3/patches/patch-af b/net/kdenetwork3/patches/patch-af
index f0ced4efe90..cb0430a8ab4 100644
--- a/net/kdenetwork3/patches/patch-af
+++ b/net/kdenetwork3/patches/patch-af
@@ -1,7 +1,16 @@
-$NetBSD: patch-af,v 1.9 2006/10/12 10:47:18 markd Exp $
+$NetBSD: patch-af,v 1.10 2011/01/20 12:19:30 markd Exp $
 
---- kopete/protocols/groupwise/libgroupwise/rtf.cc.orig	2005-09-10 20:20:20.000000000 +1200
+--- kopete/protocols/groupwise/libgroupwise/rtf.cc.orig	2005-09-10 08:20:20.000000000 +0000
 +++ kopete/protocols/groupwise/libgroupwise/rtf.cc
+@@ -2235,7 +2235,7 @@ void Level::setText(const char *str)
+ 
+         FontDef& def = p->fonts[m_nFont-1];
+ 
+-        char *pp = strchr(str, ';');
++        const char *pp = strchr(str, ';');
+         unsigned size;
+         if (pp != NULL)
+            size = (pp - str);
 @@ -2298,7 +2298,7 @@ const unsigned RED			= 2;
  const unsigned GREEN		= 3;
  const unsigned BLUE			= 4;
diff --git a/net/kdenetwork3/patches/patch-ag b/net/kdenetwork3/patches/patch-ag
index bc7fdba73a9..1275ffdfe8d 100644
--- a/net/kdenetwork3/patches/patch-ag
+++ b/net/kdenetwork3/patches/patch-ag
@@ -1,7 +1,16 @@
-$NetBSD: patch-ag,v 1.3 2006/10/12 10:47:18 markd Exp $
+$NetBSD: patch-ag,v 1.4 2011/01/20 12:19:30 markd Exp $
 
---- kopete/protocols/oscar/liboscar/rtf.cc.orig	2005-09-10 20:20:23.000000000 +1200
+--- kopete/protocols/oscar/liboscar/rtf.cc.orig	2005-09-10 08:20:23.000000000 +0000
 +++ kopete/protocols/oscar/liboscar/rtf.cc
+@@ -2131,7 +2131,7 @@ void Level::setText(const char *str)
+ 
+         FontDef& def = p->fonts[m_nFont-1];
+ 
+-        char *pp = strchr(str, ';');
++        const char *pp = strchr(str, ';');
+         unsigned size;
+         if (pp != NULL)
+            size = (pp - str);
 @@ -2194,7 +2194,7 @@ const unsigned RED			= 2;
  const unsigned GREEN		= 3;
  const unsigned BLUE			= 4;
diff --git a/net/kdenetwork3/patches/patch-ah b/net/kdenetwork3/patches/patch-ah
index 46939dbf5ed..a4f1c207622 100644
--- a/net/kdenetwork3/patches/patch-ah
+++ b/net/kdenetwork3/patches/patch-ah
@@ -1,7 +1,16 @@
-$NetBSD: patch-ah,v 1.3 2006/10/12 10:47:18 markd Exp $
+$NetBSD: patch-ah,v 1.4 2011/01/20 12:19:30 markd Exp $
 
---- kopete/protocols/oscar/liboscar/rtf.ll.orig	2005-09-10 20:20:23.000000000 +1200
+--- kopete/protocols/oscar/liboscar/rtf.ll.orig	2005-09-10 08:20:23.000000000 +0000
 +++ kopete/protocols/oscar/liboscar/rtf.ll
+@@ -568,7 +568,7 @@ void Level::setText(const char *str)
+ 
+         FontDef& def = p->fonts[m_nFont-1];
+ 
+-        char *pp = strchr(str, ';');
++        const char *pp = strchr(str, ';');
+         unsigned size;
+         if (pp != NULL)
+            size = (pp - str);
 @@ -631,7 +631,7 @@ const unsigned RED			= 2;
  const unsigned GREEN		= 3;
  const unsigned BLUE			= 4;
diff --git a/net/kdenetwork3/patches/patch-ba b/net/kdenetwork3/patches/patch-ba
new file mode 100644
index 00000000000..e8f95626d5a
--- /dev/null
+++ b/net/kdenetwork3/patches/patch-ba
@@ -0,0 +1,13 @@
+$NetBSD: patch-ba,v 1.1 2011/01/20 12:19:30 markd Exp $
+
+--- kopete/kopete/contactlist/kopetegroupviewitem.cpp.orig	2005-09-10 08:20:25.000000000 +0000
++++ kopete/kopete/contactlist/kopetegroupviewitem.cpp
+@@ -169,7 +169,7 @@ void KopeteGroupViewItem::refreshDisplay
+ 	// the sorting itself is rather slow. Therefore we call delayedSort, which tries
+ 	// to group multiple sort requests into one.
+ 	using namespace Kopete::UI::ListView;
+-	if ( ListView::ListView *lv = dynamic_cast<ListView::ListView *>( listView() ) )
++	if ( ListView *lv = dynamic_cast<ListView *>( listView() ) )
+ 		lv->delayedSort();
+ 	else
+ 		listView()->sort();
diff --git a/net/kdenetwork3/patches/patch-bb b/net/kdenetwork3/patches/patch-bb
new file mode 100644
index 00000000000..2dea6f1a1ed
--- /dev/null
+++ b/net/kdenetwork3/patches/patch-bb
@@ -0,0 +1,13 @@
+$NetBSD: patch-bb,v 1.1 2011/01/20 12:19:30 markd Exp $
+
+--- kopete/kopete/chatwindow/krichtexteditpart.cpp.orig	2006-10-01 17:27:05.000000000 +0000
++++ kopete/kopete/chatwindow/krichtexteditpart.cpp
+@@ -38,7 +38,7 @@ public:
+ KopeteRichTextEditPart::KopeteRichTextEditPart( QWidget *wparent, const char *wname, QObject*, const char*, const QStringList& )
+ 	: KParts::ReadOnlyPart( wparent, wname ? wname : "rich_text_part" )
+ {
+-	KopeteRichTextEditPart::KopeteRichTextEditPart( wparent, wname, false );
++	KopeteRichTextEditPart( wparent, wname, false );
+ }
+ 
+ KopeteRichTextEditPart::KopeteRichTextEditPart( QWidget *parent, const char *name, int capabilities )
diff --git a/net/kdenetwork3/patches/patch-bc b/net/kdenetwork3/patches/patch-bc
new file mode 100644
index 00000000000..303bcd602fb
--- /dev/null
+++ b/net/kdenetwork3/patches/patch-bc
@@ -0,0 +1,13 @@
+$NetBSD: patch-bc,v 1.1 2011/01/20 12:19:30 markd Exp $
+
+--- kopete/protocols/testbed/testbedaccount.h.orig	2006-10-01 17:26:55.000000000 +0000
++++ kopete/protocols/testbed/testbedaccount.h
+@@ -59,7 +59,7 @@ public:
+ 	/**
+ 	 * 'Connect' to the testbed server.  Only sets myself() online.
+ 	 */
+-	virtual void connect( const Kopete::OnlineStatus& initialStatus = Kopete::OnlineStatus::OnlineStatus() );
++	virtual void connect( const Kopete::OnlineStatus& initialStatus = Kopete::OnlineStatus() );
+ 	/**
+ 	 * Disconnect from the server.  Only sets myself() offline.
+ 	 */
diff --git a/net/kdenetwork3/patches/patch-bd b/net/kdenetwork3/patches/patch-bd
new file mode 100644
index 00000000000..872569d573c
--- /dev/null
+++ b/net/kdenetwork3/patches/patch-bd
@@ -0,0 +1,16 @@
+$NetBSD: patch-bd,v 1.1 2011/01/20 12:19:30 markd Exp $
+
+aligned_u64/__aligned_u64 mixup on ArchLinux
+
+--- kppp/opener.cpp.orig	2008-02-13 09:37:48.000000000 +0000
++++ kppp/opener.cpp
+@@ -36,6 +36,9 @@
+ 
+ #include <config.h>
+ 
++#if defined(linux)
++#define aligned_u64 __aligned_u64
++#endif
+ #if defined(__osf__) || defined(__svr4__)
+ #define _POSIX_PII_SOCKET
+ extern "C" int sethostname(char *name, int name_len);
diff --git a/net/kdenetwork3/patches/patch-be b/net/kdenetwork3/patches/patch-be
new file mode 100644
index 00000000000..5fc993f7462
--- /dev/null
+++ b/net/kdenetwork3/patches/patch-be
@@ -0,0 +1,16 @@
+$NetBSD: patch-be,v 1.1 2011/01/20 12:19:30 markd Exp $
+
+aligned_u64/__aligned_u64 mixup on ArchLinux
+
+--- kppp/pppstats.cpp.orig	2008-02-13 09:37:48.000000000 +0000
++++ kppp/pppstats.cpp
+@@ -41,6 +41,9 @@
+ 
+ #include <config.h>
+ 
++#if defined(linux)
++#define aligned_u64 __aligned_u64
++#endif
+ #include <ctype.h>
+ #include <errno.h>
+