rpms/taglib/EL-5 taglib-1.5-kde#161721.patch, NONE, 1.1 taglib.spec, 1.15, 1.16 taglib-1.4_wchar.diff, 1.1, NONE
Rex Dieter
rdieter at fedoraproject.org
Tue Oct 7 00:43:41 UTC 2008
- Previous message (by thread): rpms/taglib/EL-4 taglib-1.5-kde#161721.patch, NONE, 1.1 taglib.spec, 1.7, 1.8 taglib-1.4_wchar.diff, 1.1, NONE
- Next message (by thread): rpms/xorg-x11-drv-mutouch/devel .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 xorg-x11-drv-mutouch.spec, 1.18, 1.19
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/pkgs/rpms/taglib/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2423
Modified Files:
taglib.spec
Added Files:
taglib-1.5-kde#161721.patch
Removed Files:
taglib-1.4_wchar.diff
Log Message:
* Mon Oct 06 2008 Rex Dieter <rdieter at fedoraproject.org> 1.5-2
- Encrypted frames taglib/Amarok crash (kde#161721)
taglib-1.5-kde#161721.patch:
--- NEW FILE taglib-1.5-kde#161721.patch ---
diff -up taglib-1.5/taglib/mpeg/id3v2/id3v2tag.cpp.kde#161721 taglib-1.5/taglib/mpeg/id3v2/id3v2tag.cpp
--- taglib-1.5/taglib/mpeg/id3v2/id3v2tag.cpp.kde#161721 2008-02-04 14:33:54.000000000 -0600
+++ taglib-1.5/taglib/mpeg/id3v2/id3v2tag.cpp 2008-10-06 15:52:08.000000000 -0500
@@ -125,7 +125,9 @@ String ID3v2::Tag::comment() const
for(FrameList::ConstIterator it = comments.begin(); it != comments.end(); ++it)
{
- if(static_cast<CommentsFrame *>(*it)->description().isEmpty())
+ CommentsFrame *frame = dynamic_cast<CommentsFrame *>(*it);
+
+ if(frame && frame->description().isEmpty())
return (*it)->toString();
}
Index: taglib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/EL-5/taglib.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- taglib.spec 21 Feb 2008 04:59:22 -0000 1.15
+++ taglib.spec 7 Oct 2008 00:43:11 -0000 1.16
@@ -3,7 +3,7 @@
Name: taglib
Version: 1.5
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Audio Meta-Data Library
Group: System Environment/Libraries
@@ -15,14 +15,15 @@
Source1: taglib-svn.sh
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# what is this for? why not upstreamed, yet? Aurelien? -- Rex
-Patch0: http://foetida.jaist.ac.jp:37565/~yaz/diary/2006/07/taglib-1.4_wchar.diff
# http://bugzilla.redhat.com/343241
# try 1, use pkg-config
Patch1: taglib-1.5b1-multilib.patch
# try 2, kiss omit -L%_libdir
Patch2: taglib-1.5rc1-multilib.patch
+## upstream patches
+Patch100: taglib-1.5-kde#161721.patch
+
BuildRequires: cmake
BuildRequires: zlib-devel
@@ -44,10 +45,10 @@
%prep
%setup -q -n taglib-%{version}%{?beta}
-## omit for now
-#patch0 -p1 -b .wchar
%patch2 -p1 -b .multilib
+%patch100 -p1 -b .kde#161721.patch
+
%build
mkdir -p %{_target_platform}
@@ -92,6 +93,9 @@
%changelog
+* Mon Oct 06 2008 Rex Dieter <rdieter at fedoraproject.org> 1.5-2
+- Encrypted frames taglib/Amarok crash (kde#161721)
+
* Wed Feb 20 2008 Rex Dieter <rdieter at fedoraproject.org> 1.5-1
- taglib-1.5
--- taglib-1.4_wchar.diff DELETED ---
- Previous message (by thread): rpms/taglib/EL-4 taglib-1.5-kde#161721.patch, NONE, 1.1 taglib.spec, 1.7, 1.8 taglib-1.4_wchar.diff, 1.1, NONE
- Next message (by thread): rpms/xorg-x11-drv-mutouch/devel .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 xorg-x11-drv-mutouch.spec, 1.18, 1.19
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list