Hello community,
here is the log from the commit of package amarok for openSUSE:Factory checked in at 2011-12-01 12:23:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/amarok (Old)
and /work/SRC/openSUSE:Factory/.amarok.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "amarok", Maintainer is "kde-maintainers@suse.de"
Changes:
--------
--- /work/SRC/openSUSE:Factory/amarok/amarok.changes 2011-11-07 14:07:41.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.amarok.new/amarok.changes 2011-12-01 12:23:35.000000000 +0100
@@ -1,0 +2,29 @@
+Wed Nov 30 14:00:38 UTC 2011 - mlin@suse.com
+
+- Add amarok-fix-infinite-loop-eating-CPU.diff
+ * Fix infinite loop in context view eating CPU until main
+ window is shown (bnc#733421)
+
+-------------------------------------------------------------------
+Tue Nov 15 23:37:39 UTC 2011 - tittiatcoke@gmail.com
+
+- Update to 2.5 Beta 1 (2.4.90)
+ * New "equals" match in collection filter
+ * Enable dropping tracks on empty area in Saved Playlists to
+ create new playlist.
+ * Added a "create new playlist" action in the empty space of the
+ Saved Playlists. (bko#202725)
+ * Add new type of optional tokens in format string
+ (Collection Organizer) (bko#264874)
+ * Music store based on the Amazon catalogue.
+ * Auto-save the playlist so that it is not lost if Amarok
+ crashes.
+ * Both Delete and Move to Trash actions are now offered in the
+ collection browser context menu. (bko#286356)
+ * New USB Mass Storage media-device plugin using the Amarok
+ Collection Scanner.
+ * Playlist: Don't group albums without name. (bko#243344)
+ * Total rewrite of Automated Playlist Generator algorithm.
+ * Several bugfixes
+
+-------------------------------------------------------------------
Old:
----
amarok-2.4.3.tar.bz2
New:
----
amarok-2.4.90.tar.bz2
amarok-fix-infinite-loop-eating-CPU.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ amarok.spec ++++++
--- /var/tmp/diff_new_pack.KKe69Z/_old 2011-12-01 12:23:38.000000000 +0100
+++ /var/tmp/diff_new_pack.KKe69Z/_new 2011-12-01 12:23:38.000000000 +0100
@@ -19,20 +19,22 @@
%bcond_with ffmpeg
Name: amarok
-Version: 2.4.3
-Release: 4
+Version: 2.4.90
+Release: 1
Summary: Media Player for KDE
License: GPLv2+
Url: http://amarok.kde.org/
Group: Productivity/Multimedia/Sound/Players
-Source0: ftp://ftp.kde.org/pub/kde/stable/amarok/%{version}/src/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/unstable/amarok/%{version}/src/%{name}-%{version}.tar.bz2
# PATCH-FEATURE-OPENSUSE ksuseinstall.diff llunak@novell.com -- Support for on-demand codecs install using ksuseinstall
Patch1: ksuseinstall.diff
# PATCH-FIX-OPENSUSE initial-preference.diff bnc#605522 llunak@novell.com -- Increase initial preference to be used for audio files instead of Kaffeine
Patch2: initial-preference.diff
# PATCH-FIX-OPENSUSE flac_mimetype_bnc671581.diff bnc#671581 ctrippe@gmx.net -- Support for the changed mimetype for flac files
Patch3: flac_mimetype_bnc671581.diff
+# PATCH-FIX-UPSTREAM amarok-fix-infinite-loop-eating-CPU.diff bnc#733421 mlin@suse.com -- Fix infinite loop in context view eating CPU until main window is shown
+Patch4: amarok-fix-infinite-loop-eating-CPU.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# Required for the fdupes macro
@@ -50,18 +52,18 @@
%endif
BuildRequires: libgcrypt-devel
BuildRequires: libgpod-devel >= 0.7.0
-BuildRequires: libkde4-devel
+BuildRequires: libkde4-devel >= 4.6.0
BuildRequires: libksuseinstall-devel
BuildRequires: liblastfm-devel
BuildRequires: libmtp-devel
-BuildRequires: libmygpo-qt-devel
+BuildRequires: libmygpo-qt-devel >= 1.0.5
BuildRequires: libmysqlclient-devel
BuildRequires: libmysqld-devel
BuildRequires: libopenssl-devel
BuildRequires: libqca2-devel
BuildRequires: libqjson-devel
BuildRequires: loudmouth-devel
-BuildRequires: mysql
+BuildRequires: mysql-community-server
BuildRequires: qt4-qtscript
BuildRequires: taglib-devel
BuildRequires: taglib-extras-devel
@@ -93,6 +95,7 @@
%if 0%{?suse_version} > 1130
%patch3
%endif
+%patch4 -p1
# Remove build time references so build-compare can do its work
FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
++++++ amarok-2.4.3.tar.bz2 -> amarok-2.4.90.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/amarok/amarok-2.4.3.tar.bz2 /work/SRC/openSUSE:Factory/.amarok.new/amarok-2.4.90.tar.bz2 differ: char 11, line 1
++++++ amarok-fix-infinite-loop-eating-CPU.diff ++++++
commit 79bd9a7c6777e3f5d4e723bc5d3b00e5d6fe532b
Author: Matěj Laitl
Date: Sun Nov 27 15:24:55 2011 +0100
Fix infinite loop in context view eating CPU until main window is shown
We used to use _scene_ sceneRect in
VerticalToolbarContainment::updateGeometry() to update applets and
geometry, but that leaded to infinite loop (across mainloop) -
m_applets->setGeometry(), refresh() would enlarge _scene_ sceneRect by
a few pixels which would trigger updateGeometry() and so on...
We now use _view_ sceneRect to update geometry. Rick W. Chen discovered
some glitches in applet collapsing when this patch is applied, but he
has a patch for that in the works and this is more serious problem, so
pushing this.
REVIEW: 103271
BUG: 278897
FIXED-IN: 2.5
Index: amarok-2.4.90/src/context/containments/verticallayout/VerticalToolbarContainment.cpp
===================================================================
--- amarok-2.4.90.orig/src/context/containments/verticallayout/VerticalToolbarContainment.cpp
+++ amarok-2.4.90/src/context/containments/verticallayout/VerticalToolbarContainment.cpp
@@ -118,7 +118,18 @@ void
Context::VerticalToolbarContainment::updateGeometry()
{
Context::Containment::updateGeometry();
- QRectF rect = scene()->sceneRect();
+
+ /* We used to use _scene_ sceneRect here to update applets and geomtery, but that
+ * leaded to infinite loop (across mainloop) - see bug 278897.
+ * (m_applets->setGeometry(), refresh() would enlarge _scene_ sceneRect by a few
+ * pixels which would trigger updateGeometry() and so on...)
+ *
+ * We now use _view_ sceneRect to update geometry and do nothing without a view
+ */
+ if(!view())
+ return;
+
+ QRectF rect = view()->sceneRect();
setGeometry( rect );
m_applets->setGeometry( rect );
m_applets->refresh();
++++++ flac_mimetype_bnc671581.diff ++++++
--- /var/tmp/diff_new_pack.KKe69Z/_old 2011-12-01 12:23:38.000000000 +0100
+++ /var/tmp/diff_new_pack.KKe69Z/_new 2011-12-01 12:23:38.000000000 +0100
@@ -1,6 +1,6 @@
--- src/amarok.desktop 2011-01-11 16:58:05.000000000 +0100
+++ src/amarok.desktop_patched 2011-02-15 21:44:08.000000000 +0100
-@@ -176,7 +176,7 @@
+@@ -183,7 +183,7 @@
Icon=amarok
# Add pure audio formats here, for other formats see amarok_*.desktop files
# See bug 242292
++++++ initial-preference.diff ++++++
--- /var/tmp/diff_new_pack.KKe69Z/_old 2011-12-01 12:23:38.000000000 +0100
+++ /var/tmp/diff_new_pack.KKe69Z/_new 2011-12-01 12:23:38.000000000 +0100
@@ -2,7 +2,7 @@
===================================================================
--- src/amarok.desktop.orig
+++ src/amarok.desktop
-@@ -180,5 +180,6 @@ MimeType=audio/aac;audio/mp4;audio/mpeg;
+@@ -187,5 +187,6 @@
X-DocPath=amarok/index.html
X-KDE-Keywords=music,podcast
X-KDE-Protocols=http
++++++ ksuseinstall.diff ++++++
--- /var/tmp/diff_new_pack.KKe69Z/_old 2011-12-01 12:23:38.000000000 +0100
+++ /var/tmp/diff_new_pack.KKe69Z/_new 2011-12-01 12:23:38.000000000 +0100
@@ -1,7 +1,7 @@
-diff -uNr amarok-2.4.3.orig/src/CMakeLists.txt amarok-2.4.3/src/CMakeLists.txt
---- amarok-2.4.3.orig/src/CMakeLists.txt 2011-07-28 16:04:45.000000000 +0300
-+++ amarok-2.4.3/src/CMakeLists.txt 2011-08-01 20:24:43.751000029 +0300
-@@ -918,6 +918,7 @@
+diff -urB amarok-2.4.90/src/CMakeLists.txt new/src/CMakeLists.txt
+--- amarok-2.4.90/src/CMakeLists.txt 2011-11-14 12:26:13.000000000 +0100
++++ new/src/CMakeLists.txt 2011-11-16 00:30:36.752709749 +0100
+@@ -934,6 +934,7 @@
amarokcore
amarokocsclient
amarok-transcoding
@@ -9,9 +9,10 @@
)
if( TAGLIB_FOUND )
-diff -uNr amarok-2.4.3.orig/src/EngineController.cpp amarok-2.4.3/src/EngineController.cpp
---- amarok-2.4.3.orig/src/EngineController.cpp 2011-07-28 16:04:45.000000000 +0300
-+++ amarok-2.4.3/src/EngineController.cpp 2011-08-01 20:28:18.760000029 +0300
+Only in new/src: CMakeLists.txt.orig
+diff -urB amarok-2.4.90/src/EngineController.cpp new/src/EngineController.cpp
+--- amarok-2.4.90/src/EngineController.cpp 2011-11-14 12:26:13.000000000 +0100
++++ new/src/EngineController.cpp 2011-11-16 00:30:36.753709749 +0100
@@ -54,6 +54,8 @@
#include <QTextDocument>
#include
@@ -21,7 +22,7 @@
namespace The {
EngineController* engineController() { return EngineController::instance(); }
}
-@@ -280,6 +282,7 @@
+@@ -300,6 +302,7 @@
bool
EngineController::installDistroCodec()
{
@@ -29,7 +30,7 @@
KService::List services = KServiceTypeTrader::self()->query( "Amarok/CodecInstall"
, QString( "[X-KDE-Amarok-codec] == 'mp3' and [X-KDE-Amarok-engine] == 'phonon-%1'").arg( "xine" ) );
//todo - figure out how to query Phonon for the current backend loaded
-@@ -289,6 +292,12 @@
+@@ -309,6 +312,12 @@
QString installScript = service->exec();
if( !installScript.isNull() ) //just a sanity check
{
@@ -42,7 +43,7 @@
KGuiItem installButton( i18n( "Install MP3 Support" ) );
if(KMessageBox::questionYesNo( The::mainWindow()
, i18n("Amarok currently cannot play MP3 files. Do you want to install support for MP3?")
-@@ -297,11 +306,29 @@
+@@ -317,11 +326,29 @@
, KStandardGuiItem::no()
, "codecInstallWarning" ) == KMessageBox::Yes )
{
@@ -72,3 +73,4 @@
return false;
}
+Only in new/src: EngineController.cpp.orig
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org