[arch-commits] Commit in mp3blaster/repos (4 files)

[Andrea Scarpino]

    Date: Friday, April 3, 2009 @ 09:47:52
  Author: andrea
Revision: 32972

Merged revisions 32903,32971 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/mp3blaster/trunk

........
  r32903 | andrea | 2009-04-02 17:19:27 +0200 (Thu, 02 Apr 2009) | 1 line
  
  removed useless patches
........
  r32971 | andrea | 2009-04-03 15:47:19 +0200 (Fri, 03 Apr 2009) | 1 line
  
  upgpkg: mp3blaster 3.2.5-2
........

Modified:
  mp3blaster/repos/extra-i686/	(properties)
  mp3blaster/repos/extra-i686/PKGBUILD
Deleted:
  mp3blaster/repos/extra-i686/mp3blaster-3.2.3-cdfs.patch
  mp3blaster/repos/extra-i686/mp3blaster-gcc43.patch

-----------------------------+
 PKGBUILD                    |    4 ++--
 mp3blaster-3.2.3-cdfs.patch |   34 ----------------------------------
 mp3blaster-gcc43.patch      |   11 -----------
 3 files changed, 2 insertions(+), 47 deletions(-)


Property changes on: mp3blaster/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /mp3blaster/trunk:1-32901
   + /mp3blaster/trunk:1-32971

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-04-03 13:47:19 UTC (rev 32971)
+++ extra-i686/PKGBUILD	2009-04-03 13:47:52 UTC (rev 32972)
@@ -5,9 +5,9 @@
 
 pkgname=mp3blaster
 pkgver=3.2.5
-pkgrel=1
+pkgrel=2
 pkgdesc="A console based mp3 and OGG player."
-depends=('ncurses' 'libvorbis' 'sdl')
+depends=('ncurses' 'libvorbis' 'sdl' 'libsidplay')
 url="http://mp3blaster.sourceforge.net"
 arch=('i686' 'x86_64')
 license=('GPL')

Deleted: extra-i686/mp3blaster-3.2.3-cdfs.patch
===================================================================
--- extra-i686/mp3blaster-3.2.3-cdfs.patch	2009-04-03 13:47:19 UTC (rev 32971)
+++ extra-i686/mp3blaster-3.2.3-cdfs.patch	2009-04-03 13:47:52 UTC (rev 32972)
@@ -1,34 +0,0 @@
-diff -Naur a/src/fileman.cc b/src/fileman.cc
---- a/src/fileman.cc	2006-01-29 02:55:32.000000000 +0300
-+++ b/src/fileman.cc	2007-04-08 19:25:50.000000000 +0400
-@@ -237,12 +237,14 @@
- 	{
- 		DIR
- 			*dir2;
-+  	struct stat
-+	   	buffy;
-+
- 
- 		PTH_YIELD;
- 
--		if ( (dir2 = opendir(entries[i])) ) /* path is a dir */
-+		if (!stat(entries[i], &buffy) && S_ISDIR(buffy.st_mode) )
- 		{
--			closedir(dir2);
- 			dirs[dircount] = (char *)malloc((strlen(entries[i]) + 2) *
- 				sizeof(char));
- 			strcpy(dirs[dircount], entries[i]);
-@@ -369,10 +371,11 @@
- 	
- 	DIR
- 		*dir2;
-+	struct stat
-+	   	buffy;
- 
--	if ( (dir2 = opendir(getItem(index))) ) /* path is a dir */
-+	if (!stat(getItem(index), &buffy) && S_ISDIR(buffy.st_mode) )
- 	{
--		closedir(dir2);
- 		return 1;
- 	}
- 	

Deleted: extra-i686/mp3blaster-gcc43.patch
===================================================================
--- extra-i686/mp3blaster-gcc43.patch	2009-04-03 13:47:19 UTC (rev 32971)
+++ extra-i686/mp3blaster-gcc43.patch	2009-04-03 13:47:52 UTC (rev 32972)
@@ -1,11 +0,0 @@
-diff -Naur mp3blaster-3.2.3-old/src/history.cc mp3blaster-3.2.3/src/history.cc
---- mp3blaster-3.2.3-old/src/history.cc	2002-09-21 06:30:48.000000000 +1000
-+++ mp3blaster-3.2.3/src/history.cc	2008-08-16 23:04:47.000000000 +1000
-@@ -1,6 +1,7 @@
- #include <config.h>
- #include "history.h"
- #include <string.h>
-+#include <cstdlib>
- 
- History::History()
- {