fix build with gcc4.4

8 files changed, 124 insertions, 2 deletions

diff --git a/misc/kdeaddons3/distinfo b/misc/kdeaddons3/distinfo
index aed4bf2b698..fc2f0295b53 100644
--- a/misc/kdeaddons3/distinfo
+++ b/misc/kdeaddons3/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.35 2008/08/27 12:20:26 markd Exp $
+$NetBSD: distinfo,v 1.36 2011/01/20 12:00:31 markd Exp $
 
 SHA1 (kdeaddons-3.5.10.tar.bz2) = 5342e2f0a21e9028d9aaa2ee253f89f615ee57de
 RMD160 (kdeaddons-3.5.10.tar.bz2) = eada207a25f9cff0c10732e03bc8d9d813f79bd2
 Size (kdeaddons-3.5.10.tar.bz2) = 1741779 bytes
 SHA1 (patch-aa) = 68cea80eaf8f9c457f9d4a74a32f0da549699878
+SHA1 (patch-ab) = 3342980ba895b5b7154c8b70eba0a7cd0d5eb6bc
diff --git a/misc/kdeaddons3/patches/patch-ab b/misc/kdeaddons3/patches/patch-ab
new file mode 100644
index 00000000000..97df6908027
--- /dev/null
+++ b/misc/kdeaddons3/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.3 2011/01/20 12:00:31 markd Exp $
+
+--- kate/tabbarextension/plugin_katetabbarextension.h.orig	2008-08-19 18:10:36.000000000 +0000
++++ kate/tabbarextension/plugin_katetabbarextension.h
+@@ -53,7 +53,7 @@ class KateTabBarButton;
+ class MyPtrList : public QPtrList <KateTabBarButton>
+ {
+   public:
+-  MyPtrList() { QPtrList<KateTabBarButton>::QPtrList(); }
++  MyPtrList() { QPtrList(); }
+ 
+   virtual int compareItems ( QPtrCollection::Item item1_, QPtrCollection::Item item2_ );
+ };
diff --git a/misc/kdepim3/distinfo b/misc/kdepim3/distinfo
index 237acd128a2..078130fa190 100644
--- a/misc/kdepim3/distinfo
+++ b/misc/kdepim3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.60 2009/03/03 12:34:33 explorer Exp $
+$NetBSD: distinfo,v 1.61 2011/01/20 11:56:51 markd Exp $
 
 SHA1 (kdepim-3.5.10.tar.bz2) = 537da60fe3564ecc0ed2802e744fbf96386909a9
 RMD160 (kdepim-3.5.10.tar.bz2) = 52a834dc8eb377d397404a16a09c8a59b568b305
@@ -10,3 +10,8 @@ SHA1 (patch-ak) = cac11150a708f2f4258b9371f9aaa72b133a821d
 SHA1 (patch-al) = 723424b7c39c5e0e0899b340a30e5a3f32c90a6a
 SHA1 (patch-am) = 29066a35ac983764a8cfa9392b9d67df581b35d3
 SHA1 (patch-ao) = f3760617e77fe74d80733613a18905971ee4c5f9
