[arch-commits] Commit in cuetools/trunk (PKGBUILD cuetag-fix_spaces.diff)

[Lukas Jirkovsky]

    Date: Tuesday, December 31, 2013 @ 12:10:33
  Author: stativ
Revision: 103243

cuetools: fix FS#37759

Added:
  cuetools/trunk/cuetag-fix_spaces.diff
Modified:
  cuetools/trunk/PKGBUILD

------------------------+
 PKGBUILD               |    6 ++++--
 cuetag-fix_spaces.diff |   46 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-12-31 06:53:57 UTC (rev 103242)
+++ PKGBUILD	2013-12-31 11:10:33 UTC (rev 103243)
@@ -2,7 +2,7 @@
 # Maintainer: Lukas Jirkovsky <l.jirkovsky at gmail.com>
 pkgname=cuetools
 pkgver=1.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Cue and toc file parsers and utilities"
 arch=('i686' 'x86_64')
 url="https://github.com/svend/cuetools"
@@ -10,8 +10,9 @@
 license=('GPL')
 depends=('glibc')
 source=("https://github.com/svend/cuetools/archive/${pkgver}.tar.gz"
-	"fix_build_with_automake-1.12.diff")
+        "cuetag-fix_spaces.diff" "fix_build_with_automake-1.12.diff")
 md5sums=('4492dae2b3f9e077f6455a1f1cddef3b'
+         '60f4aba26e529e48dbedd2adef917117'
          '67a3b32711d1a1f508be6ed0f1bdadf3')
 
 prepare() {
@@ -18,6 +19,7 @@
   cd "$srcdir/$pkgname-$pkgver"
 
   patch -Np1 < "$srcdir/fix_build_with_automake-1.12.diff" || true
+  patch -Np1 < "$srcdir/cuetag-fix_spaces.diff" || true
 
   aclocal
   autoheader

Added: cuetag-fix_spaces.diff
===================================================================
--- cuetag-fix_spaces.diff	                        (rev 0)
+++ cuetag-fix_spaces.diff	2013-12-31 11:10:33 UTC (rev 103243)
@@ -0,0 +1,46 @@
+From 21ee6cc40f02693928efbc4f3beeb681950c16b5 Mon Sep 17 00:00:00 2001
+From: Svend Sorensen <svend at ciffer.net>
+Date: Sat, 23 Nov 2013 17:23:01 -0800
+Subject: [PATCH] cuetag: Fix handling of spaces in file names
+
+Fixes #14
+---
+ src/tools/cuetag.sh | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/src/tools/cuetag.sh b/src/tools/cuetag.sh
+index f26fa20..448920f 100755
+--- a/src/tools/cuetag.sh
++++ b/src/tools/cuetag.sh
+@@ -182,16 +182,15 @@ main()
+ 	ntrack=$(cueprint -d '%N' "$cue_file")
+ 	trackno=1
+ 
+-	FILES= FIELDS=
++	NUM_FILES=0 FIELDS=
+ 	for arg in "$@"; do
+ 		case "$arg" in
+-			*.*) FILES="$FILES $arg";;
++			*.*) NUM_FILES=$(expr $NUM_FILES + 1);;
+ 			*) FIELDS="$FIELDS $arg";;
+ 		esac
+ 	done
+ 
+-	set -- $FILES
+-	if [ $# -ne $ntrack ]; then
++	if [ $NUM_FILES -ne $ntrack ]; then
+ 		echo "warning: number of files does not match number of tracks"
+ 	fi
+ 
+@@ -209,7 +208,7 @@ main()
+ 		*.[Tt][Xx][Tt])
+ 			vorbis $trackno "$file"
+ 			;;
+-		*)
++		*.*)
+ 			echo "$file: uknown file type"
+ 			;;
+ 		esac
+-- 
+1.8.5.1
+