summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichele Noberasco <s4t4n@gentoo.org>2005-05-10 09:22:40 +0000
committerMichele Noberasco <s4t4n@gentoo.org>2005-05-10 09:22:40 +0000
commit11c0e51aea8dc32c1119cefe377e8fdba4f0747b (patch)
tree5fb5ecc5820553542165f896d722e797d945e8de /x11-plugins/wmxmms
parentAdded to ~ppc (diff)
downloadhistorical-11c0e51aea8dc32c1119cefe377e8fdba4f0747b.tar.gz
historical-11c0e51aea8dc32c1119cefe377e8fdba4f0747b.tar.bz2
historical-11c0e51aea8dc32c1119cefe377e8fdba4f0747b.zip
Updating midle-click patch following feedback on bug #88280
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'x11-plugins/wmxmms')
-rw-r--r--x11-plugins/wmxmms/ChangeLog5
-rw-r--r--x11-plugins/wmxmms/Manifest4
-rw-r--r--x11-plugins/wmxmms/files/wmxmms-middle-click.patch22
3 files changed, 20 insertions, 11 deletions
diff --git a/x11-plugins/wmxmms/ChangeLog b/x11-plugins/wmxmms/ChangeLog
index 9a015556c429..5a8872553a88 100644
--- a/x11-plugins/wmxmms/ChangeLog
+++ b/x11-plugins/wmxmms/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-plugins/wmxmms
# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxmms/ChangeLog,v 1.6 2005/04/11 08:52:04 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxmms/ChangeLog,v 1.7 2005/05/10 09:22:40 s4t4n Exp $
+
+ 10 May 2005; Michele Noberasco <s4t4n@gentoo.org> wmxmms-0.1.4-r1.ebuild:
+ Updating middle-click patch, following feedback on bug #88280.
*wmxmms-0.1.4-r1 (11 Apr 2005)
diff --git a/x11-plugins/wmxmms/Manifest b/x11-plugins/wmxmms/Manifest
index 6984f99242fd..ad45055a3647 100644
--- a/x11-plugins/wmxmms/Manifest
+++ b/x11-plugins/wmxmms/Manifest
@@ -1,7 +1,7 @@
MD5 21f146bac91070cc90793f53b6129dcb wmxmms-0.1.4-r1.ebuild 866
MD5 39afe28034765f9235b0932a69b6702b wmxmms-0.1.4.ebuild 778
-MD5 eb55f8cfdb61525928d010ad99137a31 ChangeLog 946
+MD5 fe0e820ff1b5caa32951729ce2350202 ChangeLog 1088
MD5 9162353667ec0175ad70c2ebd19dfd68 metadata.xml 373
MD5 2dd715c79fa48ffa17ea698557aa7644 files/digest-wmxmms-0.1.4-r1 64
-MD5 ce26cc20af2386f5279b50df9aea2a26 files/wmxmms-middle-click.patch 1183
+MD5 c3b76c61cc652d22913743beced8b89b files/wmxmms-middle-click.patch 1354
MD5 2dd715c79fa48ffa17ea698557aa7644 files/digest-wmxmms-0.1.4 64
diff --git a/x11-plugins/wmxmms/files/wmxmms-middle-click.patch b/x11-plugins/wmxmms/files/wmxmms-middle-click.patch
index ef452a49a6cd..5365e5de9c92 100644
--- a/x11-plugins/wmxmms/files/wmxmms-middle-click.patch
+++ b/x11-plugins/wmxmms/files/wmxmms-middle-click.patch
@@ -1,7 +1,8 @@
+Common subdirectories: ../WMxmms-0.1.4.orig/src/.xvpics and src/.xvpics
diff -u ../WMxmms-0.1.4.orig/src/xmms_func.c src/xmms_func.c
---- ../WMxmms-0.1.4.orig/src/xmms_func.c 2005-03-21 11:51:47.375860272 -0700
-+++ src/xmms_func.c 2005-03-21 11:42:37.106513928 -0700
-@@ -113,17 +113,31 @@
+--- ../WMxmms-0.1.4.orig/src/xmms_func.c 2003-03-31 10:40:23.000000000 -0700
++++ src/xmms_func.c 2005-04-28 15:55:08.000000000 -0600
+@@ -110,17 +110,39 @@
{
char *command;
int status;
@@ -24,12 +25,20 @@ diff -u ../WMxmms-0.1.4.orig/src/xmms_func.c src/xmms_func.c
- }
- while (!xmms_remote_is_running(xmms_session))
+
-+ while (!xmms_remote_is_running(xmms_session) && count < 30) {
++ while (!xmms_remote_is_running(xmms_session) && count < 1800) {
usleep(10000L);
+ count++;
++ if( (count % 60) == 0 )
++ {
++ fprintf(stderr,
++ "There may be a problem starting XMMS, or the "
++ "XMMS remote is not running. Sleeping for 5 "
++ "seconds and checking for the remote again.\n");
++ sleep(5);
++ }
+ }
+
-+ if( (count == 30) && status){
++ if( (count == 1800) && status){
+ fprintf(stderr,
+ "status(%d) XMMS can't be launched, exiting...\n",
+ status);
@@ -39,6 +48,3 @@ diff -u ../WMxmms-0.1.4.orig/src/xmms_func.c src/xmms_func.c
free(command);
}
-Only in ../WMxmms-0.1.4.orig/src: xmms_func.c.orig
-Only in src: .xmms_func.c.swp
-Common subdirectories: ../WMxmms-0.1.4.orig/src/.xvpics and src/.xvpics