Thu Jan 20 12:19:30 2011 UTC ()
Fix build with recent gcc.
Also aligned_u64 no longer defined on ArchLinux but needed for
linux/if_ppp.h
(markd)
diff -r1.48 -r1.49 pkgsrc/net/kdenetwork3/distinfo
diff -r1.17 -r1.18 pkgsrc/net/kdenetwork3/patches/patch-aa
diff -r1.4 -r1.5 pkgsrc/net/kdenetwork3/patches/patch-ae
diff -r1.9 -r1.10 pkgsrc/net/kdenetwork3/patches/patch-af
diff -r1.3 -r1.4 pkgsrc/net/kdenetwork3/patches/patch-ag
diff -r1.3 -r1.4 pkgsrc/net/kdenetwork3/patches/patch-ah
diff -r0 -r1.1 pkgsrc/net/kdenetwork3/patches/patch-ba
diff -r0 -r1.1 pkgsrc/net/kdenetwork3/patches/patch-bb
diff -r0 -r1.1 pkgsrc/net/kdenetwork3/patches/patch-bc
diff -r0 -r1.1 pkgsrc/net/kdenetwork3/patches/patch-bd
diff -r0 -r1.1 pkgsrc/net/kdenetwork3/patches/patch-be
--- pkgsrc/net/kdenetwork3/Attic/distinfo 2009/08/21 08:27:29 1.48
+++ pkgsrc/net/kdenetwork3/Attic/distinfo 2011/01/20 12:19:30 1.49
| @@ -1,14 +1,19 @@ | | | @@ -1,14 +1,19 @@ |
1 | $NetBSD: distinfo,v 1.48 2009/08/21 08:27:29 abs Exp $ | | 1 | $NetBSD: distinfo,v 1.49 2011/01/20 12:19:30 markd Exp $ |
2 | | | 2 | |
3 | SHA1 (kdenetwork-3.5.10.tar.bz2) = eb280bffaf4642bfda442cc6a9fb38dc4163b720 | | 3 | SHA1 (kdenetwork-3.5.10.tar.bz2) = eb280bffaf4642bfda442cc6a9fb38dc4163b720 |
4 | RMD160 (kdenetwork-3.5.10.tar.bz2) = f888f53746f1e734d3c15c09eac1c2b9c0564b20 | | 4 | RMD160 (kdenetwork-3.5.10.tar.bz2) = f888f53746f1e734d3c15c09eac1c2b9c0564b20 |
5 | Size (kdenetwork-3.5.10.tar.bz2) = 9336764 bytes | | 5 | Size (kdenetwork-3.5.10.tar.bz2) = 9336764 bytes |
6 | SHA1 (patch-aa) = 951a131ad509a7592fcb62885a6a2084f7d56fe1 | | 6 | SHA1 (patch-aa) = c4ddd5c2770d6141e8ee8d9bb27c81ddb7368f46 |
7 | SHA1 (patch-ac) = a0e2fbcf1348d5e91434878bac4977b649c94855 | | 7 | SHA1 (patch-ac) = a0e2fbcf1348d5e91434878bac4977b649c94855 |
8 | SHA1 (patch-ae) = 401d126a6df6225641dd35803d3d467ec587c683 | | 8 | SHA1 (patch-ae) = af76916e9939b3ad53091b9ad5afe0e11a0f36ef |
9 | SHA1 (patch-af) = d1955d7712b980db173f765586e6dc373cf3eea0 | | 9 | SHA1 (patch-af) = c2da62e219df9d5d7d9e86b2788b6392e42b43ad |
10 | SHA1 (patch-ag) = 6fad1af3bd383c01f80b7fa4da64184ad7172bb3 | | 10 | SHA1 (patch-ag) = fd4a64de96d798f3a63c0616315b27253861c5de |
11 | SHA1 (patch-ah) = f13a567b6be1bd04e9d50185bab995f1a8a4d231 | | 11 | SHA1 (patch-ah) = 66e14e03fa192e7b4cbb07334a4e9ec89dea5af2 |
12 | SHA1 (patch-ai) = 27ff86fa25381bcb05c321b4f54acc225e9b90dd | | 12 | SHA1 (patch-ai) = 27ff86fa25381bcb05c321b4f54acc225e9b90dd |
13 | SHA1 (patch-am) = a2f7d40793eed9122a9d8bf7f2ae0efc326bbae5 | | 13 | SHA1 (patch-am) = a2f7d40793eed9122a9d8bf7f2ae0efc326bbae5 |
14 | SHA1 (patch-an) = 8a086d1fef4eb4f96380438a87fecfe76d147b04 | | 14 | SHA1 (patch-an) = 8a086d1fef4eb4f96380438a87fecfe76d147b04 |
| | | 15 | SHA1 (patch-ba) = 7b5062cc4b92a9ebc6c62fc7fdc8e59873baecd9 |
| | | 16 | SHA1 (patch-bb) = 4acd491934978af53ea74424ffcb5fd5c1e2706e |
| | | 17 | SHA1 (patch-bc) = 8e6349eb5680fa7ac807c09d38816e744aa359c2 |
| | | 18 | SHA1 (patch-bd) = 05c285a1965f5a9af03b0570ac51a1ea19d7fed0 |
| | | 19 | SHA1 (patch-be) = 69eee4103409cd10dc673c3f7da3736c9505e927 |
--- pkgsrc/net/kdenetwork3/patches/Attic/patch-aa 2008/02/20 10:00:24 1.17
+++ pkgsrc/net/kdenetwork3/patches/Attic/patch-aa 2011/01/20 12:19:30 1.18
| @@ -1,15 +1,27 @@ | | | @@ -1,15 +1,27 @@ |
1 | $NetBSD: patch-aa,v 1.17 2008/02/20 10:00:24 markd Exp $ | | 1 | $NetBSD: patch-aa,v 1.18 2011/01/20 12:19:30 markd Exp $ |
| | | 2 | |
| | | 3 | aligned_u64/__aligned_u64 mixup on ArchLinux |
2 | | | 4 | |
3 | utmpx patch gets ktalkd to build on Solaris 10 but wont actually | | 5 | utmpx patch gets ktalkd to build on Solaris 10 but wont actually |
4 | read the file properly - needs to be fixed. | | 6 | read the file properly - needs to be fixed. |
5 | | | 7 | |
6 | --- configure.orig 2006-10-03 07:24:51.000000000 +1300 | | 8 | --- configure.orig 2008-08-20 15:49:39.000000000 +0000 |
7 | +++ configure | | 9 | +++ configure |
8 | @@ -44334,6 +44340,7 @@ else | | 10 | @@ -43655,6 +43655,9 @@ cat confdefs.h >>conftest.$ac_ext |
| | | 11 | cat >>conftest.$ac_ext <<_ACEOF |
| | | 12 | /* end confdefs.h. */ |
| | | 13 | |
| | | 14 | +#if defined(linux) |
| | | 15 | +#define aligned_u64 __aligned_u64 |
| | | 16 | +#endif |
| | | 17 | #if defined(__osf__) || defined(__svr4__) |
| | | 18 | #define _POSIX_PII_SOCKET |
| | | 19 | extern "C" int sethostname(char *name, int name_len); |
| | | 20 | @@ -44540,6 +44543,7 @@ else |
9 | /var/run/utmp \ | | 21 | /var/run/utmp \ |
10 | /var/adm/utmp \ | | 22 | /var/adm/utmp \ |
11 | /etc/utmp \ | | 23 | /etc/utmp \ |
12 | + /var/adm/utmpx \ | | 24 | + /var/adm/utmpx \ |
13 | ; \ | | 25 | ; \ |
14 | do | | 26 | do |
15 | if test -r "$ac_file"; then | | 27 | if test -r "$ac_file"; then |
--- pkgsrc/net/kdenetwork3/patches/Attic/patch-ae 2006/10/12 10:47:18 1.4
+++ pkgsrc/net/kdenetwork3/patches/Attic/patch-ae 2011/01/20 12:19:30 1.5
| @@ -1,17 +1,26 @@ | | | @@ -1,17 +1,26 @@ |
1 | $NetBSD: patch-ae,v 1.4 2006/10/12 10:47:18 markd Exp $ | | 1 | $NetBSD: patch-ae,v 1.5 2011/01/20 12:19:30 markd Exp $ |
2 | | | 2 | |
3 | --- kopete/protocols/groupwise/libgroupwise/rtf.ll.orig 2005-09-10 20:20:20.000000000 +1200 | | 3 | --- kopete/protocols/groupwise/libgroupwise/rtf.ll.orig 2005-09-10 08:20:20.000000000 +0000 |
4 | +++ kopete/protocols/groupwise/libgroupwise/rtf.ll | | 4 | +++ kopete/protocols/groupwise/libgroupwise/rtf.ll |
| | | 5 | @@ -570,7 +570,7 @@ void Level::setText(const char *str) |
| | | 6 | |
| | | 7 | FontDef& def = p->fonts[m_nFont-1]; |
| | | 8 | |
| | | 9 | - char *pp = strchr(str, ';'); |
| | | 10 | + const char *pp = strchr(str, ';'); |
| | | 11 | unsigned size; |
| | | 12 | if (pp != NULL) |
| | | 13 | size = (pp - str); |
5 | @@ -633,7 +633,7 @@ const unsigned RED = 2; | | 14 | @@ -633,7 +633,7 @@ const unsigned RED = 2; |
6 | const unsigned GREEN = 3; | | 15 | const unsigned GREEN = 3; |
7 | const unsigned BLUE = 4; | | 16 | const unsigned BLUE = 4; |
8 | const unsigned CF = 5; | | 17 | const unsigned CF = 5; |
9 | -const unsigned FS = 6; | | 18 | -const unsigned FS = 6; |
10 | +const unsigned KDE_FS = 6; | | 19 | +const unsigned KDE_FS = 6; |
11 | const unsigned HIGHLIGHT = 7; | | 20 | const unsigned HIGHLIGHT = 7; |
12 | const unsigned PARD = 8; | | 21 | const unsigned PARD = 8; |
13 | const unsigned PAR = 9; | | 22 | const unsigned PAR = 9; |
14 | @@ -797,7 +797,7 @@ QString RTF2HTML::Parse(const char *rtf, | | 23 | @@ -797,7 +797,7 @@ QString RTF2HTML::Parse(const char *rtf, |
15 | case CF: | | 24 | case CF: |
16 | cur_level.setFontColor(cmd_value); | | 25 | cur_level.setFontColor(cmd_value); |
17 | break; | | 26 | break; |
--- pkgsrc/net/kdenetwork3/patches/Attic/patch-af 2006/10/12 10:47:18 1.9
+++ pkgsrc/net/kdenetwork3/patches/Attic/patch-af 2011/01/20 12:19:30 1.10
| @@ -1,17 +1,26 @@ | | | @@ -1,17 +1,26 @@ |
1 | $NetBSD: patch-af,v 1.9 2006/10/12 10:47:18 markd Exp $ | | 1 | $NetBSD: patch-af,v 1.10 2011/01/20 12:19:30 markd Exp $ |
2 | | | 2 | |
3 | --- kopete/protocols/groupwise/libgroupwise/rtf.cc.orig 2005-09-10 20:20:20.000000000 +1200 | | 3 | --- kopete/protocols/groupwise/libgroupwise/rtf.cc.orig 2005-09-10 08:20:20.000000000 +0000 |
4 | +++ kopete/protocols/groupwise/libgroupwise/rtf.cc | | 4 | +++ kopete/protocols/groupwise/libgroupwise/rtf.cc |
| | | 5 | @@ -2235,7 +2235,7 @@ void Level::setText(const char *str) |
| | | 6 | |
| | | 7 | FontDef& def = p->fonts[m_nFont-1]; |
| | | 8 | |
| | | 9 | - char *pp = strchr(str, ';'); |
| | | 10 | + const char *pp = strchr(str, ';'); |
| | | 11 | unsigned size; |
| | | 12 | if (pp != NULL) |
| | | 13 | size = (pp - str); |
5 | @@ -2298,7 +2298,7 @@ const unsigned RED = 2; | | 14 | @@ -2298,7 +2298,7 @@ const unsigned RED = 2; |
6 | const unsigned GREEN = 3; | | 15 | const unsigned GREEN = 3; |
7 | const unsigned BLUE = 4; | | 16 | const unsigned BLUE = 4; |
8 | const unsigned CF = 5; | | 17 | const unsigned CF = 5; |
9 | -const unsigned FS = 6; | | 18 | -const unsigned FS = 6; |
10 | +const unsigned KDE_FS = 6; | | 19 | +const unsigned KDE_FS = 6; |
11 | const unsigned HIGHLIGHT = 7; | | 20 | const unsigned HIGHLIGHT = 7; |
12 | const unsigned PARD = 8; | | 21 | const unsigned PARD = 8; |
13 | const unsigned PAR = 9; | | 22 | const unsigned PAR = 9; |
14 | @@ -2462,7 +2462,7 @@ QString RTF2HTML::Parse(const char *rtf, | | 23 | @@ -2462,7 +2462,7 @@ QString RTF2HTML::Parse(const char *rtf, |
15 | case CF: | | 24 | case CF: |
16 | cur_level.setFontColor(cmd_value); | | 25 | cur_level.setFontColor(cmd_value); |
17 | break; | | 26 | break; |
--- pkgsrc/net/kdenetwork3/patches/Attic/patch-ag 2006/10/12 10:47:18 1.3
+++ pkgsrc/net/kdenetwork3/patches/Attic/patch-ag 2011/01/20 12:19:30 1.4
| @@ -1,17 +1,26 @@ | | | @@ -1,17 +1,26 @@ |
1 | $NetBSD: patch-ag,v 1.3 2006/10/12 10:47:18 markd Exp $ | | 1 | $NetBSD: patch-ag,v 1.4 2011/01/20 12:19:30 markd Exp $ |
2 | | | 2 | |
3 | --- kopete/protocols/oscar/liboscar/rtf.cc.orig 2005-09-10 20:20:23.000000000 +1200 | | 3 | --- kopete/protocols/oscar/liboscar/rtf.cc.orig 2005-09-10 08:20:23.000000000 +0000 |
4 | +++ kopete/protocols/oscar/liboscar/rtf.cc | | 4 | +++ kopete/protocols/oscar/liboscar/rtf.cc |
| | | 5 | @@ -2131,7 +2131,7 @@ void Level::setText(const char *str) |
| | | 6 | |
| | | 7 | FontDef& def = p->fonts[m_nFont-1]; |
| | | 8 | |
| | | 9 | - char *pp = strchr(str, ';'); |
| | | 10 | + const char *pp = strchr(str, ';'); |
| | | 11 | unsigned size; |
| | | 12 | if (pp != NULL) |
| | | 13 | size = (pp - str); |
5 | @@ -2194,7 +2194,7 @@ const unsigned RED = 2; | | 14 | @@ -2194,7 +2194,7 @@ const unsigned RED = 2; |
6 | const unsigned GREEN = 3; | | 15 | const unsigned GREEN = 3; |
7 | const unsigned BLUE = 4; | | 16 | const unsigned BLUE = 4; |
8 | const unsigned CF = 5; | | 17 | const unsigned CF = 5; |
9 | -const unsigned FS = 6; | | 18 | -const unsigned FS = 6; |
10 | +const unsigned KDE_FS = 6; | | 19 | +const unsigned KDE_FS = 6; |
11 | const unsigned HIGHLIGHT = 7; | | 20 | const unsigned HIGHLIGHT = 7; |
12 | const unsigned PARD = 8; | | 21 | const unsigned PARD = 8; |
13 | const unsigned PAR = 9; | | 22 | const unsigned PAR = 9; |
14 | @@ -2358,7 +2358,7 @@ QString RTF2HTML::Parse(const char *rtf, | | 23 | @@ -2358,7 +2358,7 @@ QString RTF2HTML::Parse(const char *rtf, |
15 | case CF: | | 24 | case CF: |
16 | cur_level.setFontColor(cmd_value); | | 25 | cur_level.setFontColor(cmd_value); |
17 | break; | | 26 | break; |
--- pkgsrc/net/kdenetwork3/patches/Attic/patch-ah 2006/10/12 10:47:18 1.3
+++ pkgsrc/net/kdenetwork3/patches/Attic/patch-ah 2011/01/20 12:19:30 1.4
| @@ -1,17 +1,26 @@ | | | @@ -1,17 +1,26 @@ |
1 | $NetBSD: patch-ah,v 1.3 2006/10/12 10:47:18 markd Exp $ | | 1 | $NetBSD: patch-ah,v 1.4 2011/01/20 12:19:30 markd Exp $ |
2 | | | 2 | |
3 | --- kopete/protocols/oscar/liboscar/rtf.ll.orig 2005-09-10 20:20:23.000000000 +1200 | | 3 | --- kopete/protocols/oscar/liboscar/rtf.ll.orig 2005-09-10 08:20:23.000000000 +0000 |
4 | +++ kopete/protocols/oscar/liboscar/rtf.ll | | 4 | +++ kopete/protocols/oscar/liboscar/rtf.ll |
| | | 5 | @@ -568,7 +568,7 @@ void Level::setText(const char *str) |
| | | 6 | |
| | | 7 | FontDef& def = p->fonts[m_nFont-1]; |
| | | 8 | |
| | | 9 | - char *pp = strchr(str, ';'); |
| | | 10 | + const char *pp = strchr(str, ';'); |
| | | 11 | unsigned size; |
| | | 12 | if (pp != NULL) |
| | | 13 | size = (pp - str); |
5 | @@ -631,7 +631,7 @@ const unsigned RED = 2; | | 14 | @@ -631,7 +631,7 @@ const unsigned RED = 2; |
6 | const unsigned GREEN = 3; | | 15 | const unsigned GREEN = 3; |
7 | const unsigned BLUE = 4; | | 16 | const unsigned BLUE = 4; |
8 | const unsigned CF = 5; | | 17 | const unsigned CF = 5; |
9 | -const unsigned FS = 6; | | 18 | -const unsigned FS = 6; |
10 | +const unsigned KDE_FS = 6; | | 19 | +const unsigned KDE_FS = 6; |
11 | const unsigned HIGHLIGHT = 7; | | 20 | const unsigned HIGHLIGHT = 7; |
12 | const unsigned PARD = 8; | | 21 | const unsigned PARD = 8; |
13 | const unsigned PAR = 9; | | 22 | const unsigned PAR = 9; |
14 | @@ -795,7 +795,7 @@ QString RTF2HTML::Parse(const char *rtf, | | 23 | @@ -795,7 +795,7 @@ QString RTF2HTML::Parse(const char *rtf, |
15 | case CF: | | 24 | case CF: |
16 | cur_level.setFontColor(cmd_value); | | 25 | cur_level.setFontColor(cmd_value); |
17 | break; | | 26 | break; |
$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();
$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 )
$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.
*/
$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);
$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>