Added a patch to fix a missing dialog bug.

Closes #10704.

4 files changed, 102 insertions, 11 deletions

diff --git a/app-cdr/arson/ChangeLog b/app-cdr/arson/ChangeLog
index 25a3d31b2b99..26a5527bdfb2 100644
--- a/app-cdr/arson/ChangeLog
+++ b/app-cdr/arson/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for app-cdr/arson
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/arson/ChangeLog,v 1.7 2002/10/31 12:03:15 verwilst Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/arson/ChangeLog,v 1.8 2002/11/25 05:33:44 agenkin Exp $
 
+*arson-0.9.7-r1 (25 Nov 2002) Arcady Genkin <agenkin@gentoo.org>
+	arson-0.9.7-r1.ebuild:
+  Added a patch to fix a missing dialog when chosing an ISO image.
+  Submitted by anders@bruun-olsen.net (Anders Bruun Olsen).
+	
 *arson-0.9.7 (31 Okt 2002) Bart Verwilst <verwilst@gentoo.org>
 
 *arson-0.9.6 (28 Jun 2002) Bart Verwilst <verwilst@gentoo.org>
@@ -27,13 +32,3 @@
   9 Mar 2002; Guido Bakker <guidob@gentoo.org> ebuild :
 
   Version update.
-
-*arson-0.9.3 (1 Feb 2002)
-
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
-  Added initial ChangeLog which should be updated whenever the package is
-  updated in any way. This changelog is targetted to users. This means that the
-  comments should well explained and written in clean English. The details about
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
diff --git a/app-cdr/arson/arson-0.9.7-r1.ebuild b/app-cdr/arson/arson-0.9.7-r1.ebuild
new file mode 100644
index 000000000000..2d01e5113a1e
--- /dev/null
+++ b/app-cdr/arson/arson-0.9.7-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/arson/arson-0.9.7-r1.ebuild,v 1.1 2002/11/25 05:33:44 agenkin Exp $
+
+DESCRIPTION="A KDE frontend to CD burning and CD ripping tools."
+HOMEPAGE="http://arson.sourceforge.net/"
+LICENSE="GPL-2"
+
+newdepend ">=media-sound/cdparanoia-3.9.8
+	   >=media-sound/bladeenc-0.94.2
+	   >=app-cdr/cdrtools-1.11.24
+	   >=media-sound/normalize-0.7.4
+	   oggvorbis? ( media-libs/libvorbis )
+	   >=media-sound/lame-3.92
+	   >=app-cdr/cdrdao-1.1.5"
+inherit kde-base
+need-kde 3
+	   
+IUSE="oggvorbis"
+KEYWORDS="~x86 ~ppc ~sparc ~sparc64"
+S=${WORKDIR}/${P}-kde3
+SRC_URI="mirror://sourceforge/arson/${P}-kde3.tar.bz2"
+
+use oggvorbis && myconf="$myconf --with-vorbis" || myconf="$myconf --without-vorbis"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	patch -p0 <${FILESDIR}/${P}-write-img-fix.diff || die
+}
diff --git a/app-cdr/arson/files/arson-0.9.7-write-img-fix.diff b/app-cdr/arson/files/arson-0.9.7-write-img-fix.diff
new file mode 100644
index 000000000000..4f03448ac901
--- /dev/null
+++ b/app-cdr/arson/files/arson-0.9.7-write-img-fix.diff
@@ -0,0 +1,65 @@
+Index: src/tools.cpp
+===================================================================
+RCS file: /cvsroot/arson/arson/src/tools.cpp,v
+retrieving revision 1.1
+diff -u -3 -p -r1.1 tools.cpp
+--- src/tools.cpp	18 Sep 2002 23:20:56 -0000	1.1
++++ src/tools.cpp	2 Nov 2002 06:41:01 -0000
+@@ -310,7 +310,8 @@ const QString ArsonCdImageFile::exts[Ars
+ };
+ 
+ ArsonCdImageFile::ArsonCdImageFile (const QString &filename)
+-	: m_file(filename), m_type(Unknown) { }
++	: m_file(filename), m_type(Unknown)
++{ }
+ 
+ int ArsonCdImageFile::imgFormat (void)
+ {
+@@ -365,7 +366,18 @@ bool ArsonCdImageFile::write (void)
+ 
+ void arsonWriteImg (const char *fn)
+ {
+-	ArsonCdImageFile img (fn);
++	QString file (fn);
++
++	if (!fn)
++	{
++		ArsonFileFilter filter (ArsonCdImageFile::exts, ArsonCdImageFile::Max);
++		file = KFileDialog::getOpenFileName(QString::null, filter.toString());
++
++		if (file.isEmpty())
++			return;
++	}
++
++	ArsonCdImageFile img (file);
+ 
+ 	if (img.imgFormat() == ArsonCdImageFile::Unknown)
+ 		arsonErrorMsg(
+Index: src/tools.h
+===================================================================
+RCS file: /cvsroot/arson/arson/src/tools.h,v
+retrieving revision 1.1
+diff -u -3 -p -r1.1 tools.h
+--- src/tools.h	18 Sep 2002 23:20:56 -0000	1.1
++++ src/tools.h	2 Nov 2002 06:41:01 -0000
+@@ -51,16 +51,17 @@ public:
+ 		Dir,
+ 	};
+ 
+-	ArsonCdImageFile (const QString &filename = QString::null);
++	ArsonCdImageFile (const QString &filename);
+ 
+ 	const QString &filename (void) const { return m_file; }
++	void setFilename (const char *name) { m_file = name; }
+ 	
+ 	int imgFormat (void);
+ 	bool write (void);
+ 
+-private:
+ 	const static QString exts[Max];
+-
++	
++private:
+ 	QString m_file;
+ 	int m_type;
+ };
diff --git a/app-cdr/arson/files/digest-arson-0.9.7-r1 b/app-cdr/arson/files/digest-arson-0.9.7-r1
new file mode 100644
index 000000000000..0a04cc490556
--- /dev/null
+++ b/app-cdr/arson/files/digest-arson-0.9.7-r1
@@ -0,0 +1 @@
+MD5 baf05d52128dd75d72298b4011e2e353 arson-0.9.7-kde3.tar.bz2 562250