rpms/phonon/F-11 phonon-4.3.2-kdebug#172242-2.patch, NONE, 1.1 phonon.spec, 1.37, 1.38
Kevin Kofler
kkofler at fedoraproject.org
Sat Sep 26 21:27:20 UTC 2009
- Previous message (by thread): rpms/phonon/F-10 phonon-4.3.2-kdebug#172242-2.patch, NONE, 1.1 phonon.spec, 1.19, 1.20
- Next message (by thread): rpms/libdvdread/devel libdvdread-endian.patch, NONE, 1.1 libdvdread-multilib.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 libdvdread.spec, 1.12, 1.13 sources, 1.6, 1.7 libdvdread-4.1.3-multilib.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: kkofler
Update of /cvs/pkgs/rpms/phonon/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19631/F-11
Modified Files:
phonon.spec
Added Files:
phonon-4.3.2-kdebug#172242-2.patch
Log Message:
* Sat Sep 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-6.1
- fix for '#' in filenames
phonon-4.3.2-kdebug#172242-2.patch:
mediaobject.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE phonon-4.3.2-kdebug#172242-2.patch ---
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<unsigned char>(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);
Index: phonon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/F-11/phonon.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- phonon.spec 6 Jun 2009 00:00:19 -0000 1.37
+++ phonon.spec 26 Sep 2009 21:27:20 -0000 1.38
@@ -1,7 +1,7 @@
Summary: Multimedia framework api
Name: phonon
Version: 4.3.1
-Release: 6%{?dist}
+Release: 6%{?dist}.1
Group: System Environment/Libraries
License: LGPLv2+
URL: http://phonon.kde.org/
@@ -24,6 +24,8 @@ Patch100: phonon-4.3.2-gstreamer-utf8-ur
Patch101: phonon-4.3.2-gstreamer-volumefader.patch
# fix for non-ascii filenames in xine backend
Patch102: phonon-4.3.2-kdebug#172242.patch
+# escape '#' too
+Patch103: phonon-4.3.2-kdebug#172242-2.patch
BuildRequires: automoc4 >= 0.9.86
BuildRequires: cmake >= 2.6.0
@@ -80,6 +82,7 @@ Requires: pkgconfig
%patch100 -p0 -b .gstreamer-utf8-url
%patch101 -p0 -b .gstreamer-volumefader
%patch102 -p1 -b .xine_nonascii
+%patch103 -p1 -b .xine_nonascii-2
%build
@@ -173,6 +176,9 @@ fi
%changelog
+* Sat Sep 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-6.1
+- fix for '#' in filenames
+
* Wed May 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-6
- phonon-backend-gstreamer multilib conflict (#501816)
- Previous message (by thread): rpms/phonon/F-10 phonon-4.3.2-kdebug#172242-2.patch, NONE, 1.1 phonon.spec, 1.19, 1.20
- Next message (by thread): rpms/libdvdread/devel libdvdread-endian.patch, NONE, 1.1 libdvdread-multilib.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 libdvdread.spec, 1.12, 1.13 sources, 1.6, 1.7 libdvdread-4.1.3-multilib.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list