Update patch; still segfaulted for .mpc with year tag. Bump accordingly.

(Portage version: 2.0.51.22-r1)

5 files changed, 23 insertions, 16 deletions

diff --git a/media-libs/taglib/ChangeLog b/media-libs/taglib/ChangeLog
index 1b752df49ed6..6d61bcdbf9c0 100644
--- a/media-libs/taglib/ChangeLog
+++ b/media-libs/taglib/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/taglib
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/taglib/ChangeLog,v 1.33 2005/06/29 20:12:55 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/taglib/ChangeLog,v 1.34 2005/06/29 21:32:26 chainsaw Exp $
+
+*taglib-1.3.1-r2 (29 Jun 2005)
+
+  29 Jun 2005; Tony Vroon <chainsaw@gentoo.org>
+  -files/taglib-1.3.1-memleak-fix.patch,
+  +files/taglib-1.3.1-memleak-fix2.patch, -taglib-1.3.1-r1.ebuild,
+  +taglib-1.3.1-r2.ebuild:
+  Bump for newer patch (avoids segfault for .mpc without year tag).
 
 *taglib-1.3.1-r1 (29 Jun 2005)
 
diff --git a/media-libs/taglib/Manifest b/media-libs/taglib/Manifest
index 30cde8ce8ede..8ca39b8d47b1 100644
--- a/media-libs/taglib/Manifest
+++ b/media-libs/taglib/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 MD5 5fae5214ee65a218afc94d589bebb0de ChangeLog 3490
+MD5 723ddca04bb3f3760d6c7b907229e3bd taglib-1.3.1-r2.ebuild 966
 MD5 96fd9919709b18bba8001266155f211f taglib-1.3.1.ebuild 903
-MD5 723ddca04bb3f3760d6c7b907229e3bd taglib-1.3.1-r1.ebuild 966
-MD5 b0a0fe848e08601d2c3614a82787f6ee files/taglib-1.3.1-memleak-fix.patch 2334
-MD5 cc8a58ea8028f3539fcee148baeffcc1 files/digest-taglib-1.3.1-r1 64
+MD5 cc8a58ea8028f3539fcee148baeffcc1 files/digest-taglib-1.3.1-r2 64
 MD5 cc8a58ea8028f3539fcee148baeffcc1 files/digest-taglib-1.3.1 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFCwwC2p5vW4rUFj5oRAqqoAJsEu75DAi3Q6957SbW+WVOhJVB8nACeNSej
-cdsy1g28OCaz0LAibSh4akk=
-=IDU5
------END PGP SIGNATURE-----
+MD5 103dd47ff1744397288b44834902e16c files/taglib-1.3.1-memleak-fix2.patch 2514
diff --git a/media-libs/taglib/files/digest-taglib-1.3.1-r1 b/media-libs/taglib/files/digest-taglib-1.3.1-r2
index cd73d6280f2b..cd73d6280f2b 100644
--- a/media-libs/taglib/files/digest-taglib-1.3.1-r1
+++ b/media-libs/taglib/files/digest-taglib-1.3.1-r2
diff --git a/media-libs/taglib/files/taglib-1.3.1-memleak-fix.patch b/media-libs/taglib/files/taglib-1.3.1-memleak-fix2.patch
index 6186c4fa797e..8e969d2daff7 100644
--- a/media-libs/taglib/files/taglib-1.3.1-memleak-fix.patch
+++ b/media-libs/taglib/files/taglib-1.3.1-memleak-fix2.patch
@@ -91,6 +91,15 @@
  Item &APE::Item::operator=(const Item &item)
  {
    delete d;
+@@ -111,7 +116,7 @@
+ 
+ String APE::Item::toString() const
+ {
+-  return d->text.front();
++  return isEmpty() ? String::null : d->text.front();
+ }
+ 
+ bool APE::Item::isEmpty() const
 @@ -121,7 +126,7 @@
      case 1:
        if(d->text.isEmpty())
diff --git a/media-libs/taglib/taglib-1.3.1-r1.ebuild b/media-libs/taglib/taglib-1.3.1-r2.ebuild
index 0faf2782b723..908d9dfcdde0 100644
--- a/media-libs/taglib/taglib-1.3.1-r1.ebuild
+++ b/media-libs/taglib/taglib-1.3.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/taglib/taglib-1.3.1-r1.ebuild,v 1.1 2005/06/29 20:12:55 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/taglib/taglib-1.3.1-r2.ebuild,v 1.1 2005/06/29 21:32:26 chainsaw Exp $
 
 inherit eutils flag-o-matic
 
@@ -19,7 +19,7 @@ RDEPEND=""
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${P}-memleak-fix.patch
+	epatch ${FILESDIR}/${P}-memleak-fix2.patch
 
 	rm -rf autom4te.cache
 	export WANT_AUTOCONF=2.5