Fix for bug 42446, abort on playlist clear. Inline sed. Update copyright date.

6 files changed, 155 insertions, 4 deletions

diff --git a/media-plugins/xmms-shell/ChangeLog b/media-plugins/xmms-shell/ChangeLog
index 508d38c277db..116405fa996b 100644
--- a/media-plugins/xmms-shell/ChangeLog
+++ b/media-plugins/xmms-shell/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/xmms-shell
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-shell/ChangeLog,v 1.8 2004/02/12 05:46:34 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-shell/ChangeLog,v 1.9 2004/03/16 20:08:07 kanaka Exp $
+
+*xmms-shell-0.99.3-r3 (16 Mar 2004)
+
+  16 Mar 2004; Joel Martin <kanaka@gentoo.org> xmms-shell-0.99.0-r1.ebuild,
+  xmms-shell-0.99.3-r3.ebuild, files/xmms-shell-playlist.patch:
+  Fix for bug 42446, abort on playlist clear. Inline sed. Update copyright date.
 
 *xmms-shell-0.99.3-r2 (11 Feb 2004)
 
diff --git a/media-plugins/xmms-shell/Manifest b/media-plugins/xmms-shell/Manifest
index c8d6cd847450..2e1e5232c2dd 100644
--- a/media-plugins/xmms-shell/Manifest
+++ b/media-plugins/xmms-shell/Manifest
@@ -1,9 +1,12 @@
+MD5 11e0ffb45426b395126343d802678014 xmms-shell-0.99.3-r3.ebuild 1204
 MD5 0f55db85aab3c026f8a8b316b543fcea xmms-shell-0.99.3-r2.ebuild 1307
 MD5 f20f05902899d88553f554f111a0de5b xmms-shell-0.99.0-r1.ebuild 785
-MD5 fe073ab167dab03448ad59a61a37ee69 ChangeLog 2147
+MD5 0a46fd66724a8735a3c35bb7477acae6 ChangeLog 2354
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 f8b236d54106a623e0cf91e802d2af27 files/digest-xmms-shell-0.99.0-r1 68
 MD5 79d46e1306a0de2e2888d27be745a4f6 files/digest-xmms-shell-0.99.3-r2 68
+MD5 79d46e1306a0de2e2888d27be745a4f6 files/digest-xmms-shell-0.99.3-r3 68
+MD5 1e103ba06674a17c1fe67ff49a02059d files/xmms-shell-playlist.patch 2544
 MD5 253375baf62ccb75c71216b4ee5a5414 files/xmms-shell-null-skin.patch 477
 MD5 30d875b5125e84fce576af17cc7ad83c files/xmms-shell-readline.patch 280
 MD5 636c67df262fad8468681da1f715ee6b files/xmms-shell-gcc3.patch 2465
