Added a patch that fixes a multi-line string issue with gcc-3.3.x; Closes Bug #28236

4 files changed, 60 insertions, 9 deletions

diff --git a/app-cdr/arson/ChangeLog b/app-cdr/arson/ChangeLog
index f0fe3a9bf42f..42130690f3b1 100644
--- a/app-cdr/arson/ChangeLog
+++ b/app-cdr/arson/ChangeLog
@@ -1,10 +1,15 @@
 # ChangeLog for app-cdr/arson
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/arson/ChangeLog,v 1.18 2003/09/30 08:15:01 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/arson/ChangeLog,v 1.19 2003/10/02 07:56:23 kumba Exp $
+
 
 *arson-0.9.7-r3 (12 Apr 2003)
+
+  02 Oct 2003; Joshua Kinard <kumba@gentoo.org> arson-0.9.7-r3.ebuild:
+  Added a patch that fixes a multi-line string issue with gcc-3.3.x
+  Closes Bug #28236
+
   12 Apr 2003; Michele Balistreri <brain@gentoo.org> : arson-0.9.7-r3.ebuild :
-  
   Fix crash on startup, solve bug #17975
   
 *arson-0.9.7-r2 (12 Apr 2003)
@@ -13,17 +18,15 @@
   Added flac support, #18074.
 
   28 Mar 2003; Pieter Van den Abeele <pvdabeel@gentoo.org> : arson-0.9.7-r1.ebuild:
-
   Updated to stable ppc keyword
 
   19 Mar 2003; Dan Armak <danarmak@gentoo.org> : arson-0.9.7-r1.ebuild:
-  
   Added x86 keyword.
 
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : 
+  changed sparc ~sparc keywords
  
   29 Nov 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
-
   Inherit kde before setting local settings, so that overrides are done in
   the correct direction.
 
diff --git a/app-cdr/arson/Manifest b/app-cdr/arson/Manifest
index 57cabfddf0ef..9cee639bb28a 100644
--- a/app-cdr/arson/Manifest
+++ b/app-cdr/arson/Manifest
@@ -1,7 +1,7 @@
-MD5 5e127d538e180a209ba361cbd1d0ee11 ChangeLog 1956
+MD5 5dbc330c7fa70f0ebf110369c5b36d6e ChangeLog 1957
 MD5 81a821827f535fca95b6b28e30c41d41 arson-0.9.7-r1.ebuild 906
 MD5 d41ad78be02d4b7e3e5ac56de3262262 arson-0.9.7-r2.ebuild 949
-MD5 85cac8abc3ab86983a8e762c5e35363f arson-0.9.7-r3.ebuild 1046
+MD5 e29a77b61503f314a73d5919e1d61c45 arson-0.9.7-r3.ebuild 1043
 MD5 ceedb2cdf1b1c9ee6a946ef373d4b6e8 arson-0.9.7.ebuild 825
 MD5 dbcb408efd85de0535addf120954d78d files/arson-0.9.7-crashfix.diff 404
 MD5 36dfe8c597aa471beb98dc30e3606d47 files/arson-0.9.7-write-img-fix.diff 1689
diff --git a/app-cdr/arson/arson-0.9.7-r3.ebuild b/app-cdr/arson/arson-0.9.7-r3.ebuild
index 09019effec87..e22974e9bf29 100644
--- a/app-cdr/arson/arson-0.9.7-r3.ebuild
+++ b/app-cdr/arson/arson-0.9.7-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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-r3.ebuild,v 1.3 2003/09/05 22:57:43 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/arson/arson-0.9.7-r3.ebuild,v 1.4 2003/10/02 07:56:23 kumba Exp $
 inherit kde-base
 inherit eutils
 
@@ -31,4 +31,5 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${P}-write-img-fix.diff
 	epatch ${FILESDIR}/${P}-crashfix.diff
+	epatch ${FILESDIR}/${P}-gcc33-multiline-string-fix.patch
 }
diff --git a/app-cdr/arson/files/arson-0.9.7-gcc33-multiline-string-fix.patch b/app-cdr/arson/files/arson-0.9.7-gcc33-multiline-string-fix.patch
new file mode 100644
index 000000000000..d2a4317bddd7
--- /dev/null
+++ b/app-cdr/arson/files/arson-0.9.7-gcc33-multiline-string-fix.patch
@@ -0,0 +1,47 @@
+--- arson-0.9.7-orig/src/programpage.cpp	2002-10-31 09:50:07.000000000 +0900
++++ arson-0.9.7-kde3/src/programpage.cpp	2003-09-09 12:57:01.000000000 +0900
+@@ -50,42 +50,7 @@
+  *	the PROGGRP_ and *SEQ_ enums.
+  */
+ const char *program_sequence =
+-"<?xml version='1.0'?><programs>
+-	<group desc='%1'>
+-		<program name='cdrdao'/>
+-		<program name='cdrecord'/>
+-	</group>
+-
+-	<group desc='%2'>
+-		<program name='cdrecord'/>
+-		<program name='cdrdao'/>
+-	</group>
+-
+-	<group desc='%3'>
+-		<program name='cdrdao'/>
+-		<program name='readcd -> cdrecord'/>
+-	</group>
+-
+-	<group desc='%4'>
+-		<program name='bladeenc'/>
+-		<program name='LAME'/>
+-	</group>
+-
+-	<group desc='%5'>
+-		<program name='cdrecord'/>
+-		<program name='cdrdao'/>
+-	</group>
+-
+-	<group desc='%6'>
+-		<program name='cdda2wav'/>
+-		<program name='cdparanoia'/>
+-	</group>
+-
+-	<group desc='%7'>
+-		<program name='cdrecord'/>
+-		<program name='cdrdao'/>
+-	</group>
+-</programs>";
++"<?xml version='1.0'?><programs><group desc='%1'><program name='cdrdao'/><program name='cdrecord'/></group><group desc='%2'><program name='cdrecord'/><program name='cdrdao'/></group><group desc='%3'><program name='cdrdao'/><program name='readcd -> cdrecord'/></group><group desc='%4'><program name='bladeenc'/><program name='LAME'/></group><group desc='%5'><program name='cdrecord'/><program name='cdrdao'/></group><group desc='%6'><program name='cdda2wav'/><program name='cdparanoia'/></group><group desc='%7'><program name='cdrecord'/><program name='cdrdao'/></group></programs>";
+ 
+ ArsonProgramPage::ArsonProgramPage (ArsonConfig &config, ArsonConfigDlg *pd, QWidget *parent)
+ 	: ArsonProgramPageBase(parent), ArsonConfigPage(config),
+