[rpms/amarok] epel10.2: drop already-included qtwebkit/wikipedia fixer

[rpms/amarok] epel10.2: drop already-included qtwebkit/wikipedia fixer

[Rex Dieter]

A new commit has been pushed.

Repo   : rpms/amarok
Branch : epel10.2
Commit : 38754a97ca206d5d4766bbb67fdee5ba930e4dcf
Author : Rex Dieter <rdieter@fedoraproject.org>
Date   : 2013-05-17T07:00:05-05:00
Stats  : +4/-58 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/amarok/c/38754a97ca206d5d4766bbb67fdee5ba930e4dcf?branch=epel10.2

Log:
drop already-included qtwebkit/wikipedia fixer

---
diff --git a/0263-Fix-crashes-on-track-change-both-with-Phonon-GStream.patch b/0263-Fix-crashes-on-track-change-both-with-Phonon-GStream.patch
deleted file mode 100644
index 215e747..0000000
--- a/0263-Fix-crashes-on-track-change-both-with-Phonon-GStream.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From d13bd61842627ffb2382b5d59a020ea7a5124ca5 Mon Sep 17 00:00:00 2001
-From: Mark Kretschmann <kretschmann@kde.org>
-Date: Wed, 8 May 2013 12:29:52 +0200
-Subject: [PATCH 263/289] Fix crashes on track change (both with
- Phonon-GStreamer and Phonon-VLC).
-
-What happened:
-
-The Wikipedia applet uses QtWebKit for HTML rendering. On
-Linux, QtWebKit uses GStreamer for media playback. Turns out that this crashes
-with a high probability whenever an <audio> tag is present on a web page. As
-music artists' pages often contain audio snippets in Vorbis format, it crashed
-a lot when Amarok's applet rendered a page.
-
-The fix:
-
-Removing all audio tags from Wikipedia pages before rendering them in our applet.
-Of course, the real fix would have to be done upstream. But until that happens, our
-workaround here fixes a shitload of crashes.
-
-We might want to do a 2.7.1 release for Linux, with this patch.
-
-CCMAIL: amarok-devel@kde.org
----
- src/context/engines/wikipedia/WikipediaEngine.cpp | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/src/context/engines/wikipedia/WikipediaEngine.cpp b/src/context/engines/wikipedia/WikipediaEngine.cpp
-index 94910e7..0692b8d 100644
---- a/src/context/engines/wikipedia/WikipediaEngine.cpp
-+++ b/src/context/engines/wikipedia/WikipediaEngine.cpp
-@@ -818,6 +818,20 @@ WikipediaEnginePrivate::wikiParse( QString &wiki )
-         }
-     }
- 
-+    { // remove <audio> tags (can lead to crashes in QtWebKit)
-+        const QString tag    = QLatin1String("<audio");
-+        const QString tagEnd = QLatin1String("</audio>");
-+        const int tagEndSize = tagEnd.size();
-+        int matchIndex = 0;
-+        QStringMatcher tagMatcher( tag );
-+        while( (matchIndex = tagMatcher.indexIn(wiki, matchIndex)) != -1 )
-+        {
-+            const int nToTagEnd = wiki.indexOf( tagEnd, matchIndex ) - matchIndex;
-+            QStringRef tagRef = wiki.midRef( matchIndex, nToTagEnd + tagEndSize );
-+            wiki.remove( tagRef.toString() );
-+        }
-+    }
-+
-     // Adding back style and license information
-     wiki = QLatin1String("<div id=\"bodyContent\"") + wiki;
-     wiki += copyright;
--- 
-1.7.11.7
-

diff --git a/amarok.spec b/amarok.spec
index 768190c..3793772 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -2,7 +2,7 @@
 Name:    amarok
 Summary: Media player
 Version: 2.7.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # KDE e.V. may determine that future GPL versions are accepted
 License: GPLv2 or GPLv3
@@ -24,7 +24,6 @@ Patch0:  amarok-2.7.0-onlinedoc.patch
 ## upstream patches
 Patch0057: 0057-Fix-crashed-when-dynamic-playlist-based-on-last.fm-i.patch
 Patch0074: 0074-Fix-Amarok-crashes-by-putting-a-broadcast-in-the-pla.patch
-Patch0263: 0263-Fix-crashes-on-track-change-both-with-Phonon-GStream.patch
 
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
@@ -102,7 +101,6 @@ BuildArch: noarch
 
 %patch0057 -p1 -b .0057
 %patch0074 -p1 -b .0074
-%patch0263 -p1 -b .0263
 
 
 %build
@@ -192,6 +190,9 @@ fi
 
 
 %changelog
+* Fri May 17 2013 Rex Dieter <rdieter@fedoraproject.org> 2.7.1-2
+- drop already-included qtwebkit/wikipedia fixer
+
 * Thu May 16 2013 Rex Dieter <rdieter@fedoraproject.org> 2.7.1-1
 - 2.7.1