Hello community, here is the log from the commit of package kdepimlibs4 for openSUSE:Factory checked in at Thu Aug 4 14:58:11 CEST 2011.
-------- --- KDE/kdepimlibs4/kdepimlibs4.changes 2011-07-22 20:20:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdepimlibs4/kdepimlibs4.changes 2011-08-04 10:53:40.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Aug 4 08:50:48 UTC 2011 - [email protected] + +- Add kdepimlibs-4.7-branch.patch, sync with 4.7 branch + * Possible crash fixes + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- kdepimlibs-4.7-branch.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepimlibs4.spec ++++++ --- /var/tmp/diff_new_pack.Z1l66b/_old 2011-08-04 14:57:19.000000000 +0200 +++ /var/tmp/diff_new_pack.Z1l66b/_new 2011-08-04 14:57:19.000000000 +0200 @@ -19,7 +19,7 @@ Name: kdepimlibs4 Version: 4.7.0 -Release: 1 +Release: 2 License: LGPLv2.1+ Summary: KDE PIM Libraries Url: http://www.kde.org @@ -34,6 +34,7 @@ BuildRequires: libkde4-devel >= %{version} BuildRequires: libprison-devel BuildRequires: openldap2-devel +Patch0: kdepimlibs-4.7-branch.patch Requires: kdelibs4 >= %( echo `rpm -q --queryformat '%{VERSION}' libkde4-devel`) Requires: libkdepimlibs4 = %{version} Recommends: cyrus-sasl-crammd5 @@ -49,6 +50,7 @@ %prep %setup -q -n kdepimlibs-%{version} +%patch0 -p1 %build %cmake_kde4 -d build -- -DKDE4_ENABLE_FINAL=1 ++++++ kdepimlibs-4.7-branch.patch ++++++ diff --git a/kcalcore/icalformat_p.cpp b/kcalcore/icalformat_p.cpp index 855c8ed..4a63dea 100644 --- a/kcalcore/icalformat_p.cpp +++ b/kcalcore/icalformat_p.cpp @@ -72,8 +72,9 @@ template <typename K> void removeAllICal( QVector< QSharedPointer<K> > &c, const QSharedPointer<K> &x ) { if ( c.count( x ) != 1 ) { - qDebug() << "The size of the vector is " << c.count(); + qCritical() << "The size of the vector is " << c.count(); Q_ASSERT_X( false, "removeAllICal", "Count is not 1." ); + return; } c.remove( c.indexOf( x ) ); diff --git a/kioslave/mbox/readmbox.cpp b/kioslave/mbox/readmbox.cpp index c6bcdb0..2473889 100644 --- a/kioslave/mbox/readmbox.cpp +++ b/kioslave/mbox/readmbox.cpp @@ -192,7 +192,7 @@ void ReadMBox::close() if( m_prev_time ) { utime( QFile::encodeName( m_info->filename() ), m_prev_time ); - delete m_prev_time; + delete m_prev_time; m_prev_time = 0; } } diff --git a/kpimidentities/identity.cpp b/kpimidentities/identity.cpp index d4b996a..636a9c2 100644 --- a/kpimidentities/identity.cpp +++ b/kpimidentities/identity.cpp @@ -79,7 +79,7 @@ bool Identity::isNull() const while ( i != mPropertiesMap.constEnd() ) { // Take into account that the dictionary for a null identity is not empty - if ( i.key() == s_dict && dictionary() == Sonnet::defaultLanguageName() ) { + if ( i.key() == s_dict ) { ++i; continue; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