diff --git a/media-plugins/xmms-shell/files/digest-xmms-shell-0.99.3-r3 b/media-plugins/xmms-shell/files/digest-xmms-shell-0.99.3-r3
new file mode 100644
index 000000000000..3302688d80d5
--- /dev/null
+++ b/media-plugins/xmms-shell/files/digest-xmms-shell-0.99.3-r3
@@ -0,0 +1 @@
+MD5 7c59ff584ae146282259fd6cdc8fe669 xmms-shell-0.99.3.tar.gz 59940
diff --git a/media-plugins/xmms-shell/files/xmms-shell-playlist.patch b/media-plugins/xmms-shell/files/xmms-shell-playlist.patch
new file mode 100644
index 000000000000..7575850aa809
--- /dev/null
+++ b/media-plugins/xmms-shell/files/xmms-shell-playlist.patch
@@ -0,0 +1,84 @@
+diff -urP xmms-shell-0.99.3.orig/include/playlist.h xmms-shell-0.99.3/include/playlist.h
+--- xmms-shell-0.99.3.orig/include/playlist.h	2002-10-22 19:46:17.000000000 -0400
++++ xmms-shell-0.99.3/include/playlist.h	2004-03-16 14:20:34.000000000 -0500
+@@ -19,7 +19,7 @@
+     int length(void) const;
+     int position(void) const;
+     void set_position(int pos) const;
+-    void check_position(int pos, int min_value = 1) const;
++    bool check_position(int pos, int min_value = 1) const;
+     string current_title(void) const;
+     string title(int pos) const;
+     string current_filename(void) const;
+diff -urP xmms-shell-0.99.3.orig/src/playlist.cc xmms-shell-0.99.3/src/playlist.cc
+--- xmms-shell-0.99.3.orig/src/playlist.cc	2002-10-22 19:49:10.000000000 -0400
++++ xmms-shell-0.99.3/src/playlist.cc	2004-03-16 14:18:19.000000000 -0500
+@@ -490,8 +490,9 @@
+ 
+ void Playlist::set_position(int pos) const
+ {
+-    check_position(pos);
+-    xmms_remote_set_playlist_pos(session.id(), pos - 1);
++    if (check_position(pos)) {
++        xmms_remote_set_playlist_pos(session.id(), pos - 1);
++    }
+ }
+ 
+ int Playlist::length(void) const
+@@ -502,11 +503,12 @@
+ 
+ string Playlist::title(int pos) const
+ {
+-    check_position(pos);
++    if (! check_position(pos)) {
++        return "";
++    }
+ 
+     char *c_str = xmms_remote_get_playlist_title(session.id(), pos - 1);
+     string str(c_str);
+-
+     g_free(c_str);
+     return str;
+ }
+@@ -518,11 +520,12 @@
+ 
+ string Playlist::filename(int pos) const
+ {
+-    check_position(pos);
++    if (! check_position(pos)) {
++        return "";
++    }
+ 
+     char *c_str = xmms_remote_get_playlist_file(session.id(), pos - 1);
+     string str(c_str);
+-
+     g_free(c_str);
+     return str;
+ }
+@@ -546,11 +549,13 @@
+     return position();
+ }
+ 
+-void Playlist::check_position(int pos, int min_value) const
++bool Playlist::check_position(int pos, int min_value) const
+ {
+     if(pos < min_value || pos > length()) {
+-        throw PlaylistPositionOutOfBoundsException(*this, pos, min_value);
++        //throw PlaylistPositionOutOfBoundsException(*this, pos, min_value);
++        return FALSE;
+     }
++    return TRUE;
+ }
+ 
+ PlaylistPositionOutOfBoundsException::PlaylistPositionOutOfBoundsException(const Playlist& playlist, int _position, int min_value)
+@@ -611,6 +616,10 @@
+     int n = 0;
+ 
+     session.ensure_running();
++    if ((! check_position(pos1)) ||
++        (! check_position(pos2, pos1))) {
++        return 0;
++    }
+     check_position(pos1);
+     check_position(pos2, pos1);
+     while(pos2 >= pos1) {
diff --git a/media-plugins/xmms-shell/xmms-shell-0.99.0-r1.ebuild b/media-plugins/xmms-shell/xmms-shell-0.99.0-r1.ebuild
index 6ec107618127..dad2199a45de 100644
--- a/media-plugins/xmms-shell/xmms-shell-0.99.0-r1.ebuild
+++ b/media-plugins/xmms-shell/xmms-shell-0.99.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-shell/xmms-shell-0.99.0-r1.ebuild,v 1.6 2003/04/25 14:15:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-shell/xmms-shell-0.99.0-r1.ebuild,v 1.7 2004/03/16 20:08:07 kanaka Exp $
 
 DESCRIPTION="simple utility to control XMMS externally"
 SRC_URI="http://download.sourceforge.net/xmms-shell/${P}.tar.gz"
diff --git a/media-plugins/xmms-shell/xmms-shell-0.99.3-r3.ebuild b/media-plugins/xmms-shell/xmms-shell-0.99.3-r3.ebuild
new file mode 100644
index 000000000000..5d8743e7be17
--- /dev/null
+++ b/media-plugins/xmms-shell/xmms-shell-0.99.3-r3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-shell/xmms-shell-0.99.3-r3.ebuild,v 1.1 2004/03/16 20:08:07 kanaka Exp $
+
+S=${WORKDIR}/${P}
+
+DESCRIPTION="simple utility to control XMMS externally"
+SRC_URI="mirror://sourceforge/xmms-shell/${P}.tar.gz"
+HOMEPAGE="http://www.loganh.com/xmms-shell/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+IUSE="readline"
+
+RDEPEND=">=media-sound/xmms-1.2.7
+	readline? ( >=sys-libs/readline-4.1 )"
+
+DEPEND="${RDEPEND}
+	sys-apps/sed
+	sys-devel/automake
+	sys-devel/autoconf"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	# Fix configure.in to detect readline
+	epatch ${FILESDIR}/${PN}-readline.patch
+
+	# Fix null pointer when default skin
+	epatch ${FILESDIR}/${PN}-null-skin.patch
+
+	# Remove unnecessary playlist exception
+	epatch ${FILESDIR}/${PN}-playlist.patch
+
+	WANT_AUTOCONF=2.1
+	WANT_AUTOMAKE=1.4
+	aclocal
+	automake --gnu --include-deps Makefile
+	autoconf
+
+	# Fix compilation in gcc3.3
+	sed -i.orig ${S}/src/getline.cc -e 's/<string>/<string.h>/'
+}
+
+src_compile() {
+	econf `use_with readline` || die "Configuration failed."
+	emake || die "Make failed."
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "Install failed."
+	dodoc AUTHORS ChangeLog INSTALL README
+}
+