From az@waterwall.inec.ru  Tue Apr 26 16:06:09 2005
Return-Path: <az@waterwall.inec.ru>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 22C9116A4CE
	for <freebsd-gnats-submit@freebsd.org>; Tue, 26 Apr 2005 16:06:09 +0000 (GMT)
Received: from waterwall.inec.ru (waterwall.inec.ru [213.148.3.225])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E930F43D62
	for <freebsd-gnats-submit@freebsd.org>; Tue, 26 Apr 2005 16:06:05 +0000 (GMT)
	(envelope-from az@waterwall.inec.ru)
Received: from waterwall.inec.ru (root@localhost)
  by waterwall.inec.ru (8.13.1/8.12.6) with SMTP id j3QG72Ku030859
    for <freebsd-gnats-submit@freebsd.org>; Tue, 26 Apr 2005 20:07:02 +0400 (MSD)
Received: from waterwall.inec.ru (localhost.inec.ru [127.0.0.1])
  by localhost (8.13.1/8.12.6) with ESMTP id j3QG72HU030853
    for <FreeBSD-gnats-submit@freebsd.org>; Tue, 26 Apr 2005 20:07:02 +0400 (MSD)
Received: from localhost (localhost.inec.ru [127.0.0.1])
	by localhost (Postfix) with SMTP id D55355A3E5
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 26 Apr 2005 20:07:02 +0400 (MSD)
Received: from waterwall.inec.ru (localhost.inec.ru [127.0.0.1])
	by waterwall.inec.ru (Postfix) with ESMTP id AAPC2426E67264CA2
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 26 Apr 2005 20:07:02 +0400 (MSD)
Received: (from root@localhost)
	by waterwall.inec.ru (8.13.1/8.12.6/Submit) id j3QG72Hg030849;
	Tue, 26 Apr 2005 20:07:02 +0400 (MSD)
Message-Id: <200504261607.j3QG72Hg030849@waterwall.inec.ru>
Date: Tue, 26 Apr 2005 20:07:02 +0400 (MSD)
From: Andrej Zverev <az@inec.ru>
Reply-To: Andrej Zverev <az@inec.ru>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] audio/orpheus
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         80365
>Category:       ports
>Synopsis:       [patch] audio/orpheus
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    novel
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Apr 26 16:10:19 GMT 2005
>Closed-Date:    Wed Apr 27 10:37:21 GMT 2005
>Last-Modified:  Wed Apr 27 10:37:21 GMT 2005
>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@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:
Responsible-Changed-From-To: freebsd-ports-bugs->novel 
Responsible-Changed-By: novel 
Responsible-Changed-When: Tue Apr 26 16:50:58 GMT 2005 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=80365 
State-Changed-From-To: open->feedback 
State-Changed-By: novel 
State-Changed-When: Tue Apr 26 17:13:07 GMT 2005 
State-Changed-Why:  
Should not dependency on mpg321 be RUN_DEPEND instead of BUILD_DEPEND? 

http://www.freebsd.org/cgi/query-pr.cgi?pr=80365 

From: Andrej Zverev <az@inec.ru>
To: bug-followup@freebsd.org, az@inec.ru
Cc:  
Subject: Re: ports/80365: [patch] audio/orpheus
Date: Wed, 27 Apr 2005 09:29:37 +0400

 Yes, you right. My mistake. Can you fix it, please :)
 
State-Changed-From-To: feedback->closed 
State-Changed-By: novel 
State-Changed-When: Wed Apr 27 10:37:10 GMT 2005 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=80365 
>Unformatted:
