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

(Portage version: 2.1_pre4-r1)

5 files changed, 54 insertions, 18 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 3b30263a6d6f..bf05a29fabb4 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -1,9 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 cdd5cca97baa42a2e8c35b7082a7ebd9 ChangeLog 2812
-RMD160 d0d229a8f4cccbdbb0f76f9feff6decbb71c84ec ChangeLog 2812
-SHA256 bd5544a1a98f167e31d72a73b0e8d2e3668dbf1cc7b6f0a2bfe18d8b0fb5c834 ChangeLog 2812
+MD5 28c6de2fd6562107741f67fd77469a32 ChangeLog 3092
+RMD160 7f849698634ffb8a9293190aa2efd21638a4caea ChangeLog 3092
+SHA256 5ee8e969ad2713245fd3e0926bec5548e9911f8007520cdb18f214311279a93d ChangeLog 3092
 MD5 b5ac0de9588722b6dc7f188a1feaf051 audacious-0.1-r1.ebuild 2498
 RMD160 5d6f4412b6c9b097d5c1b740d6165c0253139cc0 audacious-0.1-r1.ebuild 2498
 SHA256 5deea884786614fb29ac196b048994360b35f10c86f6aa976fb5b1500e8b2674 audacious-0.1-r1.ebuild 2498
@@ -16,9 +13,9 @@ SHA256 e08f645ee6ffdcc04f7e1bb9afdd3236fa89b524645c2fbe2ced8f8f73c6cb86 audaciou
 MD5 343fbbbf4c755e36e509b34c296929b2 audacious-0.1.ebuild 2402
 RMD160 1ce98e38ba735c524f4b3cfe1e0524b1a6ceb03a audacious-0.1.ebuild 2402
 SHA256 a59cc7ebcff9d2ae59820592216d41d8623f463bef540df4998ad638f141652d audacious-0.1.ebuild 2402
-MD5 ae19d976ff06a873ac23fe880d16b820 audacious-0.2-r1.ebuild 2862
-RMD160 a3469d377a30488024ac7760e21f82b85fae1b44 audacious-0.2-r1.ebuild 2862
-SHA256 19dc334381ede18f7fd32eb9b7feac4b95fcd6547e7d6b104a00763f1da6b934 audacious-0.2-r1.ebuild 2862
+MD5 924ec2279bfc534b49a7ee35937e1a55 audacious-0.2-r1.ebuild 2943
+RMD160 23ac7447c4a031a49130fe3311c6fd6b0c5b62ef audacious-0.2-r1.ebuild 2943
+SHA256 777f2097789877c822083465162e5a33aa77adaad23a8fa7c2dd50ad358889dd audacious-0.2-r1.ebuild 2943
 MD5 889f58a8b65f5beae79be9fa50809f4b audacious-0.2.ebuild 2764
 RMD160 dcb73d190f6c63f59cab54f01c3e5c486d398360 audacious-0.2.ebuild 2764
 SHA256 15d3ee0b920ec2b2cecba9a4de2ac36a9767a75a9c13fbf80201a86c9c05aa8a audacious-0.2.ebuild 2764
@@ -28,6 +25,12 @@ SHA256 93c0f6ceeac65d055ec058fe0af789f006e631247d6f1e7c5d5beb36df710bcd files/0.
 MD5 f136cb1abd33101806a7879f4f5ae7d8 files/0.2-no-sigabrt-on-null-path.diff 442
 RMD160 d937400e5fcacf6992efddd2f2490eff04443853 files/0.2-no-sigabrt-on-null-path.diff 442
 SHA256 d34083f23c74d3e75ffbe55b21c23120089bddf7be523de4725ba85b630c3449 files/0.2-no-sigabrt-on-null-path.diff 442
+MD5 7f7eac7f2f68ec45eefb0cfb4c01d4db files/0.2-segfault.diff 468
+RMD160 510c6336b713a9f513c3e487612c2f7e6450a0f5 files/0.2-segfault.diff 468
+SHA256 40aea64363c0a25d04099eb73f07d567170268d1297907055e261008683cbce9 files/0.2-segfault.diff 468
+MD5 8a917c27ee8ada32b8a4f0b690733602 files/0.2-thumbnail.diff 871
+RMD160 ae7063d943511f83c8f547843908f4e6563f3b44 files/0.2-thumbnail.diff 871
+SHA256 e80bb6d38e9c4e0891868e6e870404eba6d3a80067768128e0cd162187755848 files/0.2-thumbnail.diff 871
 MD5 556a78b44b63b6950de07d76f6261e8f files/digest-audacious-0.1 134
 RMD160 204be8a13a1997dc4e07ed6effe5c9e35f885cc6 files/digest-audacious-0.1 134
 SHA256 aa7d4cbac5b1f3dd6c80472a513b840ee9d2ad7d550e52d416fe0ff64cf7e3a6 files/digest-audacious-0.1 134
@@ -49,10 +52,3 @@ 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)
-
-iD8DBQFD95JRp5vW4rUFj5oRArPxAJ9NHXHevxeiRqRr2MlKg4+vXfSGHQCgu4dY
-V/E5lDyN7Tegr6Exw5joKlE=
-=LmtU
------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,