From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Apr 26 16:10:47 2005 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4D57316A4CE for ; Tue, 26 Apr 2005 16:10:47 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E1FB043D8B for ; Tue, 26 Apr 2005 16:10:46 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j3QGAJUQ009443 for ; Tue, 26 Apr 2005 16:10:19 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j3QGAJ0C009442; Tue, 26 Apr 2005 16:10:19 GMT (envelope-from gnats) Resent-Date: Tue, 26 Apr 2005 16:10:19 GMT Resent-Message-Id: <200504261610.j3QGAJ0C009442@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Andrej Zverev Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 22C9116A4CE for ; 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 ; 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 ; 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 ; 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 ; 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 ; 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 To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/80365: [patch] audio/orpheus X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Andrej Zverev List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2005 16:10:47 -0000 >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@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: