[SCM] Amarok packaging branch, master, updated. debian/2.4.3-1

Modestas Vainius modax at alioth.debian.org
Sat Jul 30 16:13:26 UTC 2011


The following commit has been merged in the master branch:
commit 8f74dff05e46ad8daaeff8dca0427dd2ec5da305
Author: Modestas Vainius <modax at debian.org>
Date:   Sat Jul 30 17:55:57 2011 +0300

    Add upstream_fix_lyrics_autorefresh_in_some_cases.patch to fix lyrics autorefresh in some cases.
---
 debian/changelog                                   |    2 +
 debian/patches/series                              |    1 +
 ...ream_fix_lyrics_autorefresh_in_some_cases.patch |   34 ++++++++++++++++++++
 3 files changed, 37 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8bd8f33..0c58e15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ amarok (2.4.3-0r1) UNRELEASED; urgency=low
   * Switch Vcs-* field to kde-extras repository. (Closes: #635292)
   * Drop backport_no_kwallet_prompt_on_track_change.patch and
     backport_arm_build_fix.patch - integrated upstream.
+  * Add upstream_fix_lyrics_autorefresh_in_some_cases.patch to fix lyrics
+    autorefresh in some cases.
 
  -- Modestas Vainius <modax at debian.org>  Sun, 24 Jul 2011 22:38:44 +0300
 
diff --git a/debian/patches/series b/debian/patches/series
index d784895..7588d01 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+upstream_fix_lyrics_autorefresh_in_some_cases.patch
 debian_disable_qtscriptbindings_check_fix.diff
 debian_mysqle_amarok_local_errmsg_feature.diff
diff --git a/debian/patches/upstream_fix_lyrics_autorefresh_in_some_cases.patch b/debian/patches/upstream_fix_lyrics_autorefresh_in_some_cases.patch
new file mode 100644
index 0000000..f5f85f4
--- /dev/null
+++ b/debian/patches/upstream_fix_lyrics_autorefresh_in_some_cases.patch
@@ -0,0 +1,34 @@
+From: Modestas Vainius <modax at debian.org>
+Date: Thu, 28 Jul 2011 16:02:26 +0300
+Subject: [PATCH] Fix lyrics autorefresh in some cases.
+Forwarded: http://git.reviewboard.kde.org/r/102110/
+Origin: vendor
+
+There were some issues mostly when playing streams. Lyrics would stuck with
+empty text and wouldn't autorefresh until the track was changed or manually
+refreshed. That's because cachedLyrics() is always empty for streams. Therefore
+it makes sense to additionally check if either artist or track title have
+changed as well.
+---
+ src/context/engines/lyrics/LyricsEngine.cpp |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/src/context/engines/lyrics/LyricsEngine.cpp b/src/context/engines/lyrics/LyricsEngine.cpp
+index 2abeb6d..e6188fc 100644
+--- a/src/context/engines/lyrics/LyricsEngine.cpp
++++ b/src/context/engines/lyrics/LyricsEngine.cpp
+@@ -66,7 +66,10 @@ void LyricsEngine::onTrackMetadataChanged( Meta::TrackPtr track )
+     DEBUG_BLOCK
+ 
+     // Only update if the lyrics have changed.
+-    if( m_prevLyrics.text != track->cachedLyrics() )
++    QString artist = track->artist() ? track->artist()->name() : QString();
++    if( m_prevLyrics.artist != artist ||
++        m_prevLyrics.title != track->name() ||
++        m_prevLyrics.text != track->cachedLyrics() )
+         update();
+ }
+ 
+-- 
+1.7.5.4
+

-- 
Amarok packaging



More information about the pkg-kde-commits mailing list