ports/80365: [patch] audio/orpheus

[Andrej Zverev]

>Number:         80365
>Category:       ports
>Synopsis:       [patch] audio/orpheus
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Apr 26 16:10:19 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Andrej Zverev
>Release:        FreeBSD 5.4-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD az.inec.ru 5.4-PRERELEASE FreeBSD 5.4-PRERELEASE #0: Thu Mar 31 12:08:50 MSD 2005 az at az.inec.ru:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:
	
	Orpheus don't check tracks number in playlist.
	So, than we try play next track from empty list, we have core dumped :(
	Fix it and bump portversion
>How-To-Repeat:
	
>Fix:
	Apply fix patch
	Thanks
	

--- orpheus.diff begins here ---
diff -Nru orpheus.orig/Makefile orpheus/Makefile
--- orpheus.orig/Makefile	Sun Apr 10 13:16:14 2005
+++ orpheus/Makefile	Tue Apr 26 19:56:19 2005
@@ -7,6 +7,7 @@
 
 PORTNAME=	orpheus
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://thekonst.net/download/
 
diff -Nru orpheus.orig/files/patch-src-uitext.cc orpheus/files/patch-src-uitext.cc
--- orpheus.orig/files/patch-src-uitext.cc	Mon Jan 10 13:25:55 2005
+++ orpheus/files/patch-src-uitext.cc	Tue Apr 26 19:49:47 2005
@@ -1,6 +1,24 @@
---- src/uitext.cc	Tue Feb 17 04:18:21 2004
-+++ src/uitext.cc	Sun Dec 12 22:12:41 2004
-@@ -577,14 +577,16 @@
+diff -Nru src.orig/uitext.cc src/uitext.cc
+--- src.orig/uitext.cc	Tue Feb 17 04:18:21 2004
++++ src/uitext.cc	Tue Apr 26 19:49:01 2005
+@@ -125,6 +125,8 @@
+ }
+ 
+ void OrpheusTextUI::nexttrack() {
++    if (!plist.empty())
++    {
+     if(conf.getplaymode() == Random) {
+ 	int k;
+ 	while(*(plist.begin()+(k = randlimit(0, plist.size()-1))) == currenttrack);
+@@ -143,6 +145,7 @@
+ 	    }
+ 	}
+     }
++    }
+ }
+ 
+ void OrpheusTextUI::prevtrack() {
+@@ -577,14 +580,16 @@
  			autosavepl = !autosavepl;
  			break;
  		    case 41:
@@ -19,7 +37,7 @@
  			    sortorder = byFileName;
  			break;
  		    case 44:
-@@ -719,7 +721,8 @@
+@@ -719,7 +724,8 @@
      while(!finished) {
  	m.clear();
  
--- orpheus.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: