From 38d2a7558f21cb8874eb5810bf146565b1e291dc Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Apr 29 2016 19:01:01 +0000
Subject: revert upstream commit causing regression (kde#337276)


---

diff --git a/0024-fix-double-encoding-problem-with-MRLs.patch b/0024-fix-double-encoding-problem-with-MRLs.patch
new file mode 100644
index 0000000..abed6dd
--- /dev/null
+++ b/0024-fix-double-encoding-problem-with-MRLs.patch
@@ -0,0 +1,40 @@
+From 621ffb823d45a88a02602fb4ee4b769dfbc0c16a Mon Sep 17 00:00:00 2001
+From: Harald Sitter <sitter@kde.org>
+Date: Thu, 3 Dec 2015 10:30:14 +0100
+Subject: [PATCH 24/31] fix double encoding problem with MRLs
+
+QUrl::from* can auto-encode characters such as #, toString will not
+automatically decode again. This results in a double encoding since
+MRL always encodes according to phonon-gstreamer's expectations.
+To avoid this use toLocalFile() for local paths as this returns decoded
+paths which we can then percent encode correctly.
+
+BUG: 356218
+FIXED-IN: 4.9.0
+CHANGELOG: Fix playback of local files containing a hash (#) character
+---
+ phonon/mrl.cpp | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/phonon/mrl.cpp b/phonon/mrl.cpp
+index afd4655..ce5961a 100644
+--- a/phonon/mrl.cpp
++++ b/phonon/mrl.cpp
+@@ -64,12 +64,11 @@ QByteArray Mrl::toEncoded(FormattingOptions options) const
+ {
+     QByteArray encodedMrl;
+ 
+-    QString url = toString(options);
+     static QByteArray encodingExclude(":/\\?=&,@");
+     if (scheme() == QLatin1String("")) {
+-        encodedMrl = QFile::encodeName("file://" + url).toPercentEncoding(encodingExclude);
++        encodedMrl = QFile::encodeName("file://" + toLocalFile()).toPercentEncoding(encodingExclude);
+     } else if (scheme() == QLatin1String("file")) {
+-        encodedMrl = QFile::encodeName(url).toPercentEncoding(encodingExclude);
++        encodedMrl = QFile::encodeName("file://" + toLocalFile()).toPercentEncoding(encodingExclude);
+     } else {
+         encodedMrl = QUrl::toEncoded(options);
+     }
+-- 
+2.7.4
+
diff --git a/phonon.spec b/phonon.spec
index 90bd628..c11d6c6 100644
--- a/phonon.spec
+++ b/phonon.spec
@@ -11,7 +11,7 @@
 Summary: Multimedia framework api
 Name:    phonon
 Version: 4.9.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 URL:     http://phonon.kde.org/
 
@@ -24,6 +24,9 @@ URL:     http://phonon.kde.org/
 Source0: http://download.kde.org/%{stable}/phonon/%{version}/phonon-%{version}.tar.xz
 
 ## upstream patches
+# revert fix for https://bugs.kde.org/356218 as it causes
+# (imo) worse regressions/side-effects: https://bugs.kde.org/337276
+Patch24: 0024-fix-double-encoding-problem-with-MRLs.patch
 
 ## upstreamable patches
 Patch10: phonon-rpath_use_link_path.patch
@@ -91,7 +94,11 @@ Requires: %{name}-qt5%{?_isa} = %{version}-%{release}
 
 
 %prep
-%autosetup -p1
+%setup -q
+
+%patch10 -p1 -b .10
+%patch11 -p1 -b .11
+%patch24 -p1 -R -b .24
 
 
 %build
@@ -205,6 +212,9 @@ end
 
 
 %changelog
+* Fri Apr 29 2016 Rex Dieter <rdieter@fedoraproject.org> - 4.9.0-2
+- revert upstream commit causing regression (kde#337276)
+
 * Thu Apr 21 2016 Rex Dieter <rdieter@fedoraproject.org> - 4.9.0-1
 - phonon-4.9.0, disable qzeitgeist support