Hello community,
here is the log from the commit of package kdepim3 for openSUSE:Factory checked in at 2011-12-02 13:21:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdepim3 (Old)
and /work/SRC/openSUSE:Factory/.kdepim3.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdepim3", Maintainer is "kde-maintainers@suse.de"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdepim3/kdepim3.changes 2011-09-23 02:06:24.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kdepim3.new/kdepim3.changes 2011-12-02 13:21:39.000000000 +0100
@@ -1,0 +2,11 @@
+Thu Dec 1 07:07:07 UTC 2011 - anixx@opensuse.org
+
+- add patches fixing build with modern GCC
+- add gpg2 to build requires (for 11.4)
+
+-------------------------------------------------------------------
+Fri Oct 14 10:28:09 UTC 2011 - anixx@opensuse.org
+
+- spec file cleanup
+
+-------------------------------------------------------------------
New:
----
kdepim-gcc-fix-call.patch
kdepim-gcc-fix-call1.patch
kdepim-gcc-fix-call2.patch
kdepim-gcc44-fix.patch
kdepim-trinity-fix-include.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdepim3.spec ++++++
--- /var/tmp/diff_new_pack.C0q6Ng/_old 2011-12-02 13:21:40.000000000 +0100
+++ /var/tmp/diff_new_pack.C0q6Ng/_new 2011-12-02 13:21:40.000000000 +0100
@@ -13,9 +13,6 @@
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
-
-# norootforbuild
Name: kdepim3
@@ -23,32 +20,15 @@
%if %suse_version < 1210
BuildRequires: hal-devel
%endif
-%if %suse_version > 1010
BuildRequires: gnokii-devel libopensync-devel pilot-link-devel
-%endif
-%if %suse_version < 1210
-BuildRequires: unsermake
-%endif
-%if %suse_version > 1000
-BuildRequires: gpgme-devel
-%else
-BuildRequires: gpgme libgpg-error-devel
-%endif
-%if %suse_version > 1110
-BuildRequires: gcc43-c++
-%endif
+BuildRequires: gpgme-devel gpg2
License: GPL-2.0
Group: System/GUI/KDE
Summary: Personal Information Manager Software for KDE
Version: 3.5.10
Release: 9
Url: http://www.kde.org/
-Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3` )
-%if %suse_version > 1030
-Requires: suse_help_viewer kdebase3-runtime >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3` )
-%else
-Requires: kdebase3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3` )
-%endif
+Requires: suse_help_viewer
Requires: libkcal2
Provides: kdenetwork3-mail kdepim3-organizer
Obsoletes: kdenetwork3-mail kdepim3-organizer
@@ -73,13 +53,16 @@
Patch122: no-libintl.diff
Patch123: r951202.diff
Patch125: chakra-04_kmail-fancy-currenttime.patch
+Patch126: kdepim-gcc44-fix.patch
+Patch127: kdepim-gcc-fix-call.patch
+Patch128: kdepim-trinity-fix-include.diff
+Patch129: kdepim-gcc-fix-call1.patch
+Patch130: kdepim-gcc-fix-call2.patch
Provides: cryptplug
Obsoletes: cryptplug
-%if %suse_version > 1000
# authentification plugins can be useful
Recommends: cyrus-sasl-crammd5 cyrus-sasl-plain cyrus-sasl-digestmd5 spamassassin
Suggests: kdetoys3
-%endif
%description
This package contains Kontact and the stand-alone applications for
@@ -97,12 +80,6 @@
* Various wizards to connect to groupware servers
-
-
-Authors:
---------
- The KDE Team
-
%package -n libktnef1
License: GPL-2.0
Summary: Library to read TNEF
@@ -111,12 +88,6 @@
%description -n libktnef1
This package contains a library to read the TNEF format.
-
-
-Authors:
---------
- The KDE Team
-
%package -n libkmime2
License: GPL-2.0
Summary: Library to read MIME messages
@@ -125,12 +96,6 @@
%description -n libkmime2
This package contains a library to read MIME messages.
-
-
-Authors:
---------
- The KDE Team
-
%package -n libkmime-devel
License: GPL-2.0
Summary: Library to read MIME messages
@@ -139,12 +104,6 @@
%description -n libkmime-devel
This package contains a library to read MIME messages.
-
-
-Authors:
---------
- The KDE Team
-
%package -n libktnef-devel
License: GPL-2.0
Summary: Library to read TNEF
@@ -154,12 +113,6 @@
%description -n libktnef-devel
This package contains a library to read the TNEF format.
-
-
-Authors:
---------
- The KDE Team
-
%package -n libkcal2
License: GPL-2.0
Summary: Calendaring Classes
@@ -172,12 +125,6 @@
iCalendar formats, which makes use of Qt classes. This library should
be GUI independent and suitable for writing command line applications.
-
-
-Authors:
---------
- The KDE Team
-
%package -n libkcal-devel
License: GPL-2.0
Summary: Calendering Classes
@@ -190,12 +137,6 @@
iCalendar formats, which makes use of Qt classes. This library should
be GUI independent and suitable for writing command line applications.
-
-
-Authors:
---------
- The KDE Team
-
%package -n libkcal
License: GPL-2.0
Summary: Calendaring Classes
@@ -208,12 +149,6 @@
iCalendar formats, which makes use of Qt classes. This library should
be GUI independent and suitable for writing command line applications.
-
-
-Authors:
---------
- The KDE Team
-
%package devel
License: GPL-2.0
Provides: kdenetwork3-devel = 3.2.1
@@ -225,12 +160,6 @@
%description devel
This package contains tools for address and date organization.
-
-
-Authors:
---------
- The KDE Team
-
%package mobile
License: LGPL-2.0.1 or later
# usesubdirs kandy kmobile
@@ -246,12 +175,6 @@
* KAddressbook plug-in to import and export addresses via gnokii (Nokia
cell phones)
-
-
-Authors:
---------
- The KDE Team
-
%package time-management
License: GPL-2.0
# usesubdirs karm konsolekalendar kalarm
@@ -263,13 +186,6 @@
This package contains tools for address and date organisation.
-
-Authors:
---------
- The KDE Team
-
-%if %suse_version > 1010
-
%package kpilot
License: LGPL-2.0.1 or later
# usesubdirs kpilot
@@ -280,8 +196,6 @@
With this software your Linux box can communicate with your 3COM Palm
Pilot via the Palm Cradle.
-%endif
-
%package notes
License: GPL-2.0
Summary: Note taking application
@@ -292,8 +206,6 @@
%description notes
This package contains the notes application KNotes.
-%if %suse_version > 1010
-
%package -n kitchensync
License: GPL-2.0; LGPL-2.0.1 or later
Summary: KDE Synchronization application based on OpenSync
@@ -308,8 +220,6 @@
and other Personal Information Manager with KDE PIM (KAddressbook,
KOrganizer, KNotes).
-%endif
-
%prep
%setup -q -n kdepim-%version
%patch0
@@ -332,13 +242,15 @@
%patch122
%patch123
%patch125 -p1
+%patch126 -p1
+%patch127 -p1
+%patch128 -p1
+%patch129 -p1
+%patch130 -p1
. /etc/opt/kde3/common_options
update_admin
%build
-export CC=gcc-4.3
-export CXX=g++-4.3
-
. /etc/opt/kde3/common_options
export CXXFLAGS="$CXXFLAGS -Wl,--add-needed"
configopts="--disable-final"
@@ -357,9 +269,6 @@
rm $RPM_BUILD_ROOT/opt/kde3/share/applnk/Utilities/kmailcvt.desktop
#rm $RPM_BUILD_ROOT/opt/kde3/share/services/kontact/multisynk.desktop
rm -rf $RPM_BUILD_ROOT/opt/kde3/share/doc/HTML/en/multisynk
-%if %suse_version < 1020
-rm -rf $RPM_BUILD_ROOT/opt/kde3/share/doc/HTML/en/kpilot
-%endif
%suse_update_desktop_file -r korganizer Office Calendar
%suse_update_desktop_file -r kalarm Utility TimeUtility X-KDE-Utilities-PIM
%suse_update_desktop_file -r karm Utility TimeUtility X-KDE-Utilities-PIM
@@ -369,24 +278,19 @@
%suse_update_desktop_file -r KOrn Utility Applet X-KDE-More
%suse_update_desktop_file KNode
%suse_update_desktop_file -r Kontact Office Core-Office
-%if %suse_version > 1010
%suse_update_desktop_file -r kpilot Utility PDA SyncUtility X-KDE-Utilities-Peripherals
%suse_update_desktop_file -u -r kpalmdoc Utility PDA X-KDE-Utilities-File
-%endif
%suse_update_desktop_file -u ktnef Network Email
%suse_update_desktop_file -r groupwarewizard Utility DesktopSettings X-KDE-Utilities-PIM
%suse_update_desktop_file -r kandy Utility Telephony X-KDE-Utilities-Peripherals
%suse_update_desktop_file -r akregator Network RSS-News
-%if %suse_version > 1010
%suse_update_desktop_file kitchensync Utility X-SuSE-SyncUtility
-%endif
kde_post_install
%fdupes $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
-%if %suse_version > 1010
%post -n libktnef1 -p /sbin/ldconfig
@@ -403,13 +307,11 @@
%post kpilot -p /sbin/ldconfig
%postun kpilot -p /sbin/ldconfig
-%endif
-%if %suse_version > 1010
%post -n kitchensync -p /sbin/ldconfig
%postun -n kitchensync -p /sbin/ldconfig
-%endif
+
%files
%defattr(-,root,root)
@@ -542,9 +444,7 @@
/opt/kde3/%_lib/kde3/kcm_knode.*
/opt/kde3/%_lib/kde3/kcm_kontactsummary.*
/opt/kde3/%_lib/kde3/kio_mbox.*
-%if %suse_version > 1010
/opt/kde3/%_lib/kde3/kfile_palm.*
-%endif
/opt/kde3/%_lib/kde3/libegroupwarewizard.*
/opt/kde3/%_lib/kde3/libkmail_*
/opt/kde3/%_lib/kde3/libsloxwizard.*
@@ -738,11 +638,8 @@
/opt/kde3/share/apps/kandy
/opt/kde3/share/config.kcfg/kandy.kcfg
/opt/kde3/share/services/kaddressbook/gnokii_xxport.desktop
-%if %suse_version > 1010
/opt/kde3/%_lib/kde3/libkaddrbk_gnokii_xxport.*
-%endif
%doc %lang(en) /opt/kde3/share/doc/HTML/en/kandy
-%if %suse_version > 1010
%files kpilot
%defattr(-,root,root)
@@ -781,11 +678,8 @@
/opt/kde3/share/services/notepad-conduit.desktop
/opt/kde3/share/services/memofile-conduit.desktop
%doc %lang(en) /opt/kde3/share/doc/HTML/en/kpilot
-%if %suse_version > 1010
/opt/kde3/share/config.kcfg/malconduit.kcfg
/opt/kde3/share/services/mal_conduit.desktop
-%endif
-%endif
%files time-management
%defattr(-,root,root)
@@ -937,11 +831,8 @@
/opt/kde3/%_lib/libkaddressbook.so
/opt/kde3/%_lib/libkcal_groupdav.la
/opt/kde3/%_lib/libkcal_groupwise.la
-%if %suse_version > 1010
/opt/kde3/%_lib/libkpilot.la
/opt/kde3/%_lib/libkpilot.so
-%endif
-%if %suse_version > 1010
%files -n kitchensync
%defattr(-,root,root)
@@ -958,6 +849,5 @@
%dir /opt/kde3/share/apps/kitchensync/icons
/opt/kde3/share/apps/kitchensync/icons/*
/opt/kde3/share/icons/*/*/*/kitchensync.*
-%endif
%changelog
++++++ kdepim-gcc-fix-call.patch ++++++
diff -wruN kdepim-3.5.10.orig/konsolekalendar/main.cpp kdepim-3.5.10/konsolekalendar/main.cpp
--- kdepim-3.5.10.orig/konsolekalendar/main.cpp 2008-02-13 12:39:54.000000000 +0300
+++ kdepim-3.5.10/konsolekalendar/main.cpp 2011-12-01 11:47:35.425640484 +0400
@@ -799,13 +799,13 @@
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 @@
// 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;
++++++ kdepim-gcc-fix-call1.patch ++++++
diff -wruN kdepim-3.5.10.orig/kontact/plugins/korganizer/summarywidget.cpp kdepim-3.5.10/kontact/plugins/korganizer/summarywidget.cpp
--- kdepim-3.5.10.orig/kontact/plugins/korganizer/summarywidget.cpp 2008-02-13 12:39:52.000000000 +0300
+++ kdepim-3.5.10/kontact/plugins/korganizer/summarywidget.cpp 2011-12-01 12:56:20.748463914 +0400
@@ -167,7 +167,7 @@
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 @@
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" )
++++++ kdepim-gcc-fix-call2.patch ++++++
diff -wruN kdepim-3.5.10.orig/kontact/plugins/specialdates/sdsummarywidget.cpp kdepim-3.5.10/kontact/plugins/specialdates/sdsummarywidget.cpp
--- kdepim-3.5.10.orig/kontact/plugins/specialdates/sdsummarywidget.cpp 2006-10-01 21:30:38.000000000 +0400
+++ kdepim-3.5.10/kontact/plugins/specialdates/sdsummarywidget.cpp 2011-12-01 13:56:04.764590871 +0400
@@ -438,7 +438,7 @@
//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 ) {
diff -wruN kdepim-3.5.10.orig/kontact/plugins/specialdates/sdsummarywidget.h kdepim-3.5.10/kontact/plugins/specialdates/sdsummarywidget.h
--- kdepim-3.5.10.orig/kontact/plugins/specialdates/sdsummarywidget.h 2006-01-19 19:56:12.000000000 +0300
+++ kdepim-3.5.10/kontact/plugins/specialdates/sdsummarywidget.h 2011-12-01 13:56:36.671354360 +0400
@@ -78,7 +78,7 @@
bool mShowHolidays;
bool mShowSpecialsFromCal;
- KHolidays::KHolidays *mHolidays;
+ KHolidays *mHolidays;
};
#endif
++++++ kdepim-gcc44-fix.patch ++++++
diff -wruN kdepim-3.5.10.orig/indexlib/memvector.tcc kdepim-3.5.10/indexlib/memvector.tcc
--- kdepim-3.5.10.orig/indexlib/memvector.tcc 2008-02-13 12:39:38.000000000 +0300
+++ kdepim-3.5.10/indexlib/memvector.tcc 2011-12-01 10:56:40.170071841 +0400
@@ -30,10 +30,11 @@
void memvector<T>::resize( size_type n_s ) {
if ( size() >= n_s ) return;
- data_->resize( n_s * byte_io::byte_lenght() + byte_io::byte_lenght<unsigned>() );
+ using namespace byte_io;
+ data_->resize( n_s * byte_lenght() + byte_lenght<unsigned>() ); if ( size() >= n_s ) return;
iterator p_end = end();
- byte_io::write<unsigned>( data_->rw_base( 0 ), n_s );
- while ( operator !=(p_end, end()) ) {
+ write( data_->rw_base( 0 ), n_s );
+ while ( p_end != end() ) {
*p_end = value_type();
++p_end;
++++++ kdepim-trinity-fix-include.diff ++++++
commit 42c6ef8e5041733f6eaed7a133802e63ee1c05e5
Author: tpearson
Date: 1303525044 +0000
Attempt to fix a kdepim FTBFS based on a missing stdc header #include
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1228885 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
diff --git a/indexlib/memvector.h b/indexlib/memvector.h
index 680d287..d4cc446 100644
--- a/indexlib/memvector.h
+++ b/indexlib/memvector.h
@@ -43,6 +43,7 @@
#include <iostream>
#include <iterator>
#include <string>
+#include <cstddef>
#include <cstring>
#include
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org