Two additional patches submitted, closes bugs #123312 & #123313. Thanks to Michael Hanselmann <hansmi@gentoo.org> & Daniel Drake <dsd@gentoo.org>.

Package-Manager: portage-2.1_pre4-r1

5 files changed, 52 insertions, 2 deletions

diff --git a/media-sound/audacious/ChangeLog b/media-sound/audacious/ChangeLog
index 6de60c3132e9..54fe4c8d933d 100644
--- a/media-sound/audacious/ChangeLog
+++ b/media-sound/audacious/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/audacious
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/ChangeLog,v 1.17 2006/02/18 21:30:24 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/ChangeLog,v 1.18 2006/02/18 21:59:22 chainsaw Exp $
+
+  18 Feb 2006; Tony Vroon <chainsaw@gentoo.org> +files/0.2-segfault.diff,
+  +files/0.2-thumbnail.diff, audacious-0.2-r1.ebuild:
+  Two additional patches submitted, closes bugs #123312 & #123313. Thanks to
+  Michael Hanselmann <hansmi@gentoo.org> & Daniel Drake <dsd@gentoo.org>.
 
 *audacious-0.2-r1 (18 Feb 2006)
 
diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index f3838500ad2a..b7be33919558 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 a2b6357651132bb85360f8cf4dd82b41 ChangeLog 3092
 RMD160 7cb0cc5eb74c519b6d874935545faf622cb93571 ChangeLog 3092
 SHA256 e9b920a3cc4f5d9b83f70714db6963a10dd8aa50afac2fbdaeb31e4e6de33add ChangeLog 3092
@@ -52,3 +55,10 @@ SHA256 1093c6c03241b7a885005a425d583eda4e985faabb2a170bf7d96f9dd8b078dd files/di
 MD5 319fe8f45b51a2d31f8d4e9a4071ca10 metadata.xml 248
 RMD160 f9de13e16a150195633b055ebe61bb4cea95160d metadata.xml 248
 SHA256 6a8ca116bded5cdd92cb700f92acd22b01ae159ef1b69c60a03fc9859bb9b3d6 metadata.xml 248
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.1 (GNU/Linux)
+
+iD8DBQFD95kYp5vW4rUFj5oRAlFJAJ92yPVXsINpTFkkKrzib92ZEThaggCfYiTV
+Ao0Fi9wxFOXhxG3wDvL68lo=
+=H8Un
+-----END PGP SIGNATURE-----
diff --git a/media-sound/audacious/audacious-0.2-r1.ebuild b/media-sound/audacious/audacious-0.2-r1.ebuild
index 7d8b8c81f068..329eb1c14b5d 100644
--- a/media-sound/audacious/audacious-0.2-r1.ebuild
+++ b/media-sound/audacious/audacious-0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-0.2-r1.ebuild,v 1.1 2006/02/18 21:30:24 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-0.2-r1.ebuild,v 1.2 2006/02/18 21:59:22 chainsaw Exp $
 
 IUSE="aac alsa esd flac gnome jack libvisual lirc mmx modplug mp3 musepack nls oss sdl sid sndfile vorbis wma"
 
@@ -47,6 +47,8 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${PV}-no-sigabrt-on-null-path.diff
+	epatch ${FILESDIR}/${PV}-thumbnail.diff
+	epatch ${FILESDIR}/${PV}-segfault.diff
 }
 
 src_compile() {
diff --git a/media-sound/audacious/files/0.2-segfault.diff b/media-sound/audacious/files/0.2-segfault.diff
new file mode 100644
index 000000000000..8953efaaa40a
--- /dev/null
+++ b/media-sound/audacious/files/0.2-segfault.diff
@@ -0,0 +1,11 @@
+--- audacious-0.2.orig/audacious/skin.c	2006-01-16 19:32:57.000000000 +0100
++++ audacious-0.2/audacious/skin.c	2006-02-18 21:27:13.000000000 +0100
+@@ -330,7 +330,7 @@ skin_load_pixmap_id(Skin * skin, SkinPix
+ 
+     memset(&basenames, 0, sizeof(basenames));
+ 
+-    for (i = 0, y = 0; ext_targets[i]; i++, y++)
++    for (i = 0, y = 0; i < EXTENSION_TARGETS; i++, y++)
+     {
+         basenames[y] = g_strdup_printf("%s.%s", pixmap_id_mapping->name,
+ 			ext_targets[i]);
diff --git a/media-sound/audacious/files/0.2-thumbnail.diff b/media-sound/audacious/files/0.2-thumbnail.diff
new file mode 100644
index 000000000000..7b028406c98b
--- /dev/null
+++ b/media-sound/audacious/files/0.2-thumbnail.diff
@@ -0,0 +1,22 @@
+--- audacious-0.2.orig/audacious/skinwin.c
++++ audacious-0.2/audacious/skinwin.c
+@@ -281,9 +281,6 @@
+     for (entry = skinlist; entry; entry = g_list_next(entry)) {
+         thumbnail = skin_get_thumbnail(SKIN_NODE(entry->data)->path);
+ 
+-        if (!thumbnail)
+-            continue;
+-
+         formattedname = g_strdup_printf("<big><b>%s</b></big>\n<i>%s</i>",
+ 		SKIN_NODE(entry->data)->name, SKIN_NODE(entry->data)->desc);
+         name = SKIN_NODE(entry->data)->name;
+@@ -293,7 +290,8 @@
+                            SKIN_VIEW_COL_PREVIEW, thumbnail,
+                            SKIN_VIEW_COL_FORMATTEDNAME, formattedname,
+                            SKIN_VIEW_COL_NAME, name, -1);
+-        g_object_unref(thumbnail);
++        if (thumbnail)
++            g_object_unref(thumbnail);
+         g_free(formattedname);
+ 
+         if (g_strstr_len(bmp_active_skin->path,