Closing #30420.

4 files changed, 81 insertions, 26 deletions

diff --git a/media-sound/xmms/ChangeLog b/media-sound/xmms/ChangeLog
index 9fe9d5519f9f..bc36f732cb49 100644
--- a/media-sound/xmms/ChangeLog
+++ b/media-sound/xmms/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/xmms
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.76 2003/11/11 15:21:42 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.77 2003/11/21 16:42:01 mholzer Exp $
+
+  21 Nov 2003; Martin Holzer <mholzer@gentoo.org> xmms-1.2.8-r3.ebuild,
+  files/xmms-1.2.8-shadow.patch:
+  Closing #30420.
 
   11 Nov 2003; Daniel Ahlberg <aliz@gentoo.org> xmms-1.2.8-r3.ebuild :
   Disable simd on amd64.
diff --git a/media-sound/xmms/Manifest b/media-sound/xmms/Manifest
index 7254c6e77b3a..43652dee876f 100644
--- a/media-sound/xmms/Manifest
+++ b/media-sound/xmms/Manifest
@@ -1,34 +1,35 @@
-MD5 67719e9afde51fc778b8882f48bebfc2 xmms-1.2.7-r23.ebuild 5233
-MD5 6f4853e90e0793f41491fbd7b918d03f xmms-1.2.8-r2.ebuild 4554
-MD5 1f4fb5fbbf7591ead0b68071825b2de3 xmms-1.2.7-r25.ebuild 5652
+MD5 386450631eae9d67dc0f9c68045330fe ChangeLog 14739
 MD5 5013cb7f0010b3daa8efd1548cbe83b4 xmms-1.2.7-r20.ebuild 4923
-MD5 0ee64fc05669ecd516d7239e2a575e8d xmms-1.2.8.ebuild 4350
 MD5 092d1ae9348717c6e29072cbc747275e xmms-1.2.8-r1.ebuild 3813
-MD5 c82c6ee5205161e23cf67f9c1b1277d3 ChangeLog 14612
-MD5 bbcb4ec8b27a7de40e1d2e42185523c7 xmms-1.2.8-r3.ebuild 4643
+MD5 6f4853e90e0793f41491fbd7b918d03f xmms-1.2.8-r2.ebuild 4554
+MD5 67719e9afde51fc778b8882f48bebfc2 xmms-1.2.7-r23.ebuild 5233
+MD5 0ee64fc05669ecd516d7239e2a575e8d xmms-1.2.8.ebuild 4350
+MD5 1f4fb5fbbf7591ead0b68071825b2de3 xmms-1.2.7-r25.ebuild 5652
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 e7e0c91780b115aaad1a1ed534bf7ae8 files/xmms-ipv6-20020408-mmx.patch 9210
-MD5 2ef620caed6093dff90ace3118832937 files/xmms-1.2.8-sid-songpos.patch 8959
-MD5 42ff2c12f2ccb9c3742d2af9eaad7b5a files/xmms-1.2.8-dtd.patch 52981
-MD5 7ab233f0953be4760d3e5b784cc0bba4 files/xmms-fhs-skinsdir.patch 372
-MD5 66549f879e2d904a11e8e139b7dc0447 files/xmms-nptl.patch 1163
+MD5 909adb529313f28cd5340be2788fa44c xmms-1.2.8-r3.ebuild 4713
+MD5 066b01f48e27818dbd64d18433d789f2 files/xmms-1.2.8-shadow.patch 1912
 MD5 3268d7f38e954fd7ab541fa9e6f385ca files/digest-xmms-1.2.7-r20 130
