Fix fujiplay-1.33-unterminated-strings.patch, thanks to Philanthrop, Bug 109226

(Portage version: 2.1.2_rc2)

4 files changed, 41 insertions, 39 deletions

diff --git a/app-misc/fujiplay/ChangeLog b/app-misc/fujiplay/ChangeLog
index 7290f9b14a46..84b6c081232f 100644
--- a/app-misc/fujiplay/ChangeLog
+++ b/app-misc/fujiplay/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/fujiplay
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/fujiplay/ChangeLog,v 1.8 2005/01/08 13:57:42 griffon26 Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/fujiplay/ChangeLog,v 1.9 2006/11/25 01:11:15 masterdriverz Exp $
+
+  25 Nov 2006; Charlie Shepherd <masterdriverz@gentoo.org>
+  files/fujiplay-1.33-unterminated-strings.patch:
+  Fix fujiplay-1.33-unterminated-strings.patch, thanks to Philanthrop, Bug 109226
 
   08 Jan 2005; Maurice van der Pot <griffon26@gentoo.org> +metadata.xml,
   +files/fujiplay-1.33-unterminated-strings.patch, fujiplay-1.33.ebuild:
diff --git a/app-misc/fujiplay/files/digest-fujiplay-1.33 b/app-misc/fujiplay/files/digest-fujiplay-1.33
index 189257ca8215..672f92cfb6ed 100644
--- a/app-misc/fujiplay/files/digest-fujiplay-1.33
+++ b/app-misc/fujiplay/files/digest-fujiplay-1.33
@@ -1 +1,3 @@
 MD5 b5702d555813853ff63918ed285c4cdd fujiplay.tgz 12588
+RMD160 91cbf301bd8e67a5753748d675ee1294c7d31ad7 fujiplay.tgz 12588
+SHA256 d65c473b799532169d6ff362c24ee81f98efa2d2031bbcb8b638606701e75438 fujiplay.tgz 12588
diff --git a/app-misc/fujiplay/files/fujiplay-1.33-unterminated-strings.patch b/app-misc/fujiplay/files/fujiplay-1.33-unterminated-strings.patch
index 5fb87be1474c..7f03c696c20e 100644
--- a/app-misc/fujiplay/files/fujiplay-1.33-unterminated-strings.patch
+++ b/app-misc/fujiplay/files/fujiplay-1.33-unterminated-strings.patch
@@ -1,5 +1,5 @@
 --- fujiplay.c	1999-02-23 10:30:31.000000000 +0100
-+++ fujiplay-fixed.c	2005-01-08 14:37:08.711951696 +0100
++++ fujiplay.c	2006-08-05 00:50:08.000000000 +0200
 @@ -759,40 +759,38 @@
  	return 1;
  }
@@ -38,37 +38,37 @@
 -Written by Thierry Bousch <bousch@topo.math.u-psud.fr>
 -Public domain. Absolutely no warranty.
 -";
-+const char *Usage =
-+"Usage: fujiplay [OPTIONS] PICTURES...          (download)\n"
-+"                          charge NUMBER        (recharge the flash)\n"
-+"                          shoot                (take picture)\n"
-+"                          preview              (preview to standard output)\n"
-+"                          upload FILES...\n"
-+"                          delete FILES...\n"
-+"                          setid STRING         (set camera ID)\n"
-+"                          setflash MODE        (0=Off, 1=On, 2=Strobe, 3=Auto)\n"
-+"                          setdate gmt|local|YYYYMMDDHHMMSS\n"
-+"Options:\n"
-+"  -B NUMBER	Set baudrate (115200, 57600, 38400, 19200, 9600 or 0)\n"
-+"  -D DEVICE	Select another device file (default is /dev/fujifilm)\n"
-+"  -L		List command set\n"
-+"  -7		DS-7 compatibility mode (experimental)\n"
-+"  -d		Delete pictures after successful download\n"
-+"  -f		Force (overwrite existing files)\n"
-+"  -p		Assume picture numbers instead of frame numbers\n"
-+"  -h		Display this help message\n"
-+"  -v		Version information\n"
-+"Pictures:\n"
-+"  all		All pictures\n"
-+"  last		Last picture\n"
-+"  4		Only picture 4\n"
-+"  2-10		Pictures between 2 and 10\n"
-+"Files:\n"
-+"  DSCxxxxx.JPG	Files to delete or to upload into the camera\n";
++const char *Usage = "\n" \
++"Usage: fujiplay [OPTIONS] PICTURES...          (download) \n" \
++"                          charge NUMBER        (recharge the flash) \n" \
++"                          shoot                (take picture) \n" \
++"                          preview              (preview to standard output) \n" \
++"                          upload FILES... \n" \
++"                          delete FILES... \n" \
++"                          setid STRING         (set camera ID) \n" \
++"                          setflash MODE        (0=Off, 1=On, 2=Strobe, 3=Auto) \n" \
++"                          setdate gmt|local|YYYYMMDDHHMMSS \n" \
++"Options: \n" \
++"  -B NUMBER	Set baudrate (115200, 57600, 38400, 19200, 9600 or 0) \n" \
++"  -D DEVICE	Select another device file (default is /dev/fujifilm) \n" \
++"  -L		List command set \n" \
++"  -7		DS-7 compatibility mode (experimental) \n" \
++"  -d		Delete pictures after successful download \n" \
++"  -f		Force (overwrite existing files) \n" \
++"  -p		Assume picture numbers instead of frame numbers \n" \
++"  -h		Display this help message \n" \
++"  -v		Version information \n" \
++"Pictures: \n" \
++"  all		All pictures \n" \
++"  last		Last picture \n" \
++"  4		Only picture 4 \n" \
++"  2-10		Pictures between 2 and 10 \n" \
++"Files: \n" \
++"  DSCxxxxx.JPG	Files to delete or to upload into the camera \n";
 +
-+const char *Copyright =
-+"Fujiplay, $Id: fujiplay.c,v 1.33 1999/02/22 14:13:01 bousch Exp $\n"
-+"Written by Thierry Bousch <bousch@topo.math.u-psud.fr>\n"
++const char *Copyright = "\n" \
++"Fujiplay, $Id: fujiplay.c,v 1.33 1999/02/22 14:13:01 bousch Exp $\n" \
++"Written by Thierry Bousch <bousch@topo.math.u-psud.fr>\n" \
 +"Public domain. Absolutely no warranty.\n";
  
  static void sigint_handler (int sig)
diff --git a/app-misc/fujiplay/fujiplay-1.33.ebuild b/app-misc/fujiplay/fujiplay-1.33.ebuild
index 44d97aeccd92..c52486e0faa8 100644
--- a/app-misc/fujiplay/fujiplay-1.33.ebuild
+++ b/app-misc/fujiplay/fujiplay-1.33.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/fujiplay/fujiplay-1.33.ebuild,v 1.11 2005/01/08 13:57:42 griffon26 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/fujiplay/fujiplay-1.33.ebuild,v 1.12 2006/11/25 01:11:15 masterdriverz Exp $
 
 inherit eutils
 
@@ -24,10 +24,6 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-unterminated-strings.patch
 }
 
-src_compile() {
-	emake || die
-}
-
 src_install() {
 	dobin fujiplay yycc2ppm || die
 	dodoc README fujiplay.lsm mx700-commands.html