From 80e805d01df5336c4c39c96fb0bb5468d651a4bd Mon Sep 17 00:00:00 2001 From: markd Date: Thu, 20 Jan 2011 11:56:51 +0000 Subject: fix build with gcc4.4 --- misc/kdepim3/patches/patch-ap | 13 +++++++++++++ misc/kdepim3/patches/patch-aq | 15 +++++++++++++++ misc/kdepim3/patches/patch-ar | 36 ++++++++++++++++++++++++++++++++++++ misc/kdepim3/patches/patch-as | 26 ++++++++++++++++++++++++++ misc/kdepim3/patches/patch-at | 13 +++++++++++++ 5 files changed, 103 insertions(+) create mode 100644 misc/kdepim3/patches/patch-ap create mode 100644 misc/kdepim3/patches/patch-aq create mode 100644 misc/kdepim3/patches/patch-ar create mode 100644 misc/kdepim3/patches/patch-as create mode 100644 misc/kdepim3/patches/patch-at (limited to 'misc/kdepim3/patches') 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::resize( size_type n_s + data_->resize( n_s * byte_io::byte_lenght() + byte_io::byte_lenght() ); + iterator p_end = end(); + byte_io::write( data_->rw_base( 0 ), n_s ); +- while ( operator !=(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 ) { -- cgit v1.2.3