[clementine/f13/master] * Thu Aug 05 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 0.4.2-7 - Fix crash on lastfm t

[Orcan Ogetbil]

commit 3ae1b3e93d06f5e53984d4ccba63d8c1f6d54e4c
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Thu Aug 5 19:07:05 2010 -0400

    * Thu Aug 05 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 0.4.2-7
    - Fix crash on lastfm tree RHBZ#618474

 clementine-fix-lastfm-crash.patch |   24 ++++++++++++++++++++++++
 clementine.spec                   |   20 +++++++++++++++-----
 2 files changed, 39 insertions(+), 5 deletions(-)
---
diff --git a/clementine-fix-lastfm-crash.patch b/clementine-fix-lastfm-crash.patch
new file mode 100644
index 0000000..ae2ea57
--- /dev/null
+++ b/clementine-fix-lastfm-crash.patch
@@ -0,0 +1,24 @@
+diff -rupN clementine-0.4.2.old/src/core/simpletreeitem.h clementine-0.4.2/src/core/simpletreeitem.h
+--- clementine-0.4.2.old/src/core/simpletreeitem.h	2010-07-01 14:16:36.000000000 -0400
++++ clementine-0.4.2/src/core/simpletreeitem.h	2010-08-05 09:10:18.000000000 -0400
+@@ -121,12 +121,14 @@ void SimpleTreeItem<T>::DeleteNotify(int
+ 
+ template <typename T>
+ void SimpleTreeItem<T>::ClearNotify() {
+-  model->BeginDelete(static_cast<T*>(this), 0, children.count()-1);
+-
+-  qDeleteAll(children);
+-  children.clear();
+-
+-  model->EndDelete();
++  if (children.count()) {
++    model->BeginDelete(static_cast<T*>(this), 0, children.count()-1);
++    
++    qDeleteAll(children);
++    children.clear();
++    
++    model->EndDelete();
++  }
+ }
+ 
+ template <typename T>
diff --git a/clementine.spec b/clementine.spec
index bdaa23f..3a69ca7 100644
--- a/clementine.spec
+++ b/clementine.spec
@@ -1,13 +1,13 @@
 Name:           clementine
 Version:        0.4.2
-Release:        5%{?dist}
+Release:        7%{?dist}
 Summary:        A music player and library organizer
 
 Group:          Applications/Multimedia
 License:        GPLv3+ and GPLv2+
 URL:            http://code.google.com/p/clementine-player
 Source0:        http://clementine-player.googlecode.com/files/%{name}-%{version}.tar.gz
-# The following patches 0-3 are from the upstream trunk
+# The following patches 0-4 are from the upstream trunk
 # Fix trailing semicolon
 # http://code.google.com/p/clementine-player/source/detail?r=1486
 Patch0:         clementine-desktop-fix.patch
@@ -18,9 +18,8 @@ Patch1:         clementine-system-projectM.patch
 Patch2:         clementine-system-qtsingleapplication.patch
 # http://code.google.com/p/clementine-player/source/detail?r=1445
 Patch3:         clementine-system-qtiocompressor.patch
-# Also split qxt. This is still under discussion with upstream
-# http://code.google.com/p/clementine-player/issues/detail?id=291
-# comments 23 and after
+# Also split qxt. Patch accepted by upstream
+#http://code.google.com/p/clementine-player/source/detail?r=1512
 Patch4:         clementine-system-qxt.patch
 # We need to pass the font paths to the Renderer constructor of libprojectM.
 # Otherwise ftgl library segfaults. Note that this is not a problem if projectM
@@ -28,6 +27,10 @@ Patch4:         clementine-system-qxt.patch
 # details on this at
 # http://code.google.com/p/clementine-player/issues/detail?id=291#c22
 Patch5:         clementine-font-paths.patch
+# Fix lastFM crash RHBZ#618474
+# http://code.google.com/p/clementine-player/issues/detail?id=463
+# From upstream trunk
+Patch6:         clementine-fix-lastfm-crash.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  boost-devel
@@ -64,6 +67,7 @@ advantage of Qt4.
 %patch3 -p1 -b .qtiocompressor
 %patch4 -p1 -b .qxt
 %patch5 -p1 -b .fontpaths
+%patch6 -p1 -b .fix.lastfm.crash
 
 # We already don't use these but just to make sure
 rm -fr 3rdparty/gmock
@@ -129,6 +133,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Thu Aug 05 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 0.4.2-7
+- Fix crash on lastfm tree RHBZ#618474
+
+* Tue Jul 27 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 0.4.2-6
+- Rebuild against new boost on F-14
+
 * Fri Jul 23 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 0.4.2-5
 - Add missing scriptlets