Adding patch to fix using asciiview with files that have spaces in the name,

Package-Manager: portage-2.0.51.22-r2

4 files changed, 76 insertions, 4 deletions

diff --git a/media-gfx/aview/ChangeLog b/media-gfx/aview/ChangeLog
index 5cfc89c18b7c..4b7fb6a6ebef 100644
--- a/media-gfx/aview/ChangeLog
+++ b/media-gfx/aview/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/aview
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/aview/ChangeLog,v 1.7 2005/06/19 14:34:23 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/aview/ChangeLog,v 1.8 2005/08/16 01:31:56 halcy0n Exp $
+
+  16 Aug 2005; Mark Loeser <halcy0n@gentoo.org>
+  +files/aview-1.3.0_rc1-filename-spaces.patch, aview-1.3.0_rc1.ebuild:
+  Adding patch to fix using asciiview with files that have spaces in the name,
+  thanks to kyberneticist AT yahoo DOT com for the patch; bug #39207
 
   19 Jun 2005; Simon Stelling <blubb@gentoo.org> aview-1.3.0_rc1.ebuild:
   stable on amd64
diff --git a/media-gfx/aview/Manifest b/media-gfx/aview/Manifest
index 86a0868db090..b43df0989f40 100644
--- a/media-gfx/aview/Manifest
+++ b/media-gfx/aview/Manifest
@@ -1,3 +1,14 @@
-MD5 c2d86da13b0c1af07cb49f93cc7a5e8c ChangeLog 1197
-MD5 77a4a55962e17749a2afb445dbf0ee8f aview-1.3.0_rc1.ebuild 665
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 669e25bf9d9a5ea65a36d7ad4d10998b ChangeLog 1468
+MD5 bd8578f6db458e58c50e5ff5993d1718 aview-1.3.0_rc1.ebuild 730
 MD5 0b4ea11951fb5f19ca00548a78ccf32f files/digest-aview-1.3.0_rc1 65
+MD5 657dfc4010733a411dab5596795e1ce7 files/aview-1.3.0_rc1-filename-spaces.patch 1393
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDAUIbCRZPokWLroQRAguOAJ9qzb2ABEpPc6/2QTblo2CpRkSKggCfV7vO
+NKwz0+aTdaexRqUBdzziXTo=
+=8c7V
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/aview/aview-1.3.0_rc1.ebuild b/media-gfx/aview/aview-1.3.0_rc1.ebuild
index 92d51e310293..509b88384c10 100644
--- a/media-gfx/aview/aview-1.3.0_rc1.ebuild
+++ b/media-gfx/aview/aview-1.3.0_rc1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/aview/aview-1.3.0_rc1.ebuild,v 1.15 2005/06/19 14:34:23 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/aview/aview-1.3.0_rc1.ebuild,v 1.16 2005/08/16 01:31:56 halcy0n Exp $
+
+inherit eutils
 
 MY_P=${P/_/}
 S=${WORKDIR}/${MY_P/rc*/}
@@ -16,6 +18,7 @@ IUSE=""
 DEPEND=">=media-libs/aalib-1.4_rc4"
 
 src_compile() {
+	epatch ${FILESDIR}/${P}-filename-spaces.patch
 	econf || die
 	make aview || die
 }
diff --git a/media-gfx/aview/files/aview-1.3.0_rc1-filename-spaces.patch b/media-gfx/aview/files/aview-1.3.0_rc1-filename-spaces.patch
new file mode 100644
index 000000000000..e42ed0d5c583
--- /dev/null
+++ b/media-gfx/aview/files/aview-1.3.0_rc1-filename-spaces.patch
@@ -0,0 +1,53 @@
+diff -ur aview-1.3.0-orig/asciiview aview-1.3.0/asciiview
+--- aview-1.3.0-orig/asciiview	2005-08-15 21:20:16.000000000 -0400
++++ aview-1.3.0/asciiview	2005-08-15 21:20:19.000000000 -0400
+@@ -7,9 +7,9 @@
+ }
+ myconvert()
+ {
+-   if anytopnm $1 >/tmp/aview$$.pgm 2>/dev/null ; then
++   if anytopnm "$1" >/tmp/aview$$.pgm 2>/dev/null ; then
+      exit
+-   elif convert -colorspace gray $1 pgm:- 2>/dev/null ; then
++   elif convert -colorspace gray "$1" pgm:- 2>/dev/null ; then
+      exit
+    fi
+    echo "Failed to convert file format to PNM by both convert and anytopnm" >&2
+@@ -44,8 +44,13 @@
+       options="$options $1"
+       shift
+       ;;
+-    *) 
+-      filenames="$filenames $1"
++    *)
++      if [ "$filenames" = "" ]
++      then
++        filenames=$1   #avoid leading null
++      else
++        filenames=$(echo -e "$filenames\000$1")
++      fi
+       shift
+       ;;
+   esac
+@@ -53,15 +58,16 @@
+ trap clear 0
+ mkfifo /tmp/aview$$.pgm
+ outfile=/tmp/aview$$.pgm
+-for name in $filenames ; do
+-if test -r $name ; then
+-case $name in
++IFS=$(echo -e "\000")
++echo $filenames | while read name; do
++if test -r "$name" ; then
++case "$name" in
+ *.fli | *.lfc | *.flic )
+   PATH="$PATH:."
+-  aaflip $options $name
++  aaflip $options "$name"
+   ;;
+ *)
+-  myconvert $name >/tmp/aview$$.pgm &
++  myconvert "$name" >/tmp/aview$$.pgm &
+   pid=$!
+   PATH="$PATH:."
+   aview  $options /tmp/aview$$.pgm