-MD5 3268d7f38e954fd7ab541fa9e6f385ca files/digest-xmms-1.2.7-r23 130
-MD5 3268d7f38e954fd7ab541fa9e6f385ca files/digest-xmms-1.2.7-r25 130
-MD5 b5c4f7be3bc1fa5396a2a1d89f5d4a01 files/xmms-1.2.8-russian-charset-csa20.patch 427026
-MD5 798b63afe378c0df771078a9b3fcc5c6 files/xmms-1.2.8-random.patch 1293
-MD5 6361ee5e5b5402155308b62a1d1fde9a files/xmms-sigterm.patch 1002
+MD5 fbf93424bfa854be82f8844ddac855ec files/digest-xmms-1.2.8 122
+MD5 b4d1fd03bbe7ceb4b756394354b3956e files/xmms-russian-charset.patch 110410
+MD5 a03fa7e2151194a6db4850897d16d128 files/xmms-1.2.7-mpg123j.patch 9333
+MD5 e7e0c91780b115aaad1a1ed534bf7ae8 files/xmms-ipv6-20020408-mmx.patch 9210
+MD5 3137a462e1b8c82c5c2a8d7c4d983ee9 files/xmms-ipv6-20020408-nommx.patch 9214
 MD5 2b20eda67dba56621f05441eaa0ffab8 files/xmms-jump.patch 3013
+MD5 6361ee5e5b5402155308b62a1d1fde9a files/xmms-sigterm.patch 1002
+MD5 3268d7f38e954fd7ab541fa9e6f385ca files/digest-xmms-1.2.7-r23 130
 MD5 fbf93424bfa854be82f8844ddac855ec files/digest-xmms-1.2.8-r1 122
-MD5 87932cc92f4163b3af2ad1846581f5d9 files/digest-xmms-1.2.8-r2 135
-MD5 87932cc92f4163b3af2ad1846581f5d9 files/digest-xmms-1.2.8-r3 135
+MD5 344a691c05256b9b1259c5e47ec644cc files/xmms-diskwriter-audio.patch 1039
+MD5 7ab233f0953be4760d3e5b784cc0bba4 files/xmms-fhs-skinsdir.patch 372
 MD5 6340b8dd3175d70be72d527727ac1ef0 files/xmms-gettext-fix.patch 393
-MD5 b4d1fd03bbe7ceb4b756394354b3956e files/xmms-russian-charset.patch 110410
+MD5 3268d7f38e954fd7ab541fa9e6f385ca files/digest-xmms-1.2.7-r25 130
+MD5 66549f879e2d904a11e8e139b7dc0447 files/xmms-nptl.patch 1163
+MD5 87932cc92f4163b3af2ad1846581f5d9 files/digest-xmms-1.2.8-r2 135
+MD5 42ff2c12f2ccb9c3742d2af9eaad7b5a files/xmms-1.2.8-dtd.patch 52981
 MD5 777b6bd0dd19ffa348f27ec2a214b8f4 files/xmms-1.2.8-jump.patch 3025
-MD5 a03fa7e2151194a6db4850897d16d128 files/xmms-1.2.7-mpg123j.patch 9333
-MD5 b60b5cc65172d2b807335e5e315860c2 files/xmms-1.2.8-sigterm.patch 1062
 MD5 7e309cbe68bd60e8d05257a2d21174ea files/xmms-1.2.8-mpg123j.patch 9390
-MD5 3137a462e1b8c82c5c2a8d7c4d983ee9 files/xmms-ipv6-20020408-nommx.patch 9214
+MD5 798b63afe378c0df771078a9b3fcc5c6 files/xmms-1.2.8-random.patch 1293
 MD5 a84fd04b04f9f3e586bcbaaad4b4b4f0 files/xmms-1.2.8-russian-charset.patch 110709