+SHA1 (patch-ap) = 557b8a2fed8b81b32a37020af9967b86822e67ff
+SHA1 (patch-aq) = a5e092731269338ed13cf4c30184f890c5f937f6
+SHA1 (patch-ar) = d1a2ef8db72a1156beff5f925a262c217fd6eb83
+SHA1 (patch-as) = bfcde6d85ca844ebe4cff93ca0ed42deb2cefbff
+SHA1 (patch-at) = 670b61b45eed92c854808991e6241f29bee47554
diff --git a/misc/kdepim3/patches/patch-ap b/misc/kdepim3/patches/patch-ap
new file mode 100644
index 00000000000..091e13b2459
--- /dev/null
+++ b/misc/kdepim3/patches/patch-ap
@@ -0,0 +1,13 @@
+$NetBSD: patch-ap,v 1.7 2011/01/20 11:56:51 markd Exp $
+
+--- kontact/plugins/specialdates/sdsummarywidget.h.orig	2006-01-19 16:56:12.000000000 +0000
++++ kontact/plugins/specialdates/sdsummarywidget.h
+@@ -78,7 +78,7 @@ class SDSummaryWidget : public Kontact::
+     bool mShowHolidays;
+     bool mShowSpecialsFromCal;
+ 
+-    KHolidays::KHolidays *mHolidays;
++    KHolidays *mHolidays;
+ };
+ 
+ #endif
diff --git a/misc/kdepim3/patches/patch-aq b/misc/kdepim3/patches/patch-aq
new file mode 100644
index 00000000000..ab67516d8d2
--- /dev/null
+++ b/misc/kdepim3/patches/patch-aq
@@ -0,0 +1,15 @@
+$NetBSD: patch-aq,v 1.5 2011/01/20 11:56:51 markd Exp $
+
+from gentoo bug #282116. fix build with gcc4.4
+
+--- indexlib/memvector.tcc.orig	2008-02-13 09:39:38.000000000 +0000
++++ indexlib/memvector.tcc
+@@ -33,7 +33,7 @@ void memvector<T>::resize( size_type n_s
+ 	data_->resize( n_s * byte_io::byte_lenght<value_type>() + byte_io::byte_lenght<unsigned>() );
+ 	iterator p_end = end();
+ 	byte_io::write<unsigned>( data_->rw_base( 0 ), n_s );
+-	while ( operator !=<unsigned, unsigned>(p_end, end()) ) {
++	while ( p_end != end() ) {
+ 		*p_end = value_type();
+ 		++p_end;
+ 		
diff --git a/misc/kdepim3/patches/patch-ar b/misc/kdepim3/patches/patch-ar
new file mode 100644
index 00000000000..a2a595baae9
--- /dev/null
+++ b/misc/kdepim3/patches/patch-ar
@@ -0,0 +1,36 @@
+$NetBSD: patch-ar,v 1.5 2011/01/20 11:56:51 markd Exp $
+
+--- konsolekalendar/main.cpp.orig	2008-02-13 09:39:54.000000000 +0000
++++ konsolekalendar/main.cpp
+@@ -799,13 +799,13 @@ int main( int argc, char *argv[] )
+   if ( !args->isSet( "time" )     && !args->isSet( "epoch-start" ) &&
+        !args->isSet( "end-time" ) && !args->isSet( "epoch-end" ) ) {
+     // set default start date/time
+-    startdatetime = QDateTime::QDateTime( startdate, starttime );
++    startdatetime = QDateTime( startdate, starttime );
+     kdDebug() << "main | datetimestamp | "
+               << "setting startdatetime from "
+               << "default startdate (today) and starttime"
+               << endl;
+     // set default end date/time
+-    enddatetime = QDateTime::QDateTime( enddate, endtime );
++    enddatetime = QDateTime( enddate, endtime );
+     kdDebug() << "main | datetimestamp | "
+               << "setting enddatetime from "
+               << "default enddate (today) and endtime"
+@@ -814,13 +814,13 @@ int main( int argc, char *argv[] )
+ 
+   // Set startdatetime, enddatetime if still necessary
+   if ( startdatetime.isNull() ) {
+-    startdatetime = QDateTime::QDateTime( startdate, starttime );
++    startdatetime = QDateTime( startdate, starttime );
+     kdDebug() << "main | datetimestamp | "
+               << "setting startdatetime from startdate and starttime"
+               << endl;
+   }
+   if ( enddatetime.isNull() ) {
+-    enddatetime = QDateTime::QDateTime( enddate, endtime );
++    enddatetime = QDateTime( enddate, endtime );
+     kdDebug() << "main | datetimestamp | "
+               << "setting enddatetime from enddate and endtime"
+               << endl;
diff --git a/misc/kdepim3/patches/patch-as b/misc/kdepim3/patches/patch-as
new file mode 100644
index 00000000000..f217bacf9e3
--- /dev/null
+++ b/misc/kdepim3/patches/patch-as
@@ -0,0 +1,26 @@
+$NetBSD: patch-as,v 1.5 2011/01/20 11:56:51 markd Exp $
+
+--- kontact/plugins/korganizer/summarywidget.cpp.orig	2008-02-13 09:39:52.000000000 +0000
++++ kontact/plugins/korganizer/summarywidget.cpp
+@@ -167,7 +167,7 @@ void SummaryWidget::updateView()
+       QString datestr;
+ 
+       // Modify event date for printing
+-      QDate sD = QDate::QDate( dt.year(), dt.month(), dt.day() );
++      QDate sD = QDate( dt.year(), dt.month(), dt.day() );
+       if ( ( sD.month() == currentDate.month() ) &&
+            ( sD.day()   == currentDate.day() ) ) {
+         datestr = i18n( "Today" );
+@@ -227,10 +227,10 @@ void SummaryWidget::updateView()
+         QTime sET = ev->dtEnd().time();
+         if ( ev->isMultiDay() ) {
+           if ( ev->dtStart().date() < dt ) {
+-            sST = QTime::QTime( 0, 0 );
++            sST = QTime( 0, 0 );
+           }
+           if ( ev->dtEnd().date() > dt ) {
+-            sET = QTime::QTime( 23, 59 );
++            sET = QTime( 23, 59 );
+           }
+         }
+         datestr = i18n( "Time from - to", "%1 - %2" )
diff --git a/misc/kdepim3/patches/patch-at b/misc/kdepim3/patches/patch-at
new file mode 100644
index 00000000000..90eed8f3dbf
--- /dev/null
+++ b/misc/kdepim3/patches/patch-at
@@ -0,0 +1,13 @@
+$NetBSD: patch-at,v 1.5 2011/01/20 11:56:51 markd Exp $
+
+--- kontact/plugins/specialdates/sdsummarywidget.cpp.orig	2006-10-01 17:30:38.000000000 +0000
++++ kontact/plugins/specialdates/sdsummarywidget.cpp
+@@ -438,7 +438,7 @@ void SDSummaryWidget::updateView()
+ 
+       //Muck with the year -- change to the year 'daysTo' days away
+       int year = currentDate.addDays( (*addrIt).daysTo ).year();
+-      QDate sD = QDate::QDate( year,
++      QDate sD = QDate( year,
+                            (*addrIt).date.month(), (*addrIt).date.day() );
+ 
+       if ( (*addrIt).daysTo == 0 ) {