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

[Giovanni Scafora]

    Date: Thursday, April 2, 2009 @ 12:22:19
  Author: giovanni
Revision: 32912

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

........
  r32901 | andrea | 2009-04-02 08:17:56 -0700 (gio, 02 apr 2009) | 1 line
  
  upgpkg: mp3blaster 3.2.5-1
........
  r32903 | andrea | 2009-04-02 08:19:27 -0700 (gio, 02 apr 2009) | 1 line
  
  removed useless patches
........

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

-----------------------------+
 PKGBUILD                    |   33 ++++++++++++---------------------
 mp3blaster-3.2.3-cdfs.patch |   34 ----------------------------------
 mp3blaster-gcc43.patch      |   11 -----------
 3 files changed, 12 insertions(+), 66 deletions(-)


Property changes on: mp3blaster/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /mp3blaster/trunk:1-9591
   + /mp3blaster/trunk:1-32911

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-04-02 16:16:11 UTC (rev 32911)
+++ extra-x86_64/PKGBUILD	2009-04-02 16:22:19 UTC (rev 32912)
@@ -1,32 +1,23 @@
 # $Id$
-# Maintainer: dorphell <dorphell at archlinux.org>
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: dorphell <dorphell at archlinux.org>
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+
 pkgname=mp3blaster
-pkgver=3.2.3
-pkgrel=4
+pkgver=3.2.5
+pkgrel=1
 pkgdesc="A console based mp3 and OGG player."
 depends=('ncurses' 'libvorbis' 'sdl')
-arch=(i686 x86_64)
+url="http://mp3blaster.sourceforge.net"
+arch=('i686' 'x86_64')
 license=('GPL')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz \
-        ftp://ftp2.de.debian.org/pub/debian/pool/main/m/mp3blaster/mp3blaster_3.2.3-3.diff.gz \
-        mp3blaster-3.2.3-cdfs.patch
-        mp3blaster-gcc43.patch)
-url="http://mplayer.sf.net"
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+md5sums=('edb3bb122553d2d544dfb084010311c6')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  patch -Np1 -i ${startdir}/src/mp3blaster_3.2.3-3.diff || return 1
-  for fn in debian/patches/*; do
-    patch -Np1 -i ${fn}
-  done
-  patch -Np1 -i ${startdir}/src/mp3blaster-3.2.3-cdfs.patch || return 1
-  patch -Np1 -i ${startdir}/src/mp3blaster-gcc43.patch || return 1
+  cd ${srcdir}/$pkgname-$pkgver
+ 
   ./configure --prefix=/usr
   make || return 1
-  make prefix=$startdir/pkg/usr install
+  make prefix=${pkgdir}/usr install
 }
-md5sums=('0d892d7c99df175eb0efb2bc31086285'
-         'ee5ad4ed48a3eebf2bc45ff09210ebd6'
-         '2a555430e0511077ea21535760a189bc'
-         '87475f146c1a873682fe9bf919d4f601')

Deleted: extra-x86_64/mp3blaster-3.2.3-cdfs.patch
===================================================================
--- extra-x86_64/mp3blaster-3.2.3-cdfs.patch	2009-04-02 16:16:11 UTC (rev 32911)
+++ extra-x86_64/mp3blaster-3.2.3-cdfs.patch	2009-04-02 16:22:19 UTC (rev 32912)
@@ -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-x86_64/mp3blaster-gcc43.patch
===================================================================
--- extra-x86_64/mp3blaster-gcc43.patch	2009-04-02 16:16:11 UTC (rev 32911)
+++ extra-x86_64/mp3blaster-gcc43.patch	2009-04-02 16:22:19 UTC (rev 32912)
@@ -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()
- {