From 145c87d31069ef706a4880768917b5d539c02392 Mon Sep 17 00:00:00 2001
From: Michael Schwendt <mschwendt@fedoraproject.org>
Date: May 13 2013 10:12:41 +0000
Subject: Merge upstream fix for incorrect parsing of ID3 "TIME" field.


---

diff --git a/audacious-3.4-beta1-id3-time-tag.patch b/audacious-3.4-beta1-id3-time-tag.patch
new file mode 100644
index 0000000..13e8b3c
--- /dev/null
+++ b/audacious-3.4-beta1-id3-time-tag.patch
@@ -0,0 +1,35 @@
+diff -Nurb --strip-trailing-cr /tmp/tmp.MA77uIJbNk/audacious-old/src/libaudtag/id3/id3v24.c audacious/src/libaudtag/id3/id3v24.c
+--- /tmp/tmp.MA77uIJbNk/audacious-old/src/libaudtag/id3/id3v24.c	2012-06-29 11:00:05.000000000 +0200
++++ audacious/src/libaudtag/id3/id3v24.c	2013-05-13 11:00:06.662680438 +0200
+@@ -36,7 +36,6 @@
+     ID3_COMPOSER,
+     ID3_COPYRIGHT,
+     ID3_DATE,
+-    ID3_TIME,
+     ID3_LENGTH,
+     ID3_ARTIST,
+     ID3_TRACKNR,
+@@ -51,9 +50,9 @@
+     ID3_TAGS_NO
+ };
+ 
+-static const char * id3_frames[ID3_TAGS_NO] = {"TALB","TIT2","TCOM", "TCOP",
+- "TDAT", "TIME", "TLEN", "TPE1", "TRCK", "TYER","TCON", "COMM", "PRIV", "TSSE",
+- "TDRC", "TXXX", "RVA2"};
++static const char * id3_frames[ID3_TAGS_NO] = {"TALB", "TIT2", "TCOM", "TCOP",
++ "TDAT", "TLEN", "TPE1", "TRCK", "TYER", "TCON", "COMM", "PRIV", "TSSE", "TDRC",
++ "TXXX", "RVA2"};
+ 
+ static const unsigned char PRIMARY_CLASS_MUSIC[16] = {0xBC, 0x7D, 0x60, 0xD1, 0x23,
+  0xE3, 0xE2, 0x4B, 0x86, 0xA1, 0x48, 0xA4, 0x2A, 0x28, 0x44, 0x1E};
+@@ -859,9 +858,6 @@
+           case ID3_DATE:
+             associate_string (tuple, FIELD_DATE, NULL, data, size);
+             break;
+-          case ID3_TIME:
+-            associate_int (tuple, FIELD_LENGTH, NULL, data, size);
+-            break;
+           case ID3_LENGTH:
+             associate_int (tuple, FIELD_LENGTH, NULL, data, size);
+             break;
+
diff --git a/audacious.spec b/audacious.spec
index b2a7f8a..f349356 100644
--- a/audacious.spec
+++ b/audacious.spec
@@ -8,7 +8,7 @@
 
 Name: audacious
 Version: 3.4
-Release: 0.2.beta1%{?dist}
+Release: 0.3.beta1%{?dist}
 
 License: BSD
 Summary: Advanced audio player
@@ -18,6 +18,8 @@ Group: Applications/Multimedia
 Source0: http://distfiles.audacious-media-player.org/audacious-%{tar_ver}.tar.bz2
 
 Patch0: audacious-3.4-beta1-resume-git89e1806.patch
+# upstream fix for #290
+Patch1: audacious-3.4-beta1-id3-time-tag.patch
 
 BuildRequires: gettext
 BuildRequires: gtk3-devel
@@ -95,6 +97,7 @@ Files needed when building software for the Audacious audio player.
 %prep
 %setup -q -n %{name}-%{tar_ver}
 %patch0 -p1 -b .resume
+%patch1 -p1 -b .id3-time-tag
 # https://bugzilla.redhat.com/925050
 # fixed upstream after 3.4-beta1
 autoreconf -f -I m4
@@ -172,6 +175,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Mon May 13 2013 Michael Schwendt <mschwendt@fedoraproject.org> - 3.4-0.3.beta1
+- Merge upstream fix for incorrect parsing of ID3 "TIME" field.
+
 * Thu Apr 25 2013 Michael Schwendt <mschwendt@fedoraproject.org> - 3.4-0.2.beta1
 - Apply patch to restore play-stop-play resume from beginning behaviour.