Date: Wednesday, September 11, 2013 @ 04:12:51 Author: bgyorgy Revision: 97031
upgpkg: kmess 2.0.6.2-4 Fix crash in ContactListModel (FS#32402) Added: kmess/trunk/fix-crash-in-contactlistmodel.patch Modified: kmess/trunk/PKGBUILD -------------------------------------+ PKGBUILD | 11 ++++++++--- fix-crash-in-contactlistmodel.patch | 29 +++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-09-11 01:28:37 UTC (rev 97030) +++ PKGBUILD 2013-09-11 02:12:51 UTC (rev 97031) @@ -5,7 +5,7 @@ pkgname=kmess pkgver=2.0.6.2 -pkgrel=3 +pkgrel=4 pkgdesc="A MSN Messenger client for Linux" arch=('i686' 'x86_64') url='http://kmess.sourceforge.net/' @@ -15,9 +15,11 @@ optdepends=('cabextract: provides winks support') install=${pkgname}.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.bz2" - giflib-5.0.patch) + giflib-5.0.patch + fix-crash-in-contactlistmodel.patch) md5sums=('a2e57911713308bef81b9347135cc5dd' - '97734b073bf4a45ed3612d7626541cee') + '97734b073bf4a45ed3612d7626541cee' + 'fdfe837f4bd64a5123edc63019bd5cf2') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -26,6 +28,9 @@ find -name '*.png' -exec optipng -quiet -force -fix {} + patch -Np1 -i ../giflib-5.0.patch + + # Fix crash in ContactListModel (FS#32402) + patch -Np1 -i ../fix-crash-in-contactlistmodel.patch } build() { Added: fix-crash-in-contactlistmodel.patch =================================================================== --- fix-crash-in-contactlistmodel.patch (rev 0) +++ fix-crash-in-contactlistmodel.patch 2013-09-11 02:12:51 UTC (rev 97031) @@ -0,0 +1,29 @@ +commit e10ebb8bd33cf807e2edfa56c465b40f3237102e +Author: Ruben Vandamme <ru...@kmess.org> +Date: Sun Jul 8 10:56:37 2012 +0200 + + Fix crash in ContactListModel. + + * Individually delete every child instead of using qDeleteAll. + * Crash only happens in combination with Qt 4.8. + * See https://bugs.kde.org/show_bug.cgi?id=285951 for similar issue in Amarok. + * See https://bugreports.qt-project.org/browse/QTBUG-22037 for Qt report. + * Many thanks to Bob ("badjar" on kmess.org/board) for providing the fix. + +diff --git a/src/model/contactlistmodelitem.cpp b/src/model/contactlistmodelitem.cpp +index 462d555..ac5a6ca 100644 +--- a/src/model/contactlistmodelitem.cpp ++++ b/src/model/contactlistmodelitem.cpp +@@ -79,7 +79,11 @@ ContactListModelItem::ContactListModelItem( Group *group, ContactListModelItem * + */ + ContactListModelItem::~ContactListModelItem() + { +- qDeleteAll( childItems_ ); ++ while( !childItems_.isEmpty() ) ++ { ++ delete childItems_.takeFirst(); ++ } ++ + childItems_.clear(); + + // Delete this item from the parent's children