-MD5 344a691c05256b9b1259c5e47ec644cc files/xmms-diskwriter-audio.patch 1039
-MD5 fbf93424bfa854be82f8844ddac855ec files/digest-xmms-1.2.8 122
+MD5 2ef620caed6093dff90ace3118832937 files/xmms-1.2.8-sid-songpos.patch 8959
+MD5 b60b5cc65172d2b807335e5e315860c2 files/xmms-1.2.8-sigterm.patch 1062
+MD5 87932cc92f4163b3af2ad1846581f5d9 files/digest-xmms-1.2.8-r3 135
+MD5 b5c4f7be3bc1fa5396a2a1d89f5d4a01 files/xmms-1.2.8-russian-charset-csa20.patch 427026
diff --git a/media-sound/xmms/files/xmms-1.2.8-shadow.patch b/media-sound/xmms/files/xmms-1.2.8-shadow.patch
new file mode 100644
index 000000000000..0584a7e6c1ec
--- /dev/null
+++ b/media-sound/xmms/files/xmms-1.2.8-shadow.patch
@@ -0,0 +1,47 @@
+diff -Nru3p xmms-1.2.8.orig/xmms/dock.c xmms-1.2.8/xmms/dock.c
+--- xmms-1.2.8.orig/xmms/dock.c	2001-03-08 14:33:30.000000000 +0000
++++ xmms-1.2.8/xmms/dock.c	2001-03-08 14:33:30.000000000 +0000
+@@ -363,8 +363,8 @@ void dock_shade(GList *window_list, GtkW
+ 	}
+ 	g_list_free(slist);
+ 	free_docked_list(docked_list);
+-	dock_set_uposition(widget, x, y + off_y - (new_h - h));
+ 	dock_window_resize(widget, w, new_h, w, h);
++	dock_set_uposition(widget, x, y + off_y - (new_h - h));
+ }
+ 
+ static GList *resize_move_list(GList *list, GtkWidget *widget, gint offset_x, gint offset_y)
+@@ -523,8 +523,8 @@ void dock_resize(GList *window_list, Gtk
+ 	}
+ 		   
+ 	
+-	dock_set_uposition(widget, x + off_x, y + off_y);
+ 	dock_window_resize(widget, new_w, new_h, w, h);
++	dock_set_uposition(widget, x + off_x, y + off_y);
+ }
+ 	
+ void dock_move_press(GList *window_list, GtkWidget *w, GdkEventButton *event, gboolean move_list)
+diff -Nru3p xmms-1.2.8.orig/xmms/playlistwin.c xmms-1.2.8/xmms/playlistwin.c
+--- xmms-1.2.8.orig/xmms/playlistwin.c	2003-04-04 17:42:51.000000000 +0000
++++ xmms-1.2.8/xmms/playlistwin.c	2003-04-04 17:42:51.000000000 +0000
+@@ -340,10 +340,9 @@ void playlistwin_create_mask(void)
+ void playlistwin_set_shade_menu_cb(gboolean shaded)
+ {
+ 	cfg.playlist_shaded = shaded;
++	gtk_window_set_default_size(GTK_WINDOW(playlistwin), cfg.playlist_width, PLAYLIST_HEIGHT);
+ 	if (!cfg.show_wm_decorations)
+ 		dock_shade(dock_window_list, playlistwin, PLAYLIST_HEIGHT);
+-	else 
+-		gtk_window_set_default_size(GTK_WINDOW(playlistwin), cfg.playlist_width, PLAYLIST_HEIGHT);
+ 
+ 	if (shaded)
+ 	{
+@@ -1283,7 +1282,7 @@ static gboolean playlistwin_configure(Gt
+ 	if (cfg.show_wm_decorations || hint_move_resize_available())
+ 	{
+ 		if (event->width != cfg.playlist_width ||
+-		    event->height != cfg.playlist_height)
++		    event->height != PLAYLIST_HEIGHT)
+ 			playlistwin_queue_resize(event->width, event->height);
+ 	}
+ 	
diff --git a/media-sound/xmms/xmms-1.2.8-r3.ebuild b/media-sound/xmms/xmms-1.2.8-r3.ebuild
index 221d64af9403..6a2c34c4ed4b 100644
--- a/media-sound/xmms/xmms-1.2.8-r3.ebuild
+++ b/media-sound/xmms/xmms-1.2.8-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.8-r3.ebuild,v 1.2 2003/11/11 15:21:42 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.8-r3.ebuild,v 1.3 2003/11/21 16:42:01 mholzer Exp $
 
 IUSE="xml nls esd gnome opengl mmx oggvorbis 3dnow mikmod directfb ipv6 cjk"
 
@@ -39,6 +39,9 @@ src_unpack() {
 	# Save playlist, etc on SIGTERM and SIGINT, bug #13604.
 	epatch ${FILESDIR}/${P}-sigterm.patch
 
+	#shadow Patch, bug #30420.
+	epatch ${FILESDIR}/${P}-shadow.patch
+
 	# Patch for mpg123 to convert Japanese character code of MP3 tag info
 	# the Japanese patch and the Russian one overlap, so its one or the other
 	if use cjk; then