diff --git a/phonon-4.3.2-kdebug#172242-2.patch b/phonon-4.3.2-kdebug#172242-2.patch new file mode 100644 index 0000000..b79e335 --- /dev/null +++ b/phonon-4.3.2-kdebug#172242-2.patch @@ -0,0 +1,12 @@ +diff -up phonon-4.3.1/xine/mediaobject.cpp.kde#172242-2 phonon-4.3.1/xine/mediaobject.cpp +--- phonon-4.3.1/xine/mediaobject.cpp.kde#172242-2 2009-06-18 12:37:45.641000922 -0500 ++++ phonon-4.3.1/xine/mediaobject.cpp 2009-06-18 12:39:15.917231311 -0500 +@@ -321,7 +321,7 @@ static QByteArray mrlEncode(QByteArray m + { + for (int i = 0; i < mrl.size(); ++i) { + const unsigned char c = static_cast(mrl.at(i)); +- if (c & 0x80 || c == '\\' || c < 32 || c == '%') { ++ if (c & 0x80 || c == '\\' || c < 32 || c == '%' || c == '#') { + char enc[4]; + qsnprintf(enc, 4, "%%%02X", c); + mrl = mrl.left(i) + QByteArray(enc, 3) + mrl.mid(i + 1); diff --git a/phonon.spec b/phonon.spec index 5f8fc06..aa9c25c 100644 --- a/phonon.spec +++ b/phonon.spec @@ -4,7 +4,7 @@ Summary: Multimedia framework api Name: phonon Version: 4.3.1 -Release: 10%{?dist} +Release: 11%{?dist} Group: Applications/Multimedia License: LGPLv2+ URL: http://phonon.kde.org/ @@ -21,6 +21,8 @@ Patch2: phonon-4.3.1-xine-InitialPreference.patch ## Upstream patches # fix for non-ascii filenames in xine backend Patch100: phonon-4.3.2-kdebug#172242.patch +# escape '#' too +Patch101: phonon-4.3.2-kdebug#172242-2.patch BuildRequires: automoc4 >= 0.9.86 BuildRequires: cmake >= 2.6.0 @@ -49,6 +51,7 @@ Requires: phonon%{?_isa} >= %{phonon_version_major} %patch0 -p1 -b .xineonly %patch1 -p1 -b .xine-pulseaudio %patch100 -p1 -b .xine_nonascii +%patch101 -p1 -b .xine_nonascii-2 %build @@ -97,6 +100,9 @@ fi %changelog +* Thu Jun 18 2009 Rex Dieter - 4.3.1-11 +- fix for '#' in filenames + * Tue Jun 09 2009 Than Ngo - 4.3.1-10 - make InitialPreference